diff options
| author | Zuma copybara merger <zuma-automerger@google.com> | 2022-07-20 16:40:11 -0700 |
|---|---|---|
| committer | davidchiang <davidchiang@google.com> | 2022-07-27 03:44:08 +0000 |
| commit | 685229a040b427107e8f1191057ca3e0251ae7ef (patch) | |
| tree | b742b94f7956879c93ec30d7330f5d6da86c50d7 | |
| parent | 61bac082b4dfe4c1d361125d9d38bf32b98fa25a (diff) | |
| download | rio-685229a040b427107e8f1191057ca3e0251ae7ef.tar.gz | |
[Copybara Auto Merge] Merge branch zuma into android13-gs-pixel-5.15
edgetpu: Update instruction remap region to 32MB.
DAR_TO_ZUMA_REV_ID: 4f4be2c549b881d54bd7d86cc80cf6e7da1150a4
GitOrigin-RevId: f4f513b673c033101200cb3427ecb0e80767f029
Change-Id: Iaf549c0a033e98ed814c27ed1f5ec1376bc4163f
| -rw-r--r-- | drivers/edgetpu/include/linux/acpm_dvfs.h | 40 | ||||
| -rw-r--r-- | drivers/edgetpu/mobile-firmware.c | 4 |
2 files changed, 42 insertions, 2 deletions
diff --git a/drivers/edgetpu/include/linux/acpm_dvfs.h b/drivers/edgetpu/include/linux/acpm_dvfs.h new file mode 100644 index 0000000..6872abe --- /dev/null +++ b/drivers/edgetpu/include/linux/acpm_dvfs.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Fallback header for systems without Exynos ACPM support. + * + * Copyright (C) 2021 Google, Inc. + */ + +#ifndef __ACPM_DVFS_H__ +#define __ACPM_DVFS_H__ + +static inline int exynos_acpm_set_init_freq(unsigned int dfs_id, unsigned long freq) +{ + return 0; +} + +static inline int exynos_acpm_set_policy(unsigned int id, unsigned long policy) +{ + return 0; +} + +#if IS_ENABLED(CONFIG_EDGETPU_TEST) + +int exynos_acpm_set_rate(unsigned int id, unsigned long rate); +unsigned long exynos_acpm_get_rate(unsigned int id, unsigned long dbg_val); + +#else /* IS_ENABLED(CONFIG_EDGETPU_TEST) */ + +static inline int exynos_acpm_set_rate(unsigned int id, unsigned long rate) +{ + return 0; +} + +static inline unsigned long exynos_acpm_get_rate(unsigned int id, unsigned long dbg_val) +{ + return 0; +} + +#endif /* IS_ENABLED(CONFIG_EDGETPU_TEST) */ + +#endif /* __ACPM_DVFS_H__ */ diff --git a/drivers/edgetpu/mobile-firmware.c b/drivers/edgetpu/mobile-firmware.c index bd30665..6a3851c 100644 --- a/drivers/edgetpu/mobile-firmware.c +++ b/drivers/edgetpu/mobile-firmware.c @@ -290,9 +290,9 @@ static void program_iremap_csr(struct edgetpu_dev *etdev) edgetpu_dev_write_32(etdev, EDGETPU_REG_INSTRUCTION_REMAP_NEW_BASE + 8, fw_paddr); edgetpu_dev_write_32(etdev, EDGETPU_REG_INSTRUCTION_REMAP_LIMIT, - EDGETPU_INSTRUCTION_REMAP_BASE + SZ_16M); + EDGETPU_INSTRUCTION_REMAP_BASE + SZ_32M); edgetpu_dev_write_32(etdev, EDGETPU_REG_INSTRUCTION_REMAP_LIMIT + 8, - EDGETPU_INSTRUCTION_REMAP_BASE + SZ_16M); + EDGETPU_INSTRUCTION_REMAP_BASE + SZ_32M); edgetpu_dev_write_32(etdev, EDGETPU_REG_INSTRUCTION_REMAP_CONTROL, 1); edgetpu_dev_write_32(etdev, EDGETPU_REG_INSTRUCTION_REMAP_CONTROL + 8, 1); |