Linux-ARM-MSM Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil
@ 2019-11-27 15:12 Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 01/10] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
                   ` (9 more replies)
  0 siblings, 10 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

IPQ8074 needs support for secure pil as well.
Also, currently only unified firmware is supported.
IPQ8074 supports split firmware for q6 and m3, so
adding support for that.

Also, this series is based on Govind’s,
“[v5] Add non PAS wcss Q6 support for QCS404”
https://patchwork.kernel.org/cover/11060629/

[V3] Fixed all comments.

Gokul Sriram Palanisamy (10):
  remoteproc: qcom: Add PRNG proxy clock
  remoteproc: qcom: Add secure PIL support
  remoteproc: qcom: Add support for split q6 + m3 wlan firmware
  remoteproc: qcom: Add ssr subdevice identifier
  remoteproc: qcom: Update regmap offsets for halt register
  dt-bindings: clock: qcom: Add reset for WCSSAON
  clk: qcom: Add WCSSAON reset
  dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC
  arm64: dts: Add support for scm on IPQ8074 SoCs
  arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC

 .../devicetree/bindings/firmware/qcom,scm.txt      |   1 +
 arch/arm64/boot/dts/qcom/ipq8074.dtsi              | 127 +++++++++++++++++
 drivers/clk/qcom/gcc-ipq8074.c                     |   1 +
 drivers/remoteproc/qcom_q6v5_wcss.c                | 155 ++++++++++++++++-----
 include/dt-bindings/clock/qcom,gcc-ipq8074.h       |   1 +
 5 files changed, 254 insertions(+), 31 deletions(-)

-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 01/10] remoteproc: qcom: Add PRNG proxy clock
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 02/10] remoteproc: qcom: Add secure PIL support Gokul Sriram Palanisamy
                   ` (8 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

PRNG clock is needed by the secure PIL, support for the same
is added in subsequent patches.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 69 ++++++++++++++++++++++++++-----------
 1 file changed, 49 insertions(+), 20 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index a2671a1..e5cc064 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -91,19 +91,6 @@ enum {
 	WCSS_QCS404,
 };
 
-struct wcss_data {
-	const char *firmware_name;
-	int crash_reason_smem;
-	u32 version;
-	bool aon_reset_required;
-	bool wcss_q6_reset_required;
-	const char *ssr_name;
-	const char *sysmon_name;
-	int ssctl_id;
-	const struct rproc_ops *ops;
-	bool requires_force_stop;
-};
-
 struct q6v5_wcss {
 	struct device *dev;
 
@@ -128,6 +115,7 @@ struct q6v5_wcss {
 	struct clk *qdsp6ss_xo_cbcr;
 	struct clk *qdsp6ss_core_gfmux;
 	struct clk *lcc_bcr_sleep;
+	struct clk *prng_clk;
 	struct regulator *cx_supply;
 
 	struct qcom_rproc_glink glink_subdev;
@@ -151,6 +139,21 @@ struct q6v5_wcss {
 	bool requires_force_stop;
 };
 
+struct wcss_data {
+	int (*init_clock)(struct q6v5_wcss *wcss);
+	int (*init_regulator)(struct q6v5_wcss *wcss);
+	const char *firmware_name;
+	int crash_reason_smem;
+	u32 version;
+	bool aon_reset_required;
+	bool wcss_q6_reset_required;
+	const char *ssr_name;
+	const char *sysmon_name;
+	int ssctl_id;
+	const struct rproc_ops *ops;
+	bool requires_force_stop;
+};
+
 static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
 {
 	int ret;
@@ -240,6 +243,12 @@ static int q6v5_wcss_start(struct rproc *rproc)
 	struct q6v5_wcss *wcss = rproc->priv;
 	int ret;
 
+	ret = clk_prepare_enable(wcss->prng_clk);
+	if (ret) {
+		dev_err(wcss->dev, "prng clock enable failed\n");
+		return ret;
+	}
+
 	qcom_q6v5_prepare(&wcss->q6v5);
 
 	/* Release Q6 and WCSS reset */
@@ -732,6 +741,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
 			return ret;
 	}
 
+	clk_disable_unprepare(wcss->prng_clk);
 	qcom_q6v5_unprepare(&wcss->q6v5);
 
 	return 0;
@@ -889,7 +899,21 @@ static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss)
 	return 0;
 }
 
-static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
+static int ipq8074_init_clock(struct q6v5_wcss *wcss)
+{
+	int ret;
+
+	wcss->prng_clk = devm_clk_get(wcss->dev, "prng");
+	if (IS_ERR(wcss->prng_clk)) {
+		ret = PTR_ERR(wcss->prng_clk);
+		if (ret != -EPROBE_DEFER)
+			dev_err(wcss->dev, "Failed to get prng clock\n");
+		return ret;
+	}
+	return 0;
+}
+
+static int qcs404_init_clock(struct q6v5_wcss *wcss)
 {
 	int ret;
 
@@ -979,7 +1003,7 @@ static int q6v5_wcss_init_clock(struct q6v5_wcss *wcss)
 	return 0;
 }
 
-static int q6v5_wcss_init_regulator(struct q6v5_wcss *wcss)
+static int qcs404_init_regulator(struct q6v5_wcss *wcss)
 {
 	wcss->cx_supply = devm_regulator_get(wcss->dev, "cx");
 	if (IS_ERR(wcss->cx_supply))
@@ -1023,14 +1047,16 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 	if (ret)
 		goto free_rproc;
 
-	if (wcss->version == WCSS_QCS404) {
-		ret = q6v5_wcss_init_clock(wcss);
+	if (desc->init_clock) {
+		ret = desc->init_clock(wcss);
 		if (ret)
 			goto free_rproc;
 
-		ret = q6v5_wcss_init_regulator(wcss);
-		if (ret)
-			goto free_rproc;
+		if (desc->init_regulator) {
+			ret = desc->init_regulator(wcss);
+			if (ret)
+				goto free_rproc;
+		}
 	}
 
 	ret = q6v5_wcss_init_reset(wcss, desc);
@@ -1073,6 +1099,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 }
 
 static const struct wcss_data wcss_ipq8074_res_init = {
+	.init_clock = ipq8074_init_clock,
 	.firmware_name = "IPQ8074/q6_fw.mdt",
 	.crash_reason_smem = WCSS_CRASH_REASON,
 	.aon_reset_required = true,
@@ -1082,6 +1109,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 };
 
 static const struct wcss_data wcss_qcs404_res_init = {
+	.init_clock = qcs404_init_clock,
+	.init_regulator = qcs404_init_regulator,
 	.crash_reason_smem = WCSS_CRASH_REASON,
 	.firmware_name = "wcnss.mdt",
 	.version = WCSS_QCS404,
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 02/10] remoteproc: qcom: Add secure PIL support
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 01/10] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 03/10] remoteproc: qcom: Add support for split q6 + m3 wlan firmware Gokul Sriram Palanisamy
                   ` (7 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

IPQ8074 uses secure PIL. Hence, adding the support for the same.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index e5cc064..49d98d3 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -19,6 +19,7 @@
 #include <linux/regulator/consumer.h>
 #include <linux/reset.h>
 #include <linux/soc/qcom/mdt_loader.h>
+#include <linux/qcom_scm.h>
 #include "qcom_common.h"
 #include "qcom_q6v5.h"
 
@@ -86,6 +87,9 @@
 #define TCSR_WCSS_CLK_ENABLE	0x14
 
 #define MAX_HALT_REG		3
+
+#define WCNSS_PAS_ID		6
+
 enum {
 	WCSS_IPQ8074,
 	WCSS_QCS404,
@@ -137,6 +141,7 @@ struct q6v5_wcss {
 	int crash_reason_smem;
 	u32 version;
 	bool requires_force_stop;
+	bool need_mem_protection;
 };
 
 struct wcss_data {
@@ -152,6 +157,7 @@ struct wcss_data {
 	int ssctl_id;
 	const struct rproc_ops *ops;
 	bool requires_force_stop;
+	bool need_mem_protection;
 };
 
 static int q6v5_wcss_reset(struct q6v5_wcss *wcss)
@@ -251,6 +257,15 @@ static int q6v5_wcss_start(struct rproc *rproc)
 
 	qcom_q6v5_prepare(&wcss->q6v5);
 
+	if (wcss->need_mem_protection) {
+		ret = qcom_scm_pas_auth_and_reset(WCNSS_PAS_ID);
+		if (ret) {
+			dev_err(wcss->dev, "wcss_reset failed\n");
+			return ret;
+		}
+		goto wait_for_reset;
+	}
+
 	/* Release Q6 and WCSS reset */
 	ret = reset_control_deassert(wcss->wcss_reset);
 	if (ret) {
@@ -285,6 +300,7 @@ static int q6v5_wcss_start(struct rproc *rproc)
 	if (ret)
 		goto wcss_q6_reset;
 
+wait_for_reset:
 	ret = qcom_q6v5_wait_for_start(&wcss->q6v5, 5 * HZ);
 	if (ret == -ETIMEDOUT)
 		dev_err(wcss->dev, "start timed out\n");
@@ -717,6 +733,15 @@ static int q6v5_wcss_stop(struct rproc *rproc)
 	struct q6v5_wcss *wcss = rproc->priv;
 	int ret;
 
+	if (wcss->need_mem_protection) {
+		ret = qcom_scm_pas_shutdown(WCNSS_PAS_ID);
+		if (ret) {
+			dev_err(wcss->dev, "not able to shutdown\n");
+			return ret;
+		}
+		goto pas_done;
+	}
+
 	/* WCSS powerdown */
 	if (wcss->requires_force_stop) {
 		ret = qcom_q6v5_request_stop(&wcss->q6v5);
@@ -741,6 +766,7 @@ static int q6v5_wcss_stop(struct rproc *rproc)
 			return ret;
 	}
 
+pas_done:
 	clk_disable_unprepare(wcss->prng_clk);
 	qcom_q6v5_unprepare(&wcss->q6v5);
 
@@ -763,6 +789,12 @@ static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
 {
 	struct q6v5_wcss *wcss = rproc->priv;
 
+	if (wcss->need_mem_protection)
+		return qcom_mdt_load(wcss->dev, fw, rproc->firmware,
+				     WCNSS_PAS_ID, wcss->mem_region,
+				     wcss->mem_phys, wcss->mem_size,
+				     &wcss->mem_reloc);
+
 	return qcom_mdt_load_no_init(wcss->dev, fw, rproc->firmware,
 				     0, wcss->mem_region, wcss->mem_phys,
 				     wcss->mem_size, &wcss->mem_reloc);
@@ -1038,6 +1070,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 
 	wcss->version = desc->version;
 	wcss->requires_force_stop = desc->requires_force_stop;
+	wcss->need_mem_protection = desc->need_mem_protection;
 
 	ret = q6v5_wcss_init_mmio(wcss, pdev);
 	if (ret)
@@ -1106,6 +1139,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.wcss_q6_reset_required = true,
 	.ops = &q6v5_wcss_ipq8074_ops,
 	.requires_force_stop = true,
+	.need_mem_protection = true,
 };
 
 static const struct wcss_data wcss_qcs404_res_init = {
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 03/10] remoteproc: qcom: Add support for split q6 + m3 wlan firmware
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 01/10] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 02/10] remoteproc: qcom: Add secure PIL support Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 04/10] remoteproc: qcom: Add ssr subdevice identifier Gokul Sriram Palanisamy
                   ` (6 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

IPQ8074 supports split firmware for q6 and m3 as well.
So add support for loading the m3 firmware before q6.
Now the drivers works fine for both split and unified
firmwares.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 49d98d3..fcb1956 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -142,12 +142,14 @@ struct q6v5_wcss {
 	u32 version;
 	bool requires_force_stop;
 	bool need_mem_protection;
+	const char *m3_firmware_name;
 };
 
 struct wcss_data {
 	int (*init_clock)(struct q6v5_wcss *wcss);
 	int (*init_regulator)(struct q6v5_wcss *wcss);
-	const char *firmware_name;
+	const char *q6_firmware_name;
+	const char *m3_firmware_name;
 	int crash_reason_smem;
 	u32 version;
 	bool aon_reset_required;
@@ -788,7 +790,26 @@ static void *q6v5_wcss_da_to_va(struct rproc *rproc, u64 da, int len)
 static int q6v5_wcss_load(struct rproc *rproc, const struct firmware *fw)
 {
 	struct q6v5_wcss *wcss = rproc->priv;
+	const struct firmware *m3_fw;
+	int ret;
+
+	if (wcss->m3_firmware_name) {
+		ret = request_firmware(&m3_fw, wcss->m3_firmware_name,
+				wcss->dev);
+		if (ret)
+			goto skip_m3;
+
+		ret = qcom_mdt_load_no_init(wcss->dev, m3_fw,
+					    wcss->m3_firmware_name, 0,
+					    wcss->mem_region, wcss->mem_phys,
+					    wcss->mem_size, &wcss->mem_reloc);
+		if (ret) {
+			dev_err(wcss->dev, "can't load m3_fw.bXX\n");
+			return ret;
+		}
+	}
 
+skip_m3:
 	if (wcss->need_mem_protection)
 		return qcom_mdt_load(wcss->dev, fw, rproc->firmware,
 				     WCNSS_PAS_ID, wcss->mem_region,
@@ -1058,7 +1079,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 		return -EINVAL;
 
 	rproc = rproc_alloc(&pdev->dev, pdev->name, desc->ops,
-			    desc->firmware_name, sizeof(*wcss));
+			    desc->q6_firmware_name, sizeof(*wcss));
 	if (!rproc) {
 		dev_err(&pdev->dev, "failed to allocate rproc\n");
 		return -ENOMEM;
@@ -1071,6 +1092,7 @@ static int q6v5_wcss_probe(struct platform_device *pdev)
 	wcss->version = desc->version;
 	wcss->requires_force_stop = desc->requires_force_stop;
 	wcss->need_mem_protection = desc->need_mem_protection;
+	wcss->m3_firmware_name = desc->m3_firmware_name;
 
 	ret = q6v5_wcss_init_mmio(wcss, pdev);
 	if (ret)
@@ -1133,7 +1155,8 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 
 static const struct wcss_data wcss_ipq8074_res_init = {
 	.init_clock = ipq8074_init_clock,
-	.firmware_name = "IPQ8074/q6_fw.mdt",
+	.q6_firmware_name = "IPQ8074/q6_fw.mdt",
+	.m3_firmware_name = "IPQ8074/m3_fw.mdt",
 	.crash_reason_smem = WCSS_CRASH_REASON,
 	.aon_reset_required = true,
 	.wcss_q6_reset_required = true,
@@ -1146,7 +1169,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.init_clock = qcs404_init_clock,
 	.init_regulator = qcs404_init_regulator,
 	.crash_reason_smem = WCSS_CRASH_REASON,
-	.firmware_name = "wcnss.mdt",
+	.q6_firmware_name = "wcnss.mdt",
 	.version = WCSS_QCS404,
 	.aon_reset_required = false,
 	.wcss_q6_reset_required = false,
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 04/10] remoteproc: qcom: Add ssr subdevice identifier
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (2 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 03/10] remoteproc: qcom: Add support for split q6 + m3 wlan firmware Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 05/10] remoteproc: qcom: Update regmap offsets for halt register Gokul Sriram Palanisamy
                   ` (5 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Add name for ssr subdevice on IPQ8074 SoC.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index fcb1956..92b797e 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -1160,6 +1160,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.crash_reason_smem = WCSS_CRASH_REASON,
 	.aon_reset_required = true,
 	.wcss_q6_reset_required = true,
+	.ssr_name = "q6wcss",
 	.ops = &q6v5_wcss_ipq8074_ops,
 	.requires_force_stop = true,
 	.need_mem_protection = true,
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 05/10] remoteproc: qcom: Update regmap offsets for halt register
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (3 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 04/10] remoteproc: qcom: Add ssr subdevice identifier Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 06/10] dt-bindings: clock: qcom: Add reset for WCSSAON Gokul Sriram Palanisamy
                   ` (4 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Fixed issue in reading halt-regs parameter from device-tree.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
---
 drivers/remoteproc/qcom_q6v5_wcss.c | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c
index 92b797e..deb17b5 100644
--- a/drivers/remoteproc/qcom_q6v5_wcss.c
+++ b/drivers/remoteproc/qcom_q6v5_wcss.c
@@ -86,7 +86,7 @@
 #define TCSR_WCSS_CLK_MASK	0x1F
 #define TCSR_WCSS_CLK_ENABLE	0x14
 
-#define MAX_HALT_REG		3
+#define MAX_HALT_REG		4
 
 #define WCNSS_PAS_ID		6
 
@@ -154,6 +154,7 @@ struct wcss_data {
 	u32 version;
 	bool aon_reset_required;
 	bool wcss_q6_reset_required;
+	bool bcr_reset_required;
 	const char *ssr_name;
 	const char *sysmon_name;
 	int ssctl_id;
@@ -865,10 +866,13 @@ static int q6v5_wcss_init_reset(struct q6v5_wcss *wcss,
 		}
 	}
 
-	wcss->wcss_q6_bcr_reset = devm_reset_control_get_exclusive(dev, "wcss_q6_bcr_reset");
-	if (IS_ERR(wcss->wcss_q6_bcr_reset)) {
-		dev_err(wcss->dev, "unable to acquire wcss_q6_bcr_reset\n");
-		return PTR_ERR(wcss->wcss_q6_bcr_reset);
+	if (desc->bcr_reset_required) {
+		wcss->wcss_q6_bcr_reset = devm_reset_control_get_exclusive(dev,
+									   "wcss_q6_bcr_reset");
+		if (IS_ERR(wcss->wcss_q6_bcr_reset)) {
+			dev_err(wcss->dev, "unable to acquire wcss_q6_bcr_reset\n");
+			return PTR_ERR(wcss->wcss_q6_bcr_reset);
+		}
 	}
 
 	return 0;
@@ -916,9 +920,9 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss,
 		return -EINVAL;
 	}
 
-	wcss->halt_q6 = halt_reg[0];
-	wcss->halt_wcss = halt_reg[1];
-	wcss->halt_nc = halt_reg[2];
+	wcss->halt_q6 = halt_reg[1];
+	wcss->halt_wcss = halt_reg[2];
+	wcss->halt_nc = halt_reg[3];
 
 	return 0;
 }
@@ -1160,6 +1164,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.crash_reason_smem = WCSS_CRASH_REASON,
 	.aon_reset_required = true,
 	.wcss_q6_reset_required = true,
+	.bcr_reset_required = false,
 	.ssr_name = "q6wcss",
 	.ops = &q6v5_wcss_ipq8074_ops,
 	.requires_force_stop = true,
@@ -1174,6 +1179,7 @@ static int q6v5_wcss_remove(struct platform_device *pdev)
 	.version = WCSS_QCS404,
 	.aon_reset_required = false,
 	.wcss_q6_reset_required = false,
+	.bcr_reset_required = true,
 	.ssr_name = "mpss",
 	.sysmon_name = "wcnss",
 	.ssctl_id = 0x12,
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 06/10] dt-bindings: clock: qcom: Add reset for WCSSAON
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (4 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 05/10] remoteproc: qcom: Update regmap offsets for halt register Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 07/10] clk: qcom: Add WCSSAON reset Gokul Sriram Palanisamy
                   ` (3 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Add binding for WCSSAON reset required for Q6v5 reset on IPQ8074 SoC.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
---
 include/dt-bindings/clock/qcom,gcc-ipq8074.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/dt-bindings/clock/qcom,gcc-ipq8074.h b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
index 4de4811..04e1f57 100644
--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h
+++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h
@@ -362,5 +362,6 @@
 #define GCC_PCIE1_AXI_SLAVE_ARES		128
 #define GCC_PCIE1_AHB_ARES			129
 #define GCC_PCIE1_AXI_MASTER_STICKY_ARES	130
+#define GCC_WCSSAON_RESET			131
 
 #endif
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 07/10] clk: qcom: Add WCSSAON reset
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (5 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 06/10] dt-bindings: clock: qcom: Add reset for WCSSAON Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 08/10] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC Gokul Sriram Palanisamy
                   ` (2 subsequent siblings)
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Add WCSSAON reset required for Q6v5 on IPQ8074 SoC.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
---
 drivers/clk/qcom/gcc-ipq8074.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c
index e01f5f5..1e5758f 100644
--- a/drivers/clk/qcom/gcc-ipq8074.c
+++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -4685,6 +4685,7 @@ enum {
 	[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
 	[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
 	[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
+	[GCC_WCSSAON_RESET] = { 0x59010, 0 },
 };
 
 static const struct of_device_id gcc_ipq8074_match_table[] = {
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 08/10] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (6 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 07/10] clk: qcom: Add WCSSAON reset Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 09/10] arm64: dts: Add support for scm on IPQ8074 SoCs Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 10/10] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC Gokul Sriram Palanisamy
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Add compatible for IPQ8074 support.
This does not need clocks for scm calls.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Reviewed-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/firmware/qcom,scm.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/firmware/qcom,scm.txt b/Documentation/devicetree/bindings/firmware/qcom,scm.txt
index 3f29ea0..3c5d37c 100644
--- a/Documentation/devicetree/bindings/firmware/qcom,scm.txt
+++ b/Documentation/devicetree/bindings/firmware/qcom,scm.txt
@@ -10,6 +10,7 @@ Required properties:
  * "qcom,scm-apq8064"
  * "qcom,scm-apq8084"
  * "qcom,scm-ipq4019"
+ * "qcom,scm-ipq8074"
  * "qcom,scm-msm8660"
  * "qcom,scm-msm8916"
  * "qcom,scm-msm8960"
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 09/10] arm64: dts: Add support for scm on IPQ8074 SoCs
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (7 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 08/10] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  2019-11-27 15:12 ` [PATCH V3 10/10] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC Gokul Sriram Palanisamy
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Enables scm support, clock is not needed for enabling scm interface.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/ipq8074.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index 67ee5f5..6a61a63 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -10,6 +10,12 @@
 	model = "Qualcomm Technologies, Inc. IPQ8074";
 	compatible = "qcom,ipq8074";
 
+	firmware {
+		scm {
+			compatible = "qcom,scm-ipq8074", "qcom,scm";
+		};
+	};
+
 	soc: soc {
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH V3 10/10] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC
  2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
                   ` (8 preceding siblings ...)
  2019-11-27 15:12 ` [PATCH V3 09/10] arm64: dts: Add support for scm on IPQ8074 SoCs Gokul Sriram Palanisamy
@ 2019-11-27 15:12 ` Gokul Sriram Palanisamy
  9 siblings, 0 replies; 11+ messages in thread
From: Gokul Sriram Palanisamy @ 2019-11-27 15:12 UTC (permalink / raw)
  To: gokulsri, sboyd, agross, bjorn.andersson, david.brown,
	devicetree, jassisinghbrar, linux-arm-msm, linux-clk,
	linux-kernel, linux-remoteproc, mark.rutland, mturquette, ohad,
	robh+dt, sricharan, nprakash

Enable remoteproc WCSS PIL driver with glink
and ssr subdevices. Also configures shared memory
and enables smp2p and mailboxes required for IPC.

Signed-off-by: Gokul Sriram Palanisamy <gokulsri@codeaurora.org>
Signed-off-by: Sricharan R <sricharan@codeaurora.org>
Signed-off-by: Nikhil Prakash V <nprakash@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/ipq8074.dtsi | 121 ++++++++++++++++++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index 6a61a63..da66533 100644
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -10,12 +10,66 @@
 	model = "Qualcomm Technologies, Inc. IPQ8074";
 	compatible = "qcom,ipq8074";
 
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		smem_region: memory@4ab00000 {
+			no-map;
+			reg = <0x0 0x4ab00000 0x0 0x00100000>;
+		};
+
+		q6_region: memory@4b000000 {
+			no-map;
+			reg = <0x0 0x4b000000 0x0 0x05f00000>;
+		};
+	};
+
 	firmware {
 		scm {
 			compatible = "qcom,scm-ipq8074", "qcom,scm";
 		};
 	};
 
+	tcsr_mutex: hwlock@193d000 {
+		compatible = "qcom,tcsr-mutex";
+		syscon = <&tcsr_mutex_regs 0 0x80>;
+		#hwlock-cells = <1>;
+	};
+
+	smem {
+		compatible = "qcom,smem";
+		memory-region = <&smem_region>;
+		hwlocks = <&tcsr_mutex 0>;
+	};
+
+	wcss: smp2p-wcss {
+		compatible = "qcom,smp2p";
+		qcom,smem = <435>, <428>;
+
+		interrupt-parent = <&intc>;
+		interrupts = <0 322 1>;
+
+		mboxes = <&apcs_glb 9>;
+
+		qcom,local-pid = <0>;
+		qcom,remote-pid = <1>;
+
+		wcss_smp2p_out: master-kernel {
+			qcom,entry-name = "master-kernel";
+			qcom,smp2p-feature-ssr-ack;
+			#qcom,smem-state-cells = <1>;
+		};
+
+		wcss_smp2p_in: slave-kernel {
+			qcom,entry-name = "slave-kernel";
+
+			interrupt-controller;
+			#interrupt-cells = <2>;
+		};
+	};
+
 	soc: soc {
 		#address-cells = <0x1>;
 		#size-cells = <0x1>;
@@ -431,6 +485,73 @@
 				      "axi_m_sticky";
 			status = "disabled";
 		};
+
+		tcsr_q6: syscon@1945000 {
+			compatible = "syscon";
+			reg = <0x01945000 0xe000>;
+		};
+
+		tcsr_mutex_regs: syscon@193d000 {
+			compatible = "syscon";
+			reg = <0x01905000 0x8000>;
+		};
+
+		apcs_glb: mailbox@b111000 {
+			compatible = "qcom,ipq8074-apcs-apps-global";
+			reg = <0x0b111000 0x1000>;
+
+			#mbox-cells = <1>;
+		};
+
+		q6v5_wcss: q6v5_wcss@cd00000 {
+			compatible = "qcom,ipq8074-wcss-pil";
+			reg = <0x0cd00000 0x4040>,
+			      <0x004ab000 0x20>;
+			reg-names = "qdsp6",
+				    "rmb";
+			qca,auto-restart;
+			qca,extended-intc;
+			interrupts-extended = <&intc 0 325 1>,
+					      <&wcss_smp2p_in 0 0>,
+					      <&wcss_smp2p_in 1 0>,
+					      <&wcss_smp2p_in 2 0>,
+					      <&wcss_smp2p_in 3 0>;
+			interrupt-names = "wdog",
+					  "fatal",
+					  "ready",
+					  "handover",
+					  "stop-ack";
+
+			resets = <&gcc GCC_WCSSAON_RESET>,
+				 <&gcc GCC_WCSS_BCR>,
+				 <&gcc GCC_WCSS_Q6_BCR>;
+
+			reset-names = "wcss_aon_reset",
+				      "wcss_reset",
+				      "wcss_q6_reset";
+
+			clocks = <&gcc GCC_PRNG_AHB_CLK>;
+			clock-names = "prng";
+
+			qcom,halt-regs = <&tcsr_q6 0xa000 0xd000 0x0>;
+
+			qcom,smem-states = <&wcss_smp2p_out 0>,
+					   <&wcss_smp2p_out 1>;
+			qcom,smem-state-names = "shutdown",
+						"stop";
+
+			memory-region = <&q6_region>;
+
+			glink-edge {
+				interrupts = <GIC_SPI 321 IRQ_TYPE_EDGE_RISING>;
+				qcom,remote-pid = <1>;
+				mboxes = <&apcs_glb 8>;
+
+				rpm_requests {
+					qcom,glink-channels = "IPCRTR";
+				};
+			};
+		};
 	};
 
 	cpus {
-- 
1.9.1


^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, back to index

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-27 15:12 [PATCH V3 00/10] remoteproc: qcom: q6v5-wcss: Add support for secure pil Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 01/10] remoteproc: qcom: Add PRNG proxy clock Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 02/10] remoteproc: qcom: Add secure PIL support Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 03/10] remoteproc: qcom: Add support for split q6 + m3 wlan firmware Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 04/10] remoteproc: qcom: Add ssr subdevice identifier Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 05/10] remoteproc: qcom: Update regmap offsets for halt register Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 06/10] dt-bindings: clock: qcom: Add reset for WCSSAON Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 07/10] clk: qcom: Add WCSSAON reset Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 08/10] dt-bindings: firmware: qcom: Add compatible for IPQ8074 SoC Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 09/10] arm64: dts: Add support for scm on IPQ8074 SoCs Gokul Sriram Palanisamy
2019-11-27 15:12 ` [PATCH V3 10/10] arm64: dts: qcom: Enable Q6v5 WCSS for ipq8074 SoC Gokul Sriram Palanisamy

Linux-ARM-MSM Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-arm-msm/0 linux-arm-msm/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-arm-msm linux-arm-msm/ https://lore.kernel.org/linux-arm-msm \
		linux-arm-msm@vger.kernel.org
	public-inbox-index linux-arm-msm

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-arm-msm


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git