1 files changed, 101 insertions, 5 deletions

diff --git a/drivers/remoteproc/qcom_q6v5_pil.c b/drivers/remoteproc/qcom_q6v5_pil.c
index 39b9ee4a63b7..728179ba7db2 100644
--- a/drivers/remoteproc/qcom_q6v5_pil.c
+++ b/drivers/remoteproc/qcom_q6v5_pil.c
@@ -110,6 +110,7 @@ struct rproc_hexagon_res {
         struct qcom_mss_reg_res *active_supply;
         char **proxy_clk_names;
         char **active_clk_names;
+        bool need_mem_protection;
 };
 
 struct q6v5 {
@@ -154,6 +155,10 @@ struct q6v5 {
 
         struct qcom_rproc_subdev smd_subdev;
         struct qcom_rproc_ssr ssr_subdev;
+        bool need_mem_protection;
+        int mpss_perm;
+        int mba_perm;
+
 };
 
 static int q6v5_regulator_init(struct device *dev, struct reg_info *regs,
@@ -289,6 +294,35 @@ static struct resource_table *q6v5_find_rsc_table(struct rproc *rproc,
         return &table;
 }
 
+static int q6v5_xfer_mem_ownership(struct q6v5 *qproc, int *current_perm,
+                                   bool remote_owner, phys_addr_t addr,
+                                   size_t size)
+{
+        struct qcom_scm_vmperm next;
+        int ret;
+
+        if (!qproc->need_mem_protection)
+                return 0;
+        if (remote_owner && *current_perm == BIT(QCOM_SCM_VMID_MSS_MSA))
+                return 0;
+        if (!remote_owner && *current_perm == BIT(QCOM_SCM_VMID_HLOS))
+                return 0;
+
+        next.vmid = remote_owner ? QCOM_SCM_VMID_MSS_MSA : QCOM_SCM_VMID_HLOS;
+        next.perm = remote_owner ? QCOM_SCM_PERM_RW : QCOM_SCM_PERM_RWX;
+
+        ret = qcom_scm_assign_mem(addr, ALIGN(size, SZ_4K),
+                                  current_perm, &next, 1);
+        if (ret < 0) {
+                pr_err("Failed to assign memory access in range %p to %p to %s ret = %d\n",
+                       (void *)addr, (void *)(addr + size),
+                       remote_owner ? "mss" : "hlos", ret);
+                return ret;
+        }
+
+        return 0;
+}
+
 static int q6v5_load(struct rproc *rproc, const struct firmware *fw)
 {
         struct q6v5 *qproc = rproc->priv;
@@ -451,6 +485,8 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
 {
         unsigned long dma_attrs = DMA_ATTR_FORCE_CONTIGUOUS;
         dma_addr_t phys;
+        int mdata_perm;
+        int xferop_ret;
         void *ptr;
         int ret;
 
@@ -462,6 +498,13 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
 
         memcpy(ptr, fw->data, fw->size);
 
+        /* Hypervisor mapping to access metadata by modem */
+        mdata_perm = BIT(QCOM_SCM_VMID_HLOS);
+        ret = q6v5_xfer_mem_ownership(qproc, &mdata_perm,
+                                      true, phys, fw->size);
+        if (ret)
+                return -EAGAIN;
+
         writel(phys, qproc->rmb_base + RMB_PMI_META_DATA_REG);
         writel(RMB_CMD_META_DATA_READY, qproc->rmb_base + RMB_MBA_COMMAND_REG);
 
@@ -471,6 +514,13 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw)
         else if (ret < 0)
                 dev_err(qproc->dev, "MPSS header authentication failed: %d\n", ret);
 
+        /* Metadata authentication done, remove modem access */
+        xferop_ret = q6v5_xfer_mem_ownership(qproc, &mdata_perm,
+                                             false, phys, fw->size);
+        if (xferop_ret)
+                dev_warn(qproc->dev,
+                         "mdt buffer not reclaimed system may become unstable\n");
+
         dma_free_attrs(qproc->dev, fw->size, ptr, phys, dma_attrs);
 
         return ret < 0 ? ret : 0;
@@ -578,7 +628,12 @@ static int q6v5_mpss_load(struct q6v5 *qproc)
                 size += phdr->p_memsz;
         }
 
-        /* Transfer ownership of modem ddr region with q6*/
+        /* Transfer ownership of modem ddr region to q6 */
+        ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, true,
+                                      qproc->mpss_phys, qproc->mpss_size);
+        if (ret)
+                return -EAGAIN;
+
         boot_addr = relocate ? qproc->mpss_phys : min_addr;
         writel(boot_addr, qproc->rmb_base + RMB_PMI_CODE_START_REG);
         writel(RMB_CMD_LOAD_READY, qproc->rmb_base + RMB_MBA_COMMAND_REG);
@@ -599,6 +654,7 @@ release_firmware:
 static int q6v5_start(struct rproc *rproc)
 {
         struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
+        int xfermemop_ret;
         int ret;
 
         ret = q6v5_regulator_enable(qproc, qproc->proxy_regs,
@@ -634,11 +690,18 @@ static int q6v5_start(struct rproc *rproc)
                 goto assert_reset;
         }
 
+        /* Assign MBA image access in DDR to q6 */
+        xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, true,
+                                                qproc->mba_phys,
+                                                qproc->mba_size);
+        if (xfermemop_ret)
+                goto disable_active_clks;
+
         writel(qproc->mba_phys, qproc->rmb_base + RMB_MBA_IMAGE_REG);
 
         ret = q6v5proc_reset(qproc);
         if (ret)
-                goto halt_axi_ports;
+                goto reclaim_mba;
 
         ret = q6v5_rmb_mba_wait(qproc, 0, 5000);
         if (ret == -ETIMEDOUT) {
@@ -655,16 +718,22 @@ static int q6v5_start(struct rproc *rproc)
 
         ret = q6v5_mpss_load(qproc);
         if (ret)
-                goto halt_axi_ports;
+                goto reclaim_mpss;
 
         ret = wait_for_completion_timeout(&qproc->start_done,
                                           msecs_to_jiffies(5000));
         if (ret == 0) {
                 dev_err(qproc->dev, "start timed out\n");
                 ret = -ETIMEDOUT;
-                goto halt_axi_ports;
+                goto reclaim_mpss;
         }
 
+        xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, false,
+                                                qproc->mba_phys,
+                                                qproc->mba_size);
+        if (xfermemop_ret)
+                dev_err(qproc->dev,
+                        "Failed to reclaim mba buffer system may become unstable\n");
         qproc->running = true;
 
         q6v5_clk_disable(qproc->dev, qproc->proxy_clks,
@@ -674,12 +743,30 @@ static int q6v5_start(struct rproc *rproc)
 
         return 0;
 
+reclaim_mpss:
+        xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm,
+                                                false, qproc->mpss_phys,
+                                                qproc->mpss_size);
+        WARN_ON(xfermemop_ret);
+
 halt_axi_ports:
         q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_q6);
         q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_modem);
         q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_nc);
+
+reclaim_mba:
+        xfermemop_ret = q6v5_xfer_mem_ownership(qproc, &qproc->mba_perm, false,
+                                                qproc->mba_phys,
+                                                qproc->mba_size);
+        if (xfermemop_ret) {
+                dev_err(qproc->dev,
+                        "Failed to reclaim mba buffer, system may become unstable\n");
+        }
+
+disable_active_clks:
         q6v5_clk_disable(qproc->dev, qproc->active_clks,
                          qproc->active_clk_count);
+
 assert_reset:
         reset_control_assert(qproc->mss_restart);
 disable_vdd:
@@ -699,6 +786,7 @@ static int q6v5_stop(struct rproc *rproc)
 {
         struct q6v5 *qproc = (struct q6v5 *)rproc->priv;
         int ret;
+        u32 val;
 
         qproc->running = false;
 
@@ -716,6 +804,10 @@ static int q6v5_stop(struct rproc *rproc)
         q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_modem);
         q6v5proc_halt_axi_port(qproc, qproc->halt_map, qproc->halt_nc);
 
+        ret = q6v5_xfer_mem_ownership(qproc, &qproc->mpss_perm, false,
+                                      qproc->mpss_phys, qproc->mpss_size);
+        WARN_ON(ret);
+
         reset_control_assert(qproc->mss_restart);
         q6v5_clk_disable(qproc->dev, qproc->active_clks,
                          qproc->active_clk_count);
@@ -1014,6 +1106,7 @@ static int q6v5_probe(struct platform_device *pdev)
         if (ret)
                 goto free_rproc;
 
+        qproc->need_mem_protection = desc->need_mem_protection;
         ret = q6v5_request_irq(qproc, pdev, "wdog", q6v5_wdog_interrupt);
         if (ret < 0)
                 goto free_rproc;
@@ -1035,7 +1128,8 @@ static int q6v5_probe(struct platform_device *pdev)
                 ret = PTR_ERR(qproc->state);
                 goto free_rproc;
         }
-
+        qproc->mpss_perm = BIT(QCOM_SCM_VMID_HLOS);
+        qproc->mba_perm = BIT(QCOM_SCM_VMID_HLOS);
         qcom_add_smd_subdev(rproc, &qproc->smd_subdev);
         qcom_add_ssr_subdev(rproc, &qproc->ssr_subdev, "mpss");
 
@@ -1091,6 +1185,7 @@ static const struct rproc_hexagon_res msm8916_mss = {
                 "mem",
                 NULL
         },
+        .need_mem_protection = false,
 };
 
 static const struct rproc_hexagon_res msm8974_mss = {
@@ -1128,6 +1223,7 @@ static const struct rproc_hexagon_res msm8974_mss = {
                 "mem",
                 NULL
         },
+        .need_mem_protection = false,
 };
 
 static const struct of_device_id q6v5_of_match[] = {