| Message ID | 20240318-pci-bdf-sid-fix-v1-3-acca6c5d9cf1@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 3ac680a514b6e63428481b1e6fb069383e5b7add |
| Headers | show |
| Series | arm64: dts: qcom: Fix the msi-map entries | expand |
On 18/03/2024 08:19, Manivannan Sadhasivam wrote: > 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 bf79e33cdd89 ("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: a33a532b3b1e ("arm64: dts: qcom: sm8650: Use GIC-ITS for PCIe0 and PCIe1") > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > --- > arch/arm64/boot/dts/qcom/sm8650.dtsi | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi > index ba72d8f38420..eb117866e59f 100644 > --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi > @@ -2274,9 +2274,8 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, > interrupt-map-mask = <0 0 0 0x7>; > #interrupt-cells = <1>; > > - /* Entries are reversed due to the unusual ITS DeviceID encoding */ > - msi-map = <0x0 &gic_its 0x1401 0x1>, > - <0x100 &gic_its 0x1400 0x1>; > + msi-map = <0x0 &gic_its 0x1400 0x1>, > + <0x100 &gic_its 0x1401 0x1>; > msi-map-mask = <0xff00>; > > linux,pci-domain = <0>; > @@ -2402,9 +2401,8 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, > interrupt-map-mask = <0 0 0 0x7>; > #interrupt-cells = <1>; > > - /* Entries are reversed due to the unusual ITS DeviceID encoding */ > - msi-map = <0x0 &gic_its 0x1481 0x1>, > - <0x100 &gic_its 0x1480 0x1>; > + msi-map = <0x0 &gic_its 0x1480 0x1>, > + <0x100 &gic_its 0x1481 0x1>; > msi-map-mask = <0xff00>; > > linux,pci-domain = <1>; > Acked-by: Neil Armstrong <neil.armstrong@linaro.org> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8650-QRD
diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index ba72d8f38420..eb117866e59f 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -2274,9 +2274,8 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, interrupt-map-mask = <0 0 0 0x7>; #interrupt-cells = <1>; - /* Entries are reversed due to the unusual ITS DeviceID encoding */ - msi-map = <0x0 &gic_its 0x1401 0x1>, - <0x100 &gic_its 0x1400 0x1>; + msi-map = <0x0 &gic_its 0x1400 0x1>, + <0x100 &gic_its 0x1401 0x1>; msi-map-mask = <0xff00>; linux,pci-domain = <0>; @@ -2402,9 +2401,8 @@ &mc_virt SLAVE_EBI1 QCOM_ICC_TAG_ALWAYS>, interrupt-map-mask = <0 0 0 0x7>; #interrupt-cells = <1>; - /* Entries are reversed due to the unusual ITS DeviceID encoding */ - msi-map = <0x0 &gic_its 0x1481 0x1>, - <0x100 &gic_its 0x1480 0x1>; + msi-map = <0x0 &gic_its 0x1480 0x1>, + <0x100 &gic_its 0x1481 0x1>; msi-map-mask = <0xff00>; linux,pci-domain = <1>;
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 bf79e33cdd89 ("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: a33a532b3b1e ("arm64: dts: qcom: sm8650: Use GIC-ITS for PCIe0 and PCIe1") Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> --- arch/arm64/boot/dts/qcom/sm8650.dtsi | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)