1 From 7358d42dfbdfdb5d4f1d0d4c2e5c2bb4143a29b0 Mon Sep 17 00:00:00 2001
2 From: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
3 Date: Sat, 30 Jan 2021 10:50:06 +0530
4 Subject: [PATCH] remoteproc: qcom: Add secure PIL support
6 IPQ8074 uses secure PIL. Hence, adding the support for the same.
8 Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
9 Signed-off-by: Sricharan R <sricharan@codeaurora.org>
10 Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
12 drivers/remoteproc/qcom_q6v5_wcss.c | 43 +++++++++++++++++++++++++++--
13 1 file changed, 40 insertions(+), 3 deletions(-)
15 --- a/drivers/remoteproc/qcom_q6v5_wcss.c
16 +++ b/drivers/remoteproc/qcom_q6v5_wcss.c
18 #include <linux/regulator/consumer.h>
19 #include <linux/reset.h>
20 #include <linux/soc/qcom/mdt_loader.h>
21 +#include <linux/qcom_scm.h>
22 #include "qcom_common.h"
23 #include "qcom_pil_info.h"
24 #include "qcom_q6v5.h"
26 #define TCSR_WCSS_CLK_ENABLE 0x14
28 #define MAX_HALT_REG 3
30 +#define WCNSS_PAS_ID 6
35 @@ -134,6 +138,7 @@ struct q6v5_wcss {
36 unsigned int crash_reason_smem;
38 bool requires_force_stop;
39 + bool need_mem_protection;
41 struct qcom_rproc_glink glink_subdev;
42 struct qcom_rproc_ssr ssr_subdev;
43 @@ -152,6 +157,7 @@ struct wcss_data {
45 const struct rproc_ops *ops;
46 bool requires_force_stop;
47 + bool need_mem_protection;
50 static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
51 @@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc
53 qcom_q6v5_prepare(&wcss->q6v5);
55 + if (wcss->need_mem_protection) {
56 + ret = qcom_scm_pas_auth_and_reset(WCNSS_PAS_ID);
58 + dev_err(wcss->dev, "wcss_reset failed\n");
61 + goto wait_for_reset;
64 /* Release Q6 and WCSS reset */
65 ret = reset_control_deassert(wcss->wcss_reset);
67 @@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc
72 ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
73 if (ret == -ETIMEDOUT)
74 dev_err(wcss->dev, "start timed out\n");
75 @@ -718,6 +734,15 @@ static int q6v5_wcss_stop(struct rproc *
76 struct q6v5_wcss *wcss = rproc->priv;
79 + if (wcss->need_mem_protection) {
80 + ret = qcom_scm_pas_shutdown(WCNSS_PAS_ID);
82 + dev_err(wcss->dev, "not able to shutdown\n");
89 if (wcss->requires_force_stop) {
90 ret = qcom_q6v5_request_stop(&wcss->q6v5, NULL);
91 @@ -742,6 +767,7 @@ static int q6v5_wcss_stop(struct rproc *
96 clk_disable_unprepare(wcss->prng_clk);
97 qcom_q6v5_unprepare(&wcss->q6v5);
99 @@ -765,9 +791,15 @@ static int q6v5_wcss_load(struct rproc *
100 struct q6v5_wcss *wcss = rproc->priv;
103 - ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
104 - 0, wcss->mem_region, wcss->mem_phys,
105 - wcss->mem_size, &wcss->mem_reloc);
106 + if (wcss->need_mem_protection)
107 + ret = qcom_mdt_load(wcss->dev, fw, rproc->firmware,
108 + WCNSS_PAS_ID, wcss->mem_region,
109 + wcss->mem_phys, wcss->mem_size,
112 + ret = qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
113 + 0, wcss->mem_region, wcss->mem_phys,
114 + wcss->mem_size, &wcss->mem_reloc);
118 @@ -1036,6 +1068,9 @@ static int q6v5_wcss_probe(struct platfo
122 + if (desc->need_mem_protection && !qcom_scm_is_available())
123 + return -EPROBE_DEFER;
125 rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
126 desc->firmware_name, sizeof(*wcss));
128 @@ -1049,6 +1084,7 @@ static int q6v5_wcss_probe(struct platfo
130 wcss->version = desc->version;
131 wcss->requires_force_stop = desc->requires_force_stop;
132 + wcss->need_mem_protection = desc->need_mem_protection;
134 ret = q6v5_wcss_init_mmio(wcss, pdev);
136 @@ -1120,6 +1156,7 @@ static const struct wcss_data wcss_ipq80
137 .wcss_q6_reset_required = true,
138 .ops = &q6v5_wcss_ipq8074_ops,
139 .requires_force_stop = true,
140 + .need_mem_protection = true,
143 static const struct wcss_data wcss_qcs404_res_init = {