Skip to content

Commit 98a953f

Browse files
Mani-Sadhasivamandersson
authored andcommitted
arm64: dts: qcom: sm8550: Fix the msi-map entries
While adding the GIC ITS MSI support, it was found that the msi-map entries needed to be swapped to receive MSIs from the endpoint. But later it was identified that the swapping was needed due to a bug in the Qualcomm PCIe controller driver. And since the bug is now fixed with commit bf79e33 ("PCI: qcom: Enable BDF to SID translation properly"), let's fix the msi-map entries also to reflect the actual mapping in the hardware. Fixes: 114990c ("arm64: dts: qcom: sm8550: Use GIC-ITS for PCIe0 and PCIe1") Signed-off-by: Manivannan Sadhasivam <[email protected]> Acked-by: Neil Armstrong <[email protected]> Tested-by: Neil Armstrong <[email protected]> # on SM8550-QRD Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent ecc3ac2 commit 98a953f

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1755,9 +1755,8 @@
17551755
<&gem_noc MASTER_APPSS_PROC 0 &cnoc_main SLAVE_PCIE_0 0>;
17561756
interconnect-names = "pcie-mem", "cpu-pcie";
17571757

1758-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
1759-
msi-map = <0x0 &gic_its 0x1401 0x1>,
1760-
<0x100 &gic_its 0x1400 0x1>;
1758+
msi-map = <0x0 &gic_its 0x1400 0x1>,
1759+
<0x100 &gic_its 0x1401 0x1>;
17611760
iommu-map = <0x0 &apps_smmu 0x1400 0x1>,
17621761
<0x100 &apps_smmu 0x1401 0x1>;
17631762

@@ -1867,9 +1866,8 @@
18671866
<&gem_noc MASTER_APPSS_PROC 0 &cnoc_main SLAVE_PCIE_1 0>;
18681867
interconnect-names = "pcie-mem", "cpu-pcie";
18691868

1870-
/* Entries are reversed due to the unusual ITS DeviceID encoding */
1871-
msi-map = <0x0 &gic_its 0x1481 0x1>,
1872-
<0x100 &gic_its 0x1480 0x1>;
1869+
msi-map = <0x0 &gic_its 0x1480 0x1>,
1870+
<0x100 &gic_its 0x1481 0x1>;
18731871
iommu-map = <0x0 &apps_smmu 0x1480 0x1>,
18741872
<0x100 &apps_smmu 0x1481 0x1>;
18751873

0 commit comments

Comments
 (0)