diff mbox series

[v3] arm64: dts: qcom: sc7280: Add WPSS remoteproc node

Message ID 1631811121-32662-1-git-send-email-pillair@codeaurora.org (mailing list archive)
State Superseded
Headers show
Series [v3] arm64: dts: qcom: sc7280: Add WPSS remoteproc node | expand

Commit Message

Rakesh Pillai Sept. 16, 2021, 4:52 p.m. UTC
Add the WPSS remoteproc node in dts for
PIL loading.

Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
---
 arch/arm64/boot/dts/qcom/sc7280-idp.dts |  4 +++
 arch/arm64/boot/dts/qcom/sc7280.dtsi    | 63 +++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+)

Comments

Stephen Boyd Sept. 17, 2021, 12:55 a.m. UTC | #1
Quoting Rakesh Pillai (2021-09-16 09:52:01)
> diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> index 64fc22a..2b8bbcd 100644
> --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> @@ -1423,6 +1433,59 @@
>                         #power-domain-cells = <1>;
>                 };
>
> +               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 IRQ_TYPE_EDGE_RISING>,
> +                                             <&wpss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
> +                                             <&wpss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
> +                                             <&wpss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
> +                                             <&wpss_smp2p_in 7 IRQ_TYPE_EDGE_RISING>;
> +                       interrupt-names = "wdog", "fatal", "ready", "handover",
> +                                         "stop-ack", "shutdown-ack";
> +
> +                       clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>,
> +                                <&gcc GCC_WPSS_AHB_CLK>,
> +                                <&gcc GCC_WPSS_RSCP_CLK>,
> +                                <&rpmhcc RPMH_CXO_CLK>;
> +                       clock-names = "gcc_wpss_ahb_bdg_mst_clk",
> +                                     "gcc_wpss_ahb_clk",
> +                                     "gcc_wpss_rscp_clk",
> +                                     "xo";
> +
> +                       power-domains = <&rpmhpd SC7280_CX>,
> +                                       <&rpmhpd SC7280_MX>;
> +                       power-domain-names = "cx", "mx";
> +
> +                       memory-region = <&wpss_mem>;
> +
> +                       qcom,qmp = <&aoss_qmp>;
> +
> +                       qcom,smem-states = <&wpss_smp2p_out 0>;
> +                       qcom,smem-state-names = "stop";
> +
> +                       resets = <&aoss_reset AOSS_CC_WCSS_RESTART>,
> +                                <&pdc_reset PDC_WPSS_SYNC_RESET>;
> +                       reset-names = "restart", "pdc_sync";
> +
> +                       qcom,halt-regs = <&tcsr_mutex_regs 0x37000>;

Where is this node defined? I don't see it on the mailing list for
sc7280. Can you indicate what patches this depends on, and use git
format-patch --base= so we can try to find them ourselves.
Rakesh Pillai Sept. 17, 2021, 8:04 a.m. UTC | #2
> -----Original Message-----
> From: Stephen Boyd <swboyd@chromium.org>
> Sent: Friday, September 17, 2021 6:25 AM
> To: Rakesh Pillai <pillair@codeaurora.org>; agross@kernel.org;
> bjorn.andersson@linaro.org; robh+dt@kernel.org
> Cc: linux-arm-msm@vger.kernel.org; devicetree@vger.kernel.org; linux-
> kernel@vger.kernel.org; sibis@codeaurora.org; mpubbise@codeaurora.org;
> kuabhs@chromium.org
> Subject: Re: [PATCH v3] arm64: dts: qcom: sc7280: Add WPSS remoteproc
> node
> 
> Quoting Rakesh Pillai (2021-09-16 09:52:01)
> > diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> > b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> > index 64fc22a..2b8bbcd 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
> > @@ -1423,6 +1433,59 @@
> >                         #power-domain-cells = <1>;
> >                 };
> >
> > +               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 IRQ_TYPE_EDGE_RISING>,
> > +                                             <&wpss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
> > +                                             <&wpss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
> > +                                             <&wpss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
> > +                                             <&wpss_smp2p_in 7 IRQ_TYPE_EDGE_RISING>;
> > +                       interrupt-names = "wdog", "fatal", "ready", "handover",
> > +                                         "stop-ack", "shutdown-ack";
> > +
> > +                       clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>,
> > +                                <&gcc GCC_WPSS_AHB_CLK>,
> > +                                <&gcc GCC_WPSS_RSCP_CLK>,
> > +                                <&rpmhcc RPMH_CXO_CLK>;
> > +                       clock-names = "gcc_wpss_ahb_bdg_mst_clk",
> > +                                     "gcc_wpss_ahb_clk",
> > +                                     "gcc_wpss_rscp_clk",
> > +                                     "xo";
> > +
> > +                       power-domains = <&rpmhpd SC7280_CX>,
> > +                                       <&rpmhpd SC7280_MX>;
> > +                       power-domain-names = "cx", "mx";
> > +
> > +                       memory-region = <&wpss_mem>;
> > +
> > +                       qcom,qmp = <&aoss_qmp>;
> > +
> > +                       qcom,smem-states = <&wpss_smp2p_out 0>;
> > +                       qcom,smem-state-names = "stop";
> > +
> > +                       resets = <&aoss_reset AOSS_CC_WCSS_RESTART>,
> > +                                <&pdc_reset PDC_WPSS_SYNC_RESET>;
> > +                       reset-names = "restart", "pdc_sync";
> > +
> > +                       qcom,halt-regs = <&tcsr_mutex_regs 0x37000>;
> 
> Where is this node defined? I don't see it on the mailing list for sc7280. Can
> you indicate what patches this depends on, and use git format-patch --base=
> so we can try to find them ourselves.

Hi Stephen,
My bad, it shud be "tcsr_mutex" instead of "tcsr_mutex_regs".
I will correct it and send v4.
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
index 64fc22a..2b8bbcd 100644
--- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts
@@ -68,3 +68,7 @@ 
 		qcom,pre-scaling = <1 1>;
 	};
 };
+
+&remoteproc_wpss {
+	status = "okay";
+};
diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
index 89ed7f2..1931ef7d 100644
--- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
@@ -69,10 +69,20 @@ 
 			reg = <0x0 0x80b00000 0x0 0x100000>;
 		};
 
+		wlan_fw_mem: memory@80c00000 {
+			no-map;
+			reg = <0x0 0x80c00000 0x0 0xc00000>;
+		};
+
 		ipa_fw_mem: memory@8b700000 {
 			reg = <0 0x8b700000 0 0x10000>;
 			no-map;
 		};
+
+		wpss_mem: memory@9ae00000 {
+			no-map;
+			reg = <0x0 0x9ae00000 0x0 0x1900000>;
+		};
 	};
 
 	cpus {
@@ -1423,6 +1433,59 @@ 
 			#power-domain-cells = <1>;
 		};
 
+		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 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 3 IRQ_TYPE_EDGE_RISING>,
+					      <&wpss_smp2p_in 7 IRQ_TYPE_EDGE_RISING>;
+			interrupt-names = "wdog", "fatal", "ready", "handover",
+					  "stop-ack", "shutdown-ack";
+
+			clocks = <&gcc GCC_WPSS_AHB_BDG_MST_CLK>,
+				 <&gcc GCC_WPSS_AHB_CLK>,
+				 <&gcc GCC_WPSS_RSCP_CLK>,
+				 <&rpmhcc RPMH_CXO_CLK>;
+			clock-names = "gcc_wpss_ahb_bdg_mst_clk",
+				      "gcc_wpss_ahb_clk",
+				      "gcc_wpss_rscp_clk",
+				      "xo";
+
+			power-domains = <&rpmhpd SC7280_CX>,
+					<&rpmhpd SC7280_MX>;
+			power-domain-names = "cx", "mx";
+
+			memory-region = <&wpss_mem>;
+
+			qcom,qmp = <&aoss_qmp>;
+
+			qcom,smem-states = <&wpss_smp2p_out 0>;
+			qcom,smem-state-names = "stop";
+
+			resets = <&aoss_reset AOSS_CC_WCSS_RESTART>,
+				 <&pdc_reset PDC_WPSS_SYNC_RESET>;
+			reset-names = "restart", "pdc_sync";
+
+			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>;