arm64: dts: qcom: sm8350: Fix CDSP memory base and length

The address space in CDSP PAS (Peripheral Authentication Service)
remoteproc node should point to the QDSP PUB address space
(QDSP6...SS_PUB): 0x0a30_0000 with length of 0x10000.  0x9890_0000,
value used so far, was copied from downstream DTS, is in the middle of
RAM/DDR space and downstream DTS describes the PIL loader, which is a
bit different interface.  Datasheet says that one of the main CDSP
address spaces is 0x0980_0000, which is oddly similar to 0x9890_0000,
but quite different.

Assume existing value (thus downstream DTS) is not really describing the
intended CDSP PAS region.

Correct the base address and length, which also moves the node to
different place to keep things sorted by unit address.  The diff looks
big, but only the unit address and "reg" property were changed.  This
should have no functional impact on Linux users, because PAS loader does
not use this address space at all.

Fixes: 177fcf0aeda2 ("arm64: dts: qcom: sm8350: Add remoteprocs")
Cc: stable@vger.kernel.org
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20241213-dts-qcom-cdsp-mpss-base-address-v3-2-2e0036fccd8d@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
index f6cedfef7ebdf0395b32919893b640d32eb7af38..aabf5ea1c0f19a6116b2fc6c9f717a633a969699 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
@@ -2496,6 +2496,115 @@
                        qcom,bcm-voters = <&apps_bcm_voter>;
                };
 
+               cdsp: remoteproc@a300000 {
+                       compatible = "qcom,sm8350-cdsp-pas";
+                       reg = <0x0 0x0a300000 0x0 0x10000>;
+
+                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
+                                             <&smp2p_cdsp_in 3 IRQ_TYPE_EDGE_RISING>;
+                       interrupt-names = "wdog", "fatal", "ready",
+                                         "handover", "stop-ack";
+
+                       clocks = <&rpmhcc RPMH_CXO_CLK>;
+                       clock-names = "xo";
+
+                       power-domains = <&rpmhpd RPMHPD_CX>,
+                                       <&rpmhpd RPMHPD_MXC>;
+                       power-domain-names = "cx", "mxc";
+
+                       interconnects = <&compute_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>;
+
+                       memory-region = <&pil_cdsp_mem>;
+
+                       qcom,qmp = <&aoss_qmp>;
+
+                       qcom,smem-states = <&smp2p_cdsp_out 0>;
+                       qcom,smem-state-names = "stop";
+
+                       status = "disabled";
+
+                       glink-edge {
+                               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
+                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
+                                                            IRQ_TYPE_EDGE_RISING>;
+                               mboxes = <&ipcc IPCC_CLIENT_CDSP
+                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
+
+                               label = "cdsp";
+                               qcom,remote-pid = <5>;
+
+                               fastrpc {
+                                       compatible = "qcom,fastrpc";
+                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
+                                       label = "cdsp";
+                                       qcom,non-secure-domain;
+                                       #address-cells = <1>;
+                                       #size-cells = <0>;
+
+                                       compute-cb@1 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <1>;
+                                               iommus = <&apps_smmu 0x2161 0x0400>,
+                                                        <&apps_smmu 0x1181 0x0420>;
+                                       };
+
+                                       compute-cb@2 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <2>;
+                                               iommus = <&apps_smmu 0x2162 0x0400>,
+                                                        <&apps_smmu 0x1182 0x0420>;
+                                       };
+
+                                       compute-cb@3 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <3>;
+                                               iommus = <&apps_smmu 0x2163 0x0400>,
+                                                        <&apps_smmu 0x1183 0x0420>;
+                                       };
+
+                                       compute-cb@4 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <4>;
+                                               iommus = <&apps_smmu 0x2164 0x0400>,
+                                                        <&apps_smmu 0x1184 0x0420>;
+                                       };
+
+                                       compute-cb@5 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <5>;
+                                               iommus = <&apps_smmu 0x2165 0x0400>,
+                                                        <&apps_smmu 0x1185 0x0420>;
+                                       };
+
+                                       compute-cb@6 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <6>;
+                                               iommus = <&apps_smmu 0x2166 0x0400>,
+                                                        <&apps_smmu 0x1186 0x0420>;
+                                       };
+
+                                       compute-cb@7 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <7>;
+                                               iommus = <&apps_smmu 0x2167 0x0400>,
+                                                        <&apps_smmu 0x1187 0x0420>;
+                                       };
+
+                                       compute-cb@8 {
+                                               compatible = "qcom,fastrpc-compute-cb";
+                                               reg = <8>;
+                                               iommus = <&apps_smmu 0x2168 0x0400>,
+                                                        <&apps_smmu 0x1188 0x0420>;
+                                       };
+
+                                       /* note: secure cb9 in downstream */
+                               };
+                       };
+               };
+
                usb_1: usb@a6f8800 {
                        compatible = "qcom,sm8350-dwc3", "qcom,dwc3";
                        reg = <0 0x0a6f8800 0 0x400>;
@@ -3593,115 +3702,6 @@
                        #freq-domain-cells = <1>;
                        #clock-cells = <1>;
                };
-
-               cdsp: remoteproc@98900000 {
-                       compatible = "qcom,sm8350-cdsp-pas";
-                       reg = <0 0x98900000 0 0x1400000>;
-
-                       interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
-                                             <&smp2p_cdsp_in 3 IRQ_TYPE_EDGE_RISING>;
-                       interrupt-names = "wdog", "fatal", "ready",
-                                         "handover", "stop-ack";
-
-                       clocks = <&rpmhcc RPMH_CXO_CLK>;
-                       clock-names = "xo";
-
-                       power-domains = <&rpmhpd RPMHPD_CX>,
-                                       <&rpmhpd RPMHPD_MXC>;
-                       power-domain-names = "cx", "mxc";
-
-                       interconnects = <&compute_noc MASTER_CDSP_PROC 0 &mc_virt SLAVE_EBI1 0>;
-
-                       memory-region = <&pil_cdsp_mem>;
-
-                       qcom,qmp = <&aoss_qmp>;
-
-                       qcom,smem-states = <&smp2p_cdsp_out 0>;
-                       qcom,smem-state-names = "stop";
-
-                       status = "disabled";
-
-                       glink-edge {
-                               interrupts-extended = <&ipcc IPCC_CLIENT_CDSP
-                                                            IPCC_MPROC_SIGNAL_GLINK_QMP
-                                                            IRQ_TYPE_EDGE_RISING>;
-                               mboxes = <&ipcc IPCC_CLIENT_CDSP
-                                               IPCC_MPROC_SIGNAL_GLINK_QMP>;
-
-                               label = "cdsp";
-                               qcom,remote-pid = <5>;
-
-                               fastrpc {
-                                       compatible = "qcom,fastrpc";
-                                       qcom,glink-channels = "fastrpcglink-apps-dsp";
-                                       label = "cdsp";
-                                       qcom,non-secure-domain;
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       compute-cb@1 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <1>;
-                                               iommus = <&apps_smmu 0x2161 0x0400>,
-                                                        <&apps_smmu 0x1181 0x0420>;
-                                       };
-
-                                       compute-cb@2 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <2>;
-                                               iommus = <&apps_smmu 0x2162 0x0400>,
-                                                        <&apps_smmu 0x1182 0x0420>;
-                                       };
-
-                                       compute-cb@3 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <3>;
-                                               iommus = <&apps_smmu 0x2163 0x0400>,
-                                                        <&apps_smmu 0x1183 0x0420>;
-                                       };
-
-                                       compute-cb@4 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <4>;
-                                               iommus = <&apps_smmu 0x2164 0x0400>,
-                                                        <&apps_smmu 0x1184 0x0420>;
-                                       };
-
-                                       compute-cb@5 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <5>;
-                                               iommus = <&apps_smmu 0x2165 0x0400>,
-                                                        <&apps_smmu 0x1185 0x0420>;
-                                       };
-
-                                       compute-cb@6 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <6>;
-                                               iommus = <&apps_smmu 0x2166 0x0400>,
-                                                        <&apps_smmu 0x1186 0x0420>;
-                                       };
-
-                                       compute-cb@7 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <7>;
-                                               iommus = <&apps_smmu 0x2167 0x0400>,
-                                                        <&apps_smmu 0x1187 0x0420>;
-                                       };
-
-                                       compute-cb@8 {
-                                               compatible = "qcom,fastrpc-compute-cb";
-                                               reg = <8>;
-                                               iommus = <&apps_smmu 0x2168 0x0400>,
-                                                        <&apps_smmu 0x1188 0x0420>;
-                                       };
-
-                                       /* note: secure cb9 in downstream */
-                               };
-                       };
-               };
        };
 
        thermal_zones: thermal-zones {