* [PATCH v2 0/2] Venus - fix firmware load failure @ 2020-08-17 8:27 Stanimir Varbanov 2020-08-17 8:27 ` [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov 2020-08-17 8:27 ` [PATCH v2 2/2] venus: firmware: Set " Stanimir Varbanov 0 siblings, 2 replies; 7+ messages in thread From: Stanimir Varbanov @ 2020-08-17 8:27 UTC (permalink / raw) To: linux-arm-msm, linux-kernel, linux-media Cc: Elliot Berman, Andy Gross, Bjorn Andersson, Stanimir Varbanov Hi, Changes since v1: * Move the new scm call above assign mem - Elliot Berman v1 can be found at [1]. regards, Stan [1] https://lkml.org/lkml/2020/7/9/472 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 | 18 ++++++++++++++- include/linux/qcom_scm.h | 8 ++++++- 6 files changed, 57 insertions(+), 2 deletions(-) -- 2.17.1 ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges 2020-08-17 8:27 [PATCH v2 0/2] Venus - fix firmware load failure Stanimir Varbanov @ 2020-08-17 8:27 ` Stanimir Varbanov 2020-08-18 18:01 ` Elliot Berman 2020-09-08 14:40 ` Bjorn Andersson 2020-08-17 8:27 ` [PATCH v2 2/2] venus: firmware: Set " Stanimir Varbanov 1 sibling, 2 replies; 7+ messages in thread From: Stanimir Varbanov @ 2020-08-17 8:27 UTC (permalink / raw) To: linux-arm-msm, linux-kernel, linux-media Cc: Elliot Berman, Andy Gross, Bjorn Andersson, Stanimir Varbanov This adds a new SCM memprotect command to set virtual address ranges. Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> --- drivers/firmware/qcom_scm.c | 24 ++++++++++++++++++++++++ drivers/firmware/qcom_scm.h | 1 + include/linux/qcom_scm.h | 8 +++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c index 0e7233a20f34..dec8dc42a6bc 100644 --- a/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c @@ -757,6 +757,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 d9ed670da222..14da834ac593 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 3d6a24697761..ba45537f688b 100644 --- a/include/linux/qcom_scm.h +++ b/include/linux/qcom_scm.h @@ -77,11 +77,13 @@ 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, unsigned int dest_cnt); - extern bool qcom_scm_ocmem_lock_available(void); extern int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, u32 size, u32 mode); @@ -128,6 +130,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] 7+ messages in thread
* Re: [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges 2020-08-17 8:27 ` [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov @ 2020-08-18 18:01 ` Elliot Berman 2020-09-08 14:40 ` Bjorn Andersson 1 sibling, 0 replies; 7+ messages in thread From: Elliot Berman @ 2020-08-18 18:01 UTC (permalink / raw) To: Stanimir Varbanov, linux-arm-msm, linux-kernel, linux-media Cc: Andy Gross, Bjorn Andersson Reviewed-by: Elliot Berman <eberman@codeaurora.org> On 8/17/2020 1:27 AM, Stanimir Varbanov wrote: > This adds a new SCM memprotect command to set virtual address ranges. > > Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> > --- > drivers/firmware/qcom_scm.c | 24 ++++++++++++++++++++++++ > drivers/firmware/qcom_scm.h | 1 + > include/linux/qcom_scm.h | 8 +++++++- > 3 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index 0e7233a20f34..dec8dc42a6bc 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -757,6 +757,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 d9ed670da222..14da834ac593 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 3d6a24697761..ba45537f688b 100644 > --- a/include/linux/qcom_scm.h > +++ b/include/linux/qcom_scm.h > @@ -77,11 +77,13 @@ 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, > unsigned int dest_cnt); > - > extern bool qcom_scm_ocmem_lock_available(void); > extern int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, > u32 size, u32 mode); > @@ -128,6 +130,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; } > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges 2020-08-17 8:27 ` [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov 2020-08-18 18:01 ` Elliot Berman @ 2020-09-08 14:40 ` Bjorn Andersson 1 sibling, 0 replies; 7+ messages in thread From: Bjorn Andersson @ 2020-09-08 14:40 UTC (permalink / raw) To: Stanimir Varbanov Cc: linux-arm-msm, linux-kernel, linux-media, Elliot Berman, Andy Gross On Mon 17 Aug 03:27 CDT 2020, Stanimir Varbanov wrote: > This adds a new SCM memprotect command to set virtual address ranges. > Acked-by: Bjorn Andersson <bjorn.andersson@linaro.org> Please feel free to pick this through linux-media. Regards, Bjorn > Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org> > --- > drivers/firmware/qcom_scm.c | 24 ++++++++++++++++++++++++ > drivers/firmware/qcom_scm.h | 1 + > include/linux/qcom_scm.h | 8 +++++++- > 3 files changed, 32 insertions(+), 1 deletion(-) > > diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c > index 0e7233a20f34..dec8dc42a6bc 100644 > --- a/drivers/firmware/qcom_scm.c > +++ b/drivers/firmware/qcom_scm.c > @@ -757,6 +757,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 d9ed670da222..14da834ac593 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 3d6a24697761..ba45537f688b 100644 > --- a/include/linux/qcom_scm.h > +++ b/include/linux/qcom_scm.h > @@ -77,11 +77,13 @@ 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, > unsigned int dest_cnt); > - > extern bool qcom_scm_ocmem_lock_available(void); > extern int qcom_scm_ocmem_lock(enum qcom_scm_ocmem_client id, u32 offset, > u32 size, u32 mode); > @@ -128,6 +130,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 [flat|nested] 7+ messages in thread
* [PATCH v2 2/2] venus: firmware: Set virtual address ranges 2020-08-17 8:27 [PATCH v2 0/2] Venus - fix firmware load failure Stanimir Varbanov 2020-08-17 8:27 ` [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov @ 2020-08-17 8:27 ` Stanimir Varbanov 2020-09-08 14:39 ` Bjorn Andersson 1 sibling, 1 reply; 7+ messages in thread From: Stanimir Varbanov @ 2020-08-17 8:27 UTC (permalink / raw) To: linux-arm-msm, linux-kernel, linux-media Cc: Elliot Berman, Andy Gross, Bjorn Andersson, 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 | 18 +++++++++++++++++- 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c index 203c6538044f..5f8f7b72731c 100644 --- a/drivers/media/platform/qcom/venus/core.c +++ b/drivers/media/platform/qcom/venus/core.c @@ -527,6 +527,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 7118612673c9..8c88516e4694 100644 --- a/drivers/media/platform/qcom/venus/core.h +++ b/drivers/media/platform/qcom/venus/core.h @@ -68,6 +68,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..ac906ffc608f 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,22 @@ 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) { + 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] 7+ messages in thread
* Re: [PATCH v2 2/2] venus: firmware: Set virtual address ranges 2020-08-17 8:27 ` [PATCH v2 2/2] venus: firmware: Set " Stanimir Varbanov @ 2020-09-08 14:39 ` Bjorn Andersson 2020-09-08 22:47 ` Stanimir Varbanov 0 siblings, 1 reply; 7+ messages in thread From: Bjorn Andersson @ 2020-09-08 14:39 UTC (permalink / raw) To: Stanimir Varbanov Cc: linux-arm-msm, linux-kernel, linux-media, Elliot Berman, Andy Gross On Mon 17 Aug 03:27 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. > > 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 | 18 +++++++++++++++++- > 3 files changed, 25 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c > index 203c6538044f..5f8f7b72731c 100644 > --- a/drivers/media/platform/qcom/venus/core.c > +++ b/drivers/media/platform/qcom/venus/core.c > @@ -527,6 +527,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 7118612673c9..8c88516e4694 100644 > --- a/drivers/media/platform/qcom/venus/core.h > +++ b/drivers/media/platform/qcom/venus/core.h > @@ -68,6 +68,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..ac906ffc608f 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,22 @@ 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) { > + dev_err(dev, "set virtual address ranges fail (%d)\n", > + ret); > + return ret; Afaict venus_probe() will tear down clocks and power of the now running Venus core when you return an error here. Isn't it necessary to stop the core here as well? Regards, Bjorn > + } > + } > + > + return 0; > } > > int venus_shutdown(struct venus_core *core) > -- > 2.17.1 > ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v2 2/2] venus: firmware: Set virtual address ranges 2020-09-08 14:39 ` Bjorn Andersson @ 2020-09-08 22:47 ` Stanimir Varbanov 0 siblings, 0 replies; 7+ messages in thread From: Stanimir Varbanov @ 2020-09-08 22:47 UTC (permalink / raw) To: Bjorn Andersson, Stanimir Varbanov Cc: linux-arm-msm, linux-kernel, linux-media, Elliot Berman, Andy Gross On 9/8/20 5:39 PM, Bjorn Andersson wrote: > On Mon 17 Aug 03:27 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. >> >> 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 | 18 +++++++++++++++++- >> 3 files changed, 25 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c >> index 203c6538044f..5f8f7b72731c 100644 >> --- a/drivers/media/platform/qcom/venus/core.c >> +++ b/drivers/media/platform/qcom/venus/core.c >> @@ -527,6 +527,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 7118612673c9..8c88516e4694 100644 >> --- a/drivers/media/platform/qcom/venus/core.h >> +++ b/drivers/media/platform/qcom/venus/core.h >> @@ -68,6 +68,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..ac906ffc608f 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,22 @@ 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) { >> + dev_err(dev, "set virtual address ranges fail (%d)\n", >> + ret); >> + return ret; > > Afaict venus_probe() will tear down clocks and power of the now running > Venus core when you return an error here. Isn't it necessary to stop the > core here as well? I guess by "stop the core" you mean a call to qcom_scm_pas_shutdown() ? If so, I think it makes sense. -- regards, Stan ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-09-08 22:47 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-17 8:27 [PATCH v2 0/2] Venus - fix firmware load failure Stanimir Varbanov 2020-08-17 8:27 ` [PATCH v2 1/2] firmware: qcom_scm: Add memory protect virtual address ranges Stanimir Varbanov 2020-08-18 18:01 ` Elliot Berman 2020-09-08 14:40 ` Bjorn Andersson 2020-08-17 8:27 ` [PATCH v2 2/2] venus: firmware: Set " Stanimir Varbanov 2020-09-08 14:39 ` Bjorn Andersson 2020-09-08 22:47 ` Stanimir Varbanov
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).