* [PATCH v3 0/2] Venus - fix firmware load failure
@ 2020-09-10 7:52 Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 2/2] venus: firmware: Set " Stanimir Varbanov
0 siblings, 2 replies; 4+ messages in thread
From: Stanimir Varbanov @ 2020-09-10 7:52 UTC (permalink / raw)
To: linux-arm-msm, linux-kernel, linux-media
Cc: Bjorn Andersson, Elliot Berman, Stanimir Varbanov
Hello,
Two changes since v2:
* 1/2 drop pointless line remove.
* 2/2 call qcom_scm_pas_shutdown() in error path - spotted by Bjorn.
v2 can be found at [1].
Regards,
Stan
[1] https://lkml.org/lkml/2020/8/17/323
Stanimir Varbanov (2):
firmware: qcom_scm: Add memory protect virtual address ranges
venus: firmware: Set virtual address ranges
drivers/firmware/qcom_scm.c | 24 ++++++++++++++++++++
drivers/firmware/qcom_scm.h | 1 +
drivers/media/platform/qcom/venus/core.c | 4 ++++
drivers/media/platform/qcom/venus/core.h | 4 ++++
drivers/media/platform/qcom/venus/firmware.c | 19 +++++++++++++++-
include/linux/qcom_scm.h | 7 ++++++
6 files changed, 58 insertions(+), 1 deletion(-)
--
2.17.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v3 1/2] firmware: qcom_scm: Add memory protect virtual address ranges
2020-09-10 7:52 [PATCH v3 0/2] Venus - fix firmware load failure Stanimir Varbanov
@ 2020-09-10 7:52 ` Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 2/2] venus: firmware: Set " Stanimir Varbanov
1 sibling, 0 replies; 4+ messages in thread
From: Stanimir Varbanov @ 2020-09-10 7:52 UTC (permalink / raw)
To: linux-arm-msm, linux-kernel, linux-media
Cc: Bjorn Andersson, Elliot Berman, Stanimir Varbanov
This adds a new SCM memprotect command to set virtual address ranges.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
Reviewed-by: Elliot Berman <eberman@codeaurora.org>
Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
drivers/firmware/qcom_scm.c | 24 ++++++++++++++++++++++++
drivers/firmware/qcom_scm.h | 1 +
include/linux/qcom_scm.h | 7 +++++++
3 files changed, 32 insertions(+)
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
index e8bbf2d38ae7..7be48c1bec96 100644
--- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c
@@ -756,6 +756,30 @@ int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare)
}
EXPORT_SYMBOL(qcom_scm_iommu_secure_ptbl_init);
+int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,
+ u32 cp_nonpixel_start,
+ u32 cp_nonpixel_size)
+{
+ int ret;
+ struct qcom_scm_desc desc = {
+ .svc = QCOM_SCM_SVC_MP,
+ .cmd = QCOM_SCM_MP_VIDEO_VAR,
+ .arginfo = QCOM_SCM_ARGS(4, QCOM_SCM_VAL, QCOM_SCM_VAL,
+ QCOM_SCM_VAL, QCOM_SCM_VAL),
+ .args[0] = cp_start,
+ .args[1] = cp_size,
+ .args[2] = cp_nonpixel_start,
+ .args[3] = cp_nonpixel_size,
+ .owner = ARM_SMCCC_OWNER_SIP,
+ };
+ struct qcom_scm_res res;
+
+ ret = qcom_scm_call(__scm->dev, &desc, &res);
+
+ return ret ? : res.result[0];
+}
+EXPORT_SYMBOL(qcom_scm_mem_protect_video_var);
+
static int __qcom_scm_assign_mem(struct device *dev, phys_addr_t mem_region,
size_t mem_sz, phys_addr_t src, size_t src_sz,
phys_addr_t dest, size_t dest_sz)
diff --git a/drivers/firmware/qcom_scm.h b/drivers/firmware/qcom_scm.h
index 38ea614d29fe..95cd1ac30ab0 100644
--- a/drivers/firmware/qcom_scm.h
+++ b/drivers/firmware/qcom_scm.h
@@ -97,6 +97,7 @@ extern int scm_legacy_call(struct device *dev, const struct qcom_scm_desc *desc,
#define QCOM_SCM_MP_RESTORE_SEC_CFG 0x02
#define QCOM_SCM_MP_IOMMU_SECURE_PTBL_SIZE 0x03
#define QCOM_SCM_MP_IOMMU_SECURE_PTBL_INIT 0x04
+#define QCOM_SCM_MP_VIDEO_VAR 0x08
#define QCOM_SCM_MP_ASSIGN 0x16
#define QCOM_SCM_SVC_OCMEM 0x0f
diff --git a/include/linux/qcom_scm.h b/include/linux/qcom_scm.h
index 2e1193a3fb5f..0165824c5128 100644
--- a/include/linux/qcom_scm.h
+++ b/include/linux/qcom_scm.h
@@ -84,6 +84,9 @@ extern bool qcom_scm_restore_sec_cfg_available(void);
extern int qcom_scm_restore_sec_cfg(u32 device_id, u32 spare);
extern int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size);
extern int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare);
+extern int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,
+ u32 cp_nonpixel_start,
+ u32 cp_nonpixel_size);
extern int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
unsigned int *src,
const struct qcom_scm_vmperm *newvm,
@@ -141,6 +144,10 @@ static inline int qcom_scm_iommu_secure_ptbl_size(u32 spare, size_t *size)
{ return -ENODEV; }
static inline int qcom_scm_iommu_secure_ptbl_init(u64 addr, u32 size, u32 spare)
{ return -ENODEV; }
+extern inline int qcom_scm_mem_protect_video_var(u32 cp_start, u32 cp_size,
+ u32 cp_nonpixel_start,
+ u32 cp_nonpixel_size)
+ { return -ENODEV; }
static inline int qcom_scm_assign_mem(phys_addr_t mem_addr, size_t mem_sz,
unsigned int *src, const struct qcom_scm_vmperm *newvm,
unsigned int dest_cnt) { return -ENODEV; }
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] venus: firmware: Set virtual address ranges
2020-09-10 7:52 [PATCH v3 0/2] Venus - fix firmware load failure Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov
@ 2020-09-10 7:52 ` Stanimir Varbanov
2020-09-10 14:26 ` Bjorn Andersson
1 sibling, 1 reply; 4+ messages in thread
From: Stanimir Varbanov @ 2020-09-10 7:52 UTC (permalink / raw)
To: linux-arm-msm, linux-kernel, linux-media
Cc: Bjorn Andersson, Elliot Berman, Stanimir Varbanov
In order to boot some of the new Venus firmware versions TZ call to set
virtual address ranges is needed. Add virtual address ranges for CP and
CP_NONPIX in resource structure and use them when loading and booting
the firmware on remote processor.
Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/core.c | 4 ++++
drivers/media/platform/qcom/venus/core.h | 4 ++++
drivers/media/platform/qcom/venus/firmware.c | 19 ++++++++++++++++++-
3 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index c5af42873aed..3549a094e860 100644
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -540,6 +540,10 @@ static const struct venus_resources sdm845_res_v2 = {
.vmem_size = 0,
.vmem_addr = 0,
.dma_mask = 0xe0000000 - 1,
+ .cp_start = 0,
+ .cp_size = 0x70800000,
+ .cp_nonpixel_start = 0x1000000,
+ .cp_nonpixel_size = 0x24800000,
.fwname = "qcom/venus-5.2/venus.mdt",
};
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 1a7aee7ee628..3e3f0138e3c3 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -77,6 +77,10 @@ struct venus_resources {
unsigned int vmem_id;
u32 vmem_size;
u32 vmem_addr;
+ u32 cp_start;
+ u32 cp_size;
+ u32 cp_nonpixel_start;
+ u32 cp_nonpixel_size;
const char *fwname;
};
diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
index 8801a6a7543d..1db64a854b88 100644
--- a/drivers/media/platform/qcom/venus/firmware.c
+++ b/drivers/media/platform/qcom/venus/firmware.c
@@ -181,6 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core)
int venus_boot(struct venus_core *core)
{
struct device *dev = core->dev;
+ const struct venus_resources *res = core->res;
phys_addr_t mem_phys;
size_t mem_size;
int ret;
@@ -200,7 +201,23 @@ int venus_boot(struct venus_core *core)
else
ret = venus_boot_no_tz(core, mem_phys, mem_size);
- return ret;
+ if (ret)
+ return ret;
+
+ if (core->use_tz && res->cp_size) {
+ ret = qcom_scm_mem_protect_video_var(res->cp_start,
+ res->cp_size,
+ res->cp_nonpixel_start,
+ res->cp_nonpixel_size);
+ if (ret) {
+ qcom_scm_pas_shutdown(VENUS_PAS_ID);
+ dev_err(dev, "set virtual address ranges fail (%d)\n",
+ ret);
+ return ret;
+ }
+ }
+
+ return 0;
}
int venus_shutdown(struct venus_core *core)
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 2/2] venus: firmware: Set virtual address ranges
2020-09-10 7:52 ` [PATCH v3 2/2] venus: firmware: Set " Stanimir Varbanov
@ 2020-09-10 14:26 ` Bjorn Andersson
0 siblings, 0 replies; 4+ messages in thread
From: Bjorn Andersson @ 2020-09-10 14:26 UTC (permalink / raw)
To: Stanimir Varbanov; +Cc: linux-arm-msm, linux-kernel, linux-media, Elliot Berman
On Thu 10 Sep 02:52 CDT 2020, Stanimir Varbanov wrote:
> In order to boot some of the new Venus firmware versions TZ call to set
> virtual address ranges is needed. Add virtual address ranges for CP and
> CP_NONPIX in resource structure and use them when loading and booting
> the firmware on remote processor.
>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Regards,
Bjorn
> Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
> ---
> drivers/media/platform/qcom/venus/core.c | 4 ++++
> drivers/media/platform/qcom/venus/core.h | 4 ++++
> drivers/media/platform/qcom/venus/firmware.c | 19 ++++++++++++++++++-
> 3 files changed, 26 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
> index c5af42873aed..3549a094e860 100644
> --- a/drivers/media/platform/qcom/venus/core.c
> +++ b/drivers/media/platform/qcom/venus/core.c
> @@ -540,6 +540,10 @@ static const struct venus_resources sdm845_res_v2 = {
> .vmem_size = 0,
> .vmem_addr = 0,
> .dma_mask = 0xe0000000 - 1,
> + .cp_start = 0,
> + .cp_size = 0x70800000,
> + .cp_nonpixel_start = 0x1000000,
> + .cp_nonpixel_size = 0x24800000,
> .fwname = "qcom/venus-5.2/venus.mdt",
> };
>
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 1a7aee7ee628..3e3f0138e3c3 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -77,6 +77,10 @@ struct venus_resources {
> unsigned int vmem_id;
> u32 vmem_size;
> u32 vmem_addr;
> + u32 cp_start;
> + u32 cp_size;
> + u32 cp_nonpixel_start;
> + u32 cp_nonpixel_size;
> const char *fwname;
> };
>
> diff --git a/drivers/media/platform/qcom/venus/firmware.c b/drivers/media/platform/qcom/venus/firmware.c
> index 8801a6a7543d..1db64a854b88 100644
> --- a/drivers/media/platform/qcom/venus/firmware.c
> +++ b/drivers/media/platform/qcom/venus/firmware.c
> @@ -181,6 +181,7 @@ static int venus_shutdown_no_tz(struct venus_core *core)
> int venus_boot(struct venus_core *core)
> {
> struct device *dev = core->dev;
> + const struct venus_resources *res = core->res;
> phys_addr_t mem_phys;
> size_t mem_size;
> int ret;
> @@ -200,7 +201,23 @@ int venus_boot(struct venus_core *core)
> else
> ret = venus_boot_no_tz(core, mem_phys, mem_size);
>
> - return ret;
> + if (ret)
> + return ret;
> +
> + if (core->use_tz && res->cp_size) {
> + ret = qcom_scm_mem_protect_video_var(res->cp_start,
> + res->cp_size,
> + res->cp_nonpixel_start,
> + res->cp_nonpixel_size);
> + if (ret) {
> + qcom_scm_pas_shutdown(VENUS_PAS_ID);
> + dev_err(dev, "set virtual address ranges fail (%d)\n",
> + ret);
> + return ret;
> + }
> + }
> +
> + return 0;
> }
>
> int venus_shutdown(struct venus_core *core)
> --
> 2.17.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-10 21:03 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-10 7:52 [PATCH v3 0/2] Venus - fix firmware load failure Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov
2020-09-10 7:52 ` [PATCH v3 2/2] venus: firmware: Set " Stanimir Varbanov
2020-09-10 14:26 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).