media: venus: firmware: Set virtual address ranges

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>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/platform/qcom/venus/core.c b/drivers/media/platform/qcom/venus/core.c
index 151784f434bc106310ac06b646206430562ab8de..6103aaf43987b080aef1095376a3748b17dc8524 100644 (file)
--- a/drivers/media/platform/qcom/venus/core.c
+++ b/drivers/media/platform/qcom/venus/core.c
@@ -532,6 +532,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 2e70004ef195a3608729ad137a8b85febe885f93..7b79a33dc9d6e43d0458798f3a64887af0a3406b 100644 (file)
--- 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 8801a6a7543de872a8c4204d49b30ef3b720f311..1db64a854b88ba63bb24c0ad661f81687b5d5f76 100644 (file)
--- 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)