arm64: dts: qcom: sm8150: Fix fastrpc iommu values

Fix the 'memory access' related crash seen while running Hexagon
SDK example applications on the cdsp dsp available on sm8150 SoC
based boards:

  qcom_q6v5_pas 8300000.remoteproc: fatal error received:
    EX:kernel:0x0:frpck_0_0:0xf5:PC=0xc020ceb0

This crash is caused by incorrect IOMMU SID values being used
in the fastrpc node.

Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Rob Herring <robh@kernel.org>
Suggested-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220819053945.4114430-1-bhupesh.sharma@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
index 7d509ecd44dabcdcbe032c7d6fb95bd11a69934b..916f12b799b7966f1379dd3bf9c8ff46d278af03 100644 (file)
--- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
@@ -3394,57 +3394,49 @@
                                        compute-cb@1 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <1>;
-                                               iommus = <&apps_smmu 0x1401 0x2040>,
-                                                        <&apps_smmu 0x1421 0x0>,
-                                                        <&apps_smmu 0x2001 0x420>,
-                                                        <&apps_smmu 0x2041 0x0>;
+                                               iommus = <&apps_smmu 0x1001 0x0460>;
                                        };
 
                                        compute-cb@2 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <2>;
-                                               iommus = <&apps_smmu 0x2 0x3440>,
-                                                        <&apps_smmu 0x22 0x3400>;
+                                               iommus = <&apps_smmu 0x1002 0x0460>;
                                        };
 
                                        compute-cb@3 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <3>;
-                                               iommus = <&apps_smmu 0x3 0x3440>,
-                                                        <&apps_smmu 0x1423 0x0>,
-                                                        <&apps_smmu 0x2023 0x0>;
+                                               iommus = <&apps_smmu 0x1003 0x0460>;
                                        };
 
                                        compute-cb@4 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <4>;
-                                               iommus = <&apps_smmu 0x4 0x3440>,
-                                                        <&apps_smmu 0x24 0x3400>;
+                                               iommus = <&apps_smmu 0x1004 0x0460>;
                                        };
 
                                        compute-cb@5 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <5>;
-                                               iommus = <&apps_smmu 0x5 0x3440>,
-                                                        <&apps_smmu 0x25 0x3400>;
+                                               iommus = <&apps_smmu 0x1005 0x0460>;
                                        };
 
                                        compute-cb@6 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <6>;
-                                               iommus = <&apps_smmu 0x6 0x3460>;
+                                               iommus = <&apps_smmu 0x1006 0x0460>;
                                        };
 
                                        compute-cb@7 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <7>;
-                                               iommus = <&apps_smmu 0x7 0x3460>;
+                                               iommus = <&apps_smmu 0x1007 0x0460>;
                                        };
 
                                        compute-cb@8 {
                                                compatible = "qcom,fastrpc-compute-cb";
                                                reg = <8>;
-                                               iommus = <&apps_smmu 0x8 0x3460>;
+                                               iommus = <&apps_smmu 0x1008 0x0460>;
                                        };
 
                                        /* note: secure cb9 in downstream */