Skip to contentSkip to conversation

arm64: dts: qcom: sc7280: Add WPSS remoteproc node

PATCH Superseded Rakesh Pillai 3 participants 3 messages Mar 10, 2021 – Mar 15, 2021

Subsystems (4)
Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support Arm/Qualcomm chromebook support

v1 of 7 Superseded Latest is v7 →

lore
Share & tools
lore

Rakesh Pillai

author
#0 lore raw

PATCH 1/1 arm64: dts: qcom: sc7280: Add WPSS remoteproc node

Add the WPSS remoteproc node in dts for
PIL loading.

Signed-off-by Rakesh Pillai <[email protected]>

---
- This change is dependent on the below patch series
1) https://lore.kernel.org/patchwork/project/lkml/list/?series=487403
2) https://lore.kernel.org/patchwork/project/lkml/list/?series=488365

---
 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  4 +++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index 950ecb2..603f56b 100644
@@ -26,6 +26,10 @@
 	status = "okay";
 };
 
+&remoteproc_wpss {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +47 -0

59 lines not on this page · raw message

Signature · 1 line
2.7.4
#1 lore raw
Quoted 50 lines · Rakesh Pillai

Add the WPSS remoteproc node in dts for
PIL loading.

Signed-off-by Rakesh Pillai <[email protected]>

---
- This change is dependent on the below patch series
1) https://lore.kernel.org/patchwork/project/lkml/list/?series=487403
2) https://lore.kernel.org/patchwork/project/lkml/list/?series=488365

---
 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  4 +++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 47 +++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index 950ecb2..603f56b 100644
@@ -26,6 +26,10 @@
 	status = "okay";
 };
 
+&remoteproc_wpss {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -0
index 8af6d77..26dd466 100644
@@ -53,6 +53,16 @@
 			no-map;
 			reg = <0x0 0x80b00000 0x0 0x100000>;
 		};
+
+		wlan_fw_mem: memory@80c00000 {
+			no-map;
+			reg = <0x0 0x80c00000 0x0 0xc00000>;
+		};
+
+		wpss_mem: memory@9ae00000 {
+			no-map;
+			reg = <0x0 0x9ae00000 0x0 0x1900000>;
+		};
 	};
 
 	cpus {

arch/arm64/boot/dts/qcom/sc7280.dtsi line 323

Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +6 -0
@@ -305,6 +315,43 @@
 			};
 		};
 
+		remoteproc_wpss: remoteproc@8a00000 {
+			compatible = "qcom,sc7280-wpss-pil";
+			reg = <0 0x08a00000 0 0x10000>;
+
+			interrupts-extended = <&intc GIC_SPI 587 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 0 0>,

IRQ_TYPE_NONE?

Apart from that this looks good.

Regards,
Bjorn

Quoted 37 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +31 -0
+					      <&wpss_smp2p_in 1 0>,
+					      <&wpss_smp2p_in 2 0>,
+					      <&wpss_smp2p_in 3 0>,
+					      <&wpss_smp2p_in 7 0>;
+			interrupt-names = "wdog", "fatal", "ready", "handover",
+					  "stop-ack", "shutdown-ack";
+
+			memory-region = <&wpss_mem>;
+
+			qcom,smem-states = <&wpss_smp2p_out 0>;
+			qcom,smem-state-names = "stop";
+
+			resets = <&aoss_reset AOSS_CC_WCSS_RESTART>;
+			reset-names = "restart";
+
+			qcom,halt-regs = <&tcsr_mutex_regs 0x37000>;
+
+			status = "disabled";
+
+			glink-edge {
+				interrupts-extended = <&ipcc IPCC_CLIENT_WPSS
+							     IPCC_MPROC_SIGNAL_GLINK_QMP
+							     IRQ_TYPE_EDGE_RISING>;
+				mboxes = <&ipcc IPCC_CLIENT_WPSS
+						IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+				label = "wpss";
+				qcom,remote-pid = <13>;
+			};
+		};
+
 		pdc: interrupt-controller@b220000 {
 			compatible = "qcom,sc7280-pdc", "qcom,pdc";
 			reg = <0 0x0b220000 0 0x30000>;
Signature · 1 line
2.7.4
#2 lore raw
In reply to Rakesh Pillai
Quoted 39 lines · Rakesh Pillai

Add the WPSS remoteproc node in dts for
PIL loading.

Signed-off-by Rakesh Pillai <[email protected]>

---
- This change is dependent on the below patch series
1) https://lore.kernel.org/patchwork/project/lkml/list/?series=487403
2) https://lore.kernel.org/patchwork/project/lkml/list/?series=488365

---
 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  4 +++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 47 
+++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+)
arch/arm64/boot/dts/qcom/sc7280-idp.dts +4 -0
index 950ecb2..603f56b 100644
@@ -26,6 +26,10 @@
 	status = "okay";
 };
 
+&remoteproc_wpss {
+	status = "okay";
+};
+
 &uart5 {
 	status = "okay";
 };
arch/arm64/boot/dts/qcom/sc7280.dtsi +0 -0
index 8af6d77..26dd466 100644
@@ -53,6 +53,16 @@
 			no-map;
 			reg = <0x0 0x80b00000 0x0 0x100000>;
 		};

arch/arm64/boot/dts/qcom/sc7280.dtsi line 65

Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +10 -0
+
+		wlan_fw_mem: memory@80c00000 {
+			no-map;
+			reg = <0x0 0x80c00000 0x0 0xc00000>;
+		};
+
+		wpss_mem: memory@9ae00000 {
+			no-map;
+			reg = <0x0 0x9ae00000 0x0 0x1900000>;
+		};

The wpss mem shouldn't move into
board specific dt.

arch/arm64/boot/dts/qcom/sc7280.dtsi line 319

Quoted 9 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +2 -0
 	};
 
 	cpus {

@@ -305,6 +315,43 @@
 			};
 		};
 
+		remoteproc_wpss: remoteproc@8a00000 {
+			compatible = "qcom,sc7280-wpss-pil";

please aim to add pas based
support to boot wpss as well.

arch/arm64/boot/dts/qcom/sc7280.dtsi line 332

Quoted 13 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +13 -0
+			reg = <0 0x08a00000 0 0x10000>;
+
+			interrupts-extended = <&intc GIC_SPI 587 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 0 0>,
+					      <&wpss_smp2p_in 1 0>,
+					      <&wpss_smp2p_in 2 0>,
+					      <&wpss_smp2p_in 3 0>,
+					      <&wpss_smp2p_in 7 0>;
+			interrupt-names = "wdog", "fatal", "ready", "handover",
+					  "stop-ack", "shutdown-ack";
+
+			memory-region = <&wpss_mem>;
+

looks like you missed adding clocks
and power-domains mentioned in the
bindings.

Quoted 25 lines
arch/arm64/boot/dts/qcom/sc7280.dtsi +22 -0
+			qcom,smem-states = <&wpss_smp2p_out 0>;
+			qcom,smem-state-names = "stop";
+
+			resets = <&aoss_reset AOSS_CC_WCSS_RESTART>;
+			reset-names = "restart";
+
+			qcom,halt-regs = <&tcsr_mutex_regs 0x37000>;
+
+			status = "disabled";
+
+			glink-edge {
+				interrupts-extended = <&ipcc IPCC_CLIENT_WPSS
+							     IPCC_MPROC_SIGNAL_GLINK_QMP
+							     IRQ_TYPE_EDGE_RISING>;
+				mboxes = <&ipcc IPCC_CLIENT_WPSS
+						IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+				label = "wpss";
+				qcom,remote-pid = <13>;
+			};
+		};
+
 		pdc: interrupt-controller@b220000 {
 			compatible = "qcom,sc7280-pdc", "qcom,pdc";
 			reg = <0 0x0b220000 0 0x30000>;
Signature · 2 lines
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project.