| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 19 May 2021 15:06:42 +0530
From: Dikshita Agarwal <dikshita@...eaurora.org>
To: linux-media@...r.kernel.org, stanimir.varbanov@...aro.org
Cc: linux-kernel@...r.kernel.org, vgarodia@...eaurora.org,
Dikshita Agarwal <dikshita@...eaurora.org>
Subject: [PATCH 1/7] venus: firmware: enable no tz fw loading for sc7280
- Enable no tz FW loading.
- add routine to reset XTSS.
Signed-off-by: Dikshita Agarwal <dikshita@...eaurora.org>
---
drivers/media/platform/qcom/venus/firmware.c | 42 ++++++++++++++++++++----
drivers/media/platform/qcom/venus/hfi_venus_io.h | 2 ++
2 files changed, 38 insertions(+), 6 deletions(-)
diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index 227bd3b..e05e01a 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -42,6 +42,22 @@ static void venus_reset_cpu(struct venus_core *core)
writel(0, wrapper_base + WRAPPER_A9SS_SW_RESET);
}
+static void venus_reset_cpu_V6(struct venus_core *core)
+{
+ u32 fw_size = core->fw.mapped_mem_size;
+ void __iomem *wrapper_tz_base = core->wrapper_tz_base;
+
+ writel(0, wrapper_tz_base + WRAPPER_FW_START_ADDR);
+ writel(fw_size, wrapper_tz_base + WRAPPER_FW_END_ADDR);
+ writel(0, wrapper_tz_base + WRAPPER_CPA_START_ADDR);
+ writel(fw_size, wrapper_tz_base + WRAPPER_CPA_END_ADDR);
+ writel(fw_size, wrapper_tz_base + WRAPPER_NONPIX_START_ADDR);
+ writel(fw_size, wrapper_tz_base + WRAPPER_NONPIX_END_ADDR);
+
+ /* Bring XTSS out of reset */
+ writel(0, wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET);
+}
+
int venus_set_hw_state(struct venus_core *core, bool resume)
{
int ret;
@@ -54,10 +70,15 @@ int venus_set_hw_state(struct venus_core *core, bool resume)
}
if (resume) {
- venus_reset_cpu(core);
+ if (IS_V6(core))
+ venus_reset_cpu_V6(core);
+ else
+ venus_reset_cpu(core);
} else {
if (!IS_V6(core))
writel(1, core->wrapper_base + WRAPPER_A9SS_SW_RESET);
+ else
+ writel(1, core->wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET);
}
return 0;
@@ -149,7 +170,10 @@ static int venus_boot_no_tz(struct venus_core *core, phys_addr_t mem_phys,
return ret;
}
- venus_reset_cpu(core);
+ if (IS_V6(core))
+ venus_reset_cpu_V6(core);
+ else
+ venus_reset_cpu(core);
return 0;
}
@@ -162,12 +186,18 @@ static int venus_shutdown_no_tz(struct venus_core *core)
u32 reg;
struct device *dev = core->fw.dev;
void __iomem *wrapper_base = core->wrapper_base;
+ void __iomem *wrapper_tz_base = core->wrapper_tz_base;
+ if (IS_V6(core)) {
+ reg = readl_relaxed(wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET);
+ reg |= WRAPPER_XTSS_SW_RESET_BIT;
+ writel_relaxed(reg, wrapper_tz_base + WRAPPER_TZ_XTSS_SW_RESET);
+ } else {
/* Assert the reset to ARM9 */
- reg = readl_relaxed(wrapper_base + WRAPPER_A9SS_SW_RESET);
- reg |= WRAPPER_A9SS_SW_RESET_BIT;
- writel_relaxed(reg, wrapper_base + WRAPPER_A9SS_SW_RESET);
-
+ reg = readl_relaxed(wrapper_base + WRAPPER_A9SS_SW_RESET);
+ reg |= WRAPPER_A9SS_SW_RESET_BIT;
+ writel_relaxed(reg, wrapper_base + WRAPPER_A9SS_SW_RESET);
+ }
/* Make sure reset is asserted before the mapping is removed */
mb();
diff --git a/drivers/media/platform/qcom/venus/hfi_venus_io.h b/drivers/media/platform/qcom/venus/hfi_venus_io.h
index 300c6e47..9735a24 100644
--- a/drivers/media/platform/qcom/venus/hfi_venus_io.h
+++ b/drivers/media/platform/qcom/venus/hfi_venus_io.h
@@ -149,6 +149,8 @@
/* Wrapper TZ 6xx */
#define WRAPPER_TZ_BASE_V6 0x000c0000
#define WRAPPER_TZ_CPU_STATUS_V6 0x10
+#define WRAPPER_TZ_XTSS_SW_RESET 0x1000
+#define WRAPPER_XTSS_SW_RESET_BIT BIT(0)
/* Venus AON */
#define AON_BASE_V6 0x000e0000
--
2.7.4
Powered by blists - more mailing lists