Commit 6340b391 authored by Manivannan Sadhasivam's avatar Manivannan Sadhasivam Committed by Bjorn Andersson
Browse files

arm64: dts: qcom: Remove "iommus" property from PCIe nodes 



Currently, most of the Qualcomm SoCs specify both "iommus" and "iommu-map"
properties for the PCIe nodes. First one passes the SMR mask to the iommu
driver and the latter specifies the SID for each PCIe device.

But with "iommus" property, the PCIe controller will be added to the
iommu group along with the devices. This makes no sense because the
controller will not initiate any DMA transaction on its own. And moreover,
it is not strictly required to pass the SMR mask to the iommu driver. If
the "iommus" property is not present, then the default mask of "0" would be
used which should work for all PCIe devices.

On the other side, if the SMR mask specified doesn't match the one expected
by the hypervisor, then all the PCIe transactions will end up triggering
"Unidentified Stream Fault" by the SMMU.

So to get rid of these hassles and also prohibit PCIe controllers from
adding to the iommu group, let's remove the "iommus" property from PCIe
nodes.

Reported-by: default avatarRob Herring <robh@kernel.org>
Link: https://lore.kernel.org/linux-arm-msm/20230227195535.GA749409-robh@kernel.org


Signed-off-by: default avatarManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: default avatarBjorn Andersson <andersson@kernel.org>
Signed-off-by: default avatarBjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230308075648.134119-1-manivannan.sadhasivam@linaro.org
parent d6573b4c

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

+0 −2
Original line number Diff line number Diff line
@@ -2140,8 +2140,6 @@ pcie1: pci@1c08000 { 


			dma-coherent;



			iommus = <&apps_smmu 0x1c80 0x1>;



			iommu-map = <0x0 &apps_smmu 0x1c80 0x1>,

				    <0x100 &apps_smmu 0x1c81 0x1>;

arch/arm64/boot/dts/qcom/sdm845.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -2329,7 +2329,6 @@ pcie0: pci@1c00000 { 
				      "slave_q2a",

				      "tbu";



			iommus = <&apps_smmu 0x1c10 0xf>;

			iommu-map = <0x0   &apps_smmu 0x1c10 0x1>,

				    <0x100 &apps_smmu 0x1c11 0x1>,

				    <0x200 &apps_smmu 0x1c12 0x1>,
@@ -2440,7 +2439,6 @@ pcie1: pci@1c08000 { 
			assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>;

			assigned-clock-rates = <19200000>;



			iommus = <&apps_smmu 0x1c00 0xf>;

			iommu-map = <0x0   &apps_smmu 0x1c00 0x1>,

				    <0x100 &apps_smmu 0x1c01 0x1>,

				    <0x200 &apps_smmu 0x1c02 0x1>,

arch/arm64/boot/dts/qcom/sm8150.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -1848,7 +1848,6 @@ pcie0: pci@1c00000 { 
				      "slave_q2a",

				      "tbu";



			iommus = <&apps_smmu 0x1d80 0x3f>;

			iommu-map = <0x0   &apps_smmu 0x1d80 0x1>,

				    <0x100 &apps_smmu 0x1d81 0x1>;
@@ -1947,7 +1946,6 @@ pcie1: pci@1c08000 { 
			assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>;

			assigned-clock-rates = <19200000>;



			iommus = <&apps_smmu 0x1e00 0x3f>;

			iommu-map = <0x0   &apps_smmu 0x1e00 0x1>,

				    <0x100 &apps_smmu 0x1e01 0x1>;

arch/arm64/boot/dts/qcom/sm8250.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -1877,7 +1877,6 @@ pcie0: pci@1c00000 { 
				      "tbu",

				      "ddrss_sf_tbu";



			iommus = <&apps_smmu 0x1c00 0x7f>;

			iommu-map = <0x0   &apps_smmu 0x1c00 0x1>,

				    <0x100 &apps_smmu 0x1c01 0x1>;
@@ -1984,7 +1983,6 @@ pcie1: pci@1c08000 { 
			assigned-clocks = <&gcc GCC_PCIE_1_AUX_CLK>;

			assigned-clock-rates = <19200000>;



			iommus = <&apps_smmu 0x1c80 0x7f>;

			iommu-map = <0x0   &apps_smmu 0x1c80 0x1>,

				    <0x100 &apps_smmu 0x1c81 0x1>;
@@ -2093,7 +2091,6 @@ pcie2: pci@1c10000 { 
			assigned-clocks = <&gcc GCC_PCIE_2_AUX_CLK>;

			assigned-clock-rates = <19200000>;



			iommus = <&apps_smmu 0x1d00 0x7f>;

			iommu-map = <0x0   &apps_smmu 0x1d00 0x1>,

				    <0x100 &apps_smmu 0x1d01 0x1>;

arch/arm64/boot/dts/qcom/sm8350.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -1532,7 +1532,6 @@ pcie0: pci@1c00000 { 
				      "aggre1",

				      "aggre0";



			iommus = <&apps_smmu 0x1c00 0x7f>;

			iommu-map = <0x0   &apps_smmu 0x1c00 0x1>,

				    <0x100 &apps_smmu 0x1c01 0x1>;
@@ -1616,7 +1615,6 @@ pcie1: pci@1c08000 { 
				      "ddrss_sf_tbu",

				      "aggre1";



			iommus = <&apps_smmu 0x1c80 0x7f>;

			iommu-map = <0x0   &apps_smmu 0x1c80 0x1>,

				    <0x100 &apps_smmu 0x1c81 0x1>;