| Message ID | 20241206-dts-qcom-cdsp-mpss-base-address-v1-0-2f349e4d5a63@linaro.org |
|---|---|
| Headers | show |
| Series | arm64: dts: qcom: Fix remoteproc memory base and length | expand |
On 06/12/2024 16:32, Krzysztof Kozlowski wrote: > The address space in CDSP PAS (Peripheral Authentication Service) > remoteproc node should point to the QDSP PUB address space > (QDSP6...SS_PUB) which has a length of 0x10000. Value of 0x1400000 was > copied from older DTS, but it does not look accurate at all. > > This should have no functional impact on Linux users, because PAS loader > does not use this address space at all. > > Fixes: 10e024671295 ("arm64: dts: qcom: sm8650: add interconnect dependent device nodes") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi > index 95ec82bce3162bce4a3da6122a41fee37118740e..1d935bcdcb2eee7b56e0a1f71c303a54d870e672 100644 > --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi > @@ -5481,7 +5481,7 @@ nsp_noc: interconnect@320c0000 { > > remoteproc_cdsp: remoteproc@32300000 { > compatible = "qcom,sm8650-cdsp-pas"; > - reg = <0 0x32300000 0 0x1400000>; > + reg = <0x0 0x32300000 0x0 0x10000>; I tried to have an unified style in sm8650.dtsi by using 0 instead of 0x0, maybe you should keep the current style, as you prefer. > > interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>, > <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>, > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On 06/12/2024 16:32, Krzysztof Kozlowski wrote: > The address space in MPSS/Modem PAS (Peripheral Authentication Service) > remoteproc node should point to the QDSP PUB address space > (QDSP6...SS_PUB) which has a length of 0x10000. Value of 0x4040 was > copied from older DTS, but it grew since then. > > This should have no functional impact on Linux users, because PAS loader > does not use this address space at all. > > Fixes: d0c061e366ed ("arm64: dts: qcom: sm8550: add adsp, cdsp & mdss nodes") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi > index 541b88eb5f5300ef9e20220305ff638db9b2e46b..71ff15695d396a68720a785435e692d3bbb38888 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi > @@ -2314,7 +2314,7 @@ ipa: ipa@3f40000 { > > remoteproc_mpss: remoteproc@4080000 { > compatible = "qcom,sm8550-mpss-pas"; > - reg = <0x0 0x04080000 0x0 0x4040>; > + reg = <0x0 0x04080000 0x0 0x10000>; > > interrupts-extended = <&intc GIC_SPI 264 IRQ_TYPE_EDGE_RISING>, > <&smp2p_modem_in 0 IRQ_TYPE_EDGE_RISING>, > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On 06/12/2024 16:32, Krzysztof Kozlowski wrote: > The address space in ADSP PAS (Peripheral Authentication Service) > remoteproc node should point to the QDSP PUB address space > (QDSP6...SS_PUB): 0x0680_0000 with length of 0x10000. > > 0x3000_0000, value used so far, is the main region of CDSP. Downstream > DTS uses 0x0300_0000, which is oddly similar to 0x3000_0000, yet quite > different and points to unused area. > > 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: d0c061e366ed ("arm64: dts: qcom: sm8550: add adsp, cdsp & mdss nodes") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8550.dtsi | 262 +++++++++++++++++------------------ > 1 file changed, 131 insertions(+), 131 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi > index e7774d32fb6d2288748ecec00bf525b2b3c40fbb..f454015c5b90c7d792c01bf85256812857d79c64 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi > @@ -2354,6 +2354,137 @@ IPCC_MPROC_SIGNAL_GLINK_QMP > }; > }; > > + remoteproc_adsp: remoteproc@6800000 { > + compatible = "qcom,sm8550-adsp-pas"; > + reg = <0x0 0x06800000 0x0 0x10000>; > + > + interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, > + <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>, > + <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>, > + <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>, > + <&smp2p_adsp_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_LCX>, > + <&rpmhpd RPMHPD_LMX>; > + power-domain-names = "lcx", "lmx"; > + > + interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC 0 &mc_virt SLAVE_EBI1 0>; > + > + memory-region = <&adspslpi_mem>, <&q6_adsp_dtb_mem>; > + > + qcom,qmp = <&aoss_qmp>; > + > + qcom,smem-states = <&smp2p_adsp_out 0>; > + qcom,smem-state-names = "stop"; > + > + status = "disabled"; > + > + remoteproc_adsp_glink: glink-edge { > + interrupts-extended = <&ipcc IPCC_CLIENT_LPASS > + IPCC_MPROC_SIGNAL_GLINK_QMP > + IRQ_TYPE_EDGE_RISING>; > + mboxes = <&ipcc IPCC_CLIENT_LPASS > + IPCC_MPROC_SIGNAL_GLINK_QMP>; > + > + label = "lpass"; > + qcom,remote-pid = <2>; > + > + fastrpc { > + compatible = "qcom,fastrpc"; > + qcom,glink-channels = "fastrpcglink-apps-dsp"; > + label = "adsp"; > + qcom,non-secure-domain; > + #address-cells = <1>; > + #size-cells = <0>; > + > + compute-cb@3 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <3>; > + iommus = <&apps_smmu 0x1003 0x80>, > + <&apps_smmu 0x1063 0x0>; > + dma-coherent; > + }; > + > + compute-cb@4 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <4>; > + iommus = <&apps_smmu 0x1004 0x80>, > + <&apps_smmu 0x1064 0x0>; > + dma-coherent; > + }; > + > + compute-cb@5 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <5>; > + iommus = <&apps_smmu 0x1005 0x80>, > + <&apps_smmu 0x1065 0x0>; > + dma-coherent; > + }; > + > + compute-cb@6 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <6>; > + iommus = <&apps_smmu 0x1006 0x80>, > + <&apps_smmu 0x1066 0x0>; > + dma-coherent; > + }; > + > + compute-cb@7 { > + compatible = "qcom,fastrpc-compute-cb"; > + reg = <7>; > + iommus = <&apps_smmu 0x1007 0x80>, > + <&apps_smmu 0x1067 0x0>; > + dma-coherent; > + }; > + }; > + > + gpr { > + compatible = "qcom,gpr"; > + qcom,glink-channels = "adsp_apps"; > + qcom,domain = <GPR_DOMAIN_ID_ADSP>; > + qcom,intents = <512 20>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + q6apm: service@1 { > + compatible = "qcom,q6apm"; > + reg = <GPR_APM_MODULE_IID>; > + #sound-dai-cells = <0>; > + qcom,protection-domain = "avs/audio", > + "msm/adsp/audio_pd"; > + > + q6apmdai: dais { > + compatible = "qcom,q6apm-dais"; > + iommus = <&apps_smmu 0x1001 0x80>, > + <&apps_smmu 0x1061 0x0>; > + }; > + > + q6apmbedai: bedais { > + compatible = "qcom,q6apm-lpass-dais"; > + #sound-dai-cells = <1>; > + }; > + }; > + > + q6prm: service@2 { > + compatible = "qcom,q6prm"; > + reg = <GPR_PRM_MODULE_IID>; > + qcom,protection-domain = "avs/audio", > + "msm/adsp/audio_pd"; > + > + q6prmcc: clock-controller { > + compatible = "qcom,q6prm-lpass-clocks"; > + #clock-cells = <2>; > + }; > + }; > + }; > + }; > + }; > + > lpass_wsa2macro: codec@6aa0000 { > compatible = "qcom,sm8550-lpass-wsa-macro"; > reg = <0 0x06aa0000 0 0x1000>; > @@ -4576,137 +4707,6 @@ system-cache-controller@25000000 { > interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>; > }; > > - remoteproc_adsp: remoteproc@30000000 { > - compatible = "qcom,sm8550-adsp-pas"; > - reg = <0x0 0x30000000 0x0 0x100>; > - > - interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>, > - <&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>, > - <&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>, > - <&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>, > - <&smp2p_adsp_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_LCX>, > - <&rpmhpd RPMHPD_LMX>; > - power-domain-names = "lcx", "lmx"; > - > - interconnects = <&lpass_lpicx_noc MASTER_LPASS_PROC 0 &mc_virt SLAVE_EBI1 0>; > - > - memory-region = <&adspslpi_mem>, <&q6_adsp_dtb_mem>; > - > - qcom,qmp = <&aoss_qmp>; > - > - qcom,smem-states = <&smp2p_adsp_out 0>; > - qcom,smem-state-names = "stop"; > - > - status = "disabled"; > - > - remoteproc_adsp_glink: glink-edge { > - interrupts-extended = <&ipcc IPCC_CLIENT_LPASS > - IPCC_MPROC_SIGNAL_GLINK_QMP > - IRQ_TYPE_EDGE_RISING>; > - mboxes = <&ipcc IPCC_CLIENT_LPASS > - IPCC_MPROC_SIGNAL_GLINK_QMP>; > - > - label = "lpass"; > - qcom,remote-pid = <2>; > - > - fastrpc { > - compatible = "qcom,fastrpc"; > - qcom,glink-channels = "fastrpcglink-apps-dsp"; > - label = "adsp"; > - qcom,non-secure-domain; > - #address-cells = <1>; > - #size-cells = <0>; > - > - compute-cb@3 { > - compatible = "qcom,fastrpc-compute-cb"; > - reg = <3>; > - iommus = <&apps_smmu 0x1003 0x80>, > - <&apps_smmu 0x1063 0x0>; > - dma-coherent; > - }; > - > - compute-cb@4 { > - compatible = "qcom,fastrpc-compute-cb"; > - reg = <4>; > - iommus = <&apps_smmu 0x1004 0x80>, > - <&apps_smmu 0x1064 0x0>; > - dma-coherent; > - }; > - > - compute-cb@5 { > - compatible = "qcom,fastrpc-compute-cb"; > - reg = <5>; > - iommus = <&apps_smmu 0x1005 0x80>, > - <&apps_smmu 0x1065 0x0>; > - dma-coherent; > - }; > - > - compute-cb@6 { > - compatible = "qcom,fastrpc-compute-cb"; > - reg = <6>; > - iommus = <&apps_smmu 0x1006 0x80>, > - <&apps_smmu 0x1066 0x0>; > - dma-coherent; > - }; > - > - compute-cb@7 { > - compatible = "qcom,fastrpc-compute-cb"; > - reg = <7>; > - iommus = <&apps_smmu 0x1007 0x80>, > - <&apps_smmu 0x1067 0x0>; > - dma-coherent; > - }; > - }; > - > - gpr { > - compatible = "qcom,gpr"; > - qcom,glink-channels = "adsp_apps"; > - qcom,domain = <GPR_DOMAIN_ID_ADSP>; > - qcom,intents = <512 20>; > - #address-cells = <1>; > - #size-cells = <0>; > - > - q6apm: service@1 { > - compatible = "qcom,q6apm"; > - reg = <GPR_APM_MODULE_IID>; > - #sound-dai-cells = <0>; > - qcom,protection-domain = "avs/audio", > - "msm/adsp/audio_pd"; > - > - q6apmdai: dais { > - compatible = "qcom,q6apm-dais"; > - iommus = <&apps_smmu 0x1001 0x80>, > - <&apps_smmu 0x1061 0x0>; > - }; > - > - q6apmbedai: bedais { > - compatible = "qcom,q6apm-lpass-dais"; > - #sound-dai-cells = <1>; > - }; > - }; > - > - q6prm: service@2 { > - compatible = "qcom,q6prm"; > - reg = <GPR_PRM_MODULE_IID>; > - qcom,protection-domain = "avs/audio", > - "msm/adsp/audio_pd"; > - > - q6prmcc: clock-controller { > - compatible = "qcom,q6prm-lpass-clocks"; > - #clock-cells = <2>; > - }; > - }; > - }; > - }; > - }; > - > nsp_noc: interconnect@320c0000 { > compatible = "qcom,sm8550-nsp-noc"; > reg = <0 0x320c0000 0 0xe080>; > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On 06/12/2024 16:32, Krzysztof Kozlowski wrote: > The address space in CDSP PAS (Peripheral Authentication Service) > remoteproc node should point to the QDSP PUB address space > (QDSP6...SS_PUB) which has a length of 0x10000. Value of 0x1400000 was > copied from older DTS, but it does not look accurate at all. > > This should have no functional impact on Linux users, because PAS loader > does not use this address space at all. > > Fixes: 1172729576fb ("arm64: dts: qcom: sm8450: Add remoteproc enablers and instances") > Cc: <stable@vger.kernel.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8450.dtsi | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi > index d028079c11bdc2dd2b254f7f7d85e315a86f79bc..7a3bf847b0b9eae2094b0a8f48f6900a31b28ae4 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi > @@ -2800,7 +2800,7 @@ vamacro: codec@33f0000 { > > remoteproc_cdsp: remoteproc@32300000 { > compatible = "qcom,sm8450-cdsp-pas"; > - reg = <0 0x32300000 0 0x1400000>; > + reg = <0 0x32300000 0 0x10000>; > > interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>, > <&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>, > Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
On Fri, Dec 06, 2024 at 04:32:37PM +0100, Krzysztof Kozlowski wrote: > The address space in ADSP PAS (Peripheral Authentication Service) > remoteproc node should point to the QDSP PUB address space > (QDSP6...SS_PUB): 0x0680_0000 with length of 0x10000. > > 0x3000_0000, value used so far, is the main region of CDSP. Downstream > DTS uses 0x0300_0000, which is oddly similar to 0x3000_0000, yet quite > different and points to unused area. This looks like a copy-paste error since there is no downstream DTS for x1e80100. And this paragraph is about the CDSP so probably does not belong in the commit message of the ADSP patches (e.g. sm8650). > 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. Johan
Konrad pointed out during SM8750 review, that numbers are odd, so I looked at datasheets and downstream DTS for all previous platforms. Most numbers are odd. Older platforms like SM8150, SM8250, SC7280, SC8180X seem fine. I could not check few like SDX75 or SM6115, due to lack of access to datasheets. SM8350, SM8450, SM8550 tested on hardware. Others not, but I don't expect any failures because PAS drivers do not use the address space. Which also explains why odd numbers did not result in any failures. Best regards, Krzysztof --- Krzysztof Kozlowski (19): arm64: dts: qcom: sm8350: Fix ADSP memory base and length arm64: dts: qcom: sm8350: Fix CDSP memory base and length arm64: dts: qcom: sm8350: Fix MPSS memory length arm64: dts: qcom: sm8450: Fix ADSP memory base and length arm64: dts: qcom: sm8450: Fix CDSP memory length arm64: dts: qcom: sm8450: Fix MPSS memory length arm64: dts: qcom: sm8550: Fix ADSP memory base and length arm64: dts: qcom: sm8550: Fix CDSP memory length arm64: dts: qcom: sm8550: Fix MPSS memory length arm64: dts: qcom: sm8650: Fix ADSP memory base and length arm64: dts: qcom: sm8650: Fix CDSP memory length arm64: dts: qcom: sm8650: Fix MPSS memory length arm64: dts: qcom: x1e80100: Fix ADSP memory base and length arm64: dts: qcom: x1e80100: Fix CDSP memory length arm64: dts: qcom: sm6350: Fix ADSP memory length arm64: dts: qcom: sm6350: Fix MPSS memory length arm64: dts: qcom: sm6375: Fix ADSP memory length arm64: dts: qcom: sm6375: Fix CDSP memory base and length arm64: dts: qcom: sm6375: Fix MPSS memory base and length arch/arm64/boot/dts/qcom/sm6350.dtsi | 4 +- arch/arm64/boot/dts/qcom/sm6375.dtsi | 10 +- arch/arm64/boot/dts/qcom/sm8350.dtsi | 492 ++++++++++++++++----------------- arch/arm64/boot/dts/qcom/sm8450.dtsi | 216 +++++++-------- arch/arm64/boot/dts/qcom/sm8550.dtsi | 266 +++++++++--------- arch/arm64/boot/dts/qcom/sm8650.dtsi | 300 ++++++++++---------- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 276 +++++++++--------- 7 files changed, 782 insertions(+), 782 deletions(-) --- base-commit: c245a7a79602ccbee780c004c1e4abcda66aec32 change-id: 20241206-dts-qcom-cdsp-mpss-base-address-ae7c406ac9ac Best regards,