Re: [PATCH 1/3] arm64: dts: qcom: sm8450: Fix the msi-map entries

[Neil Armstrong]

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.
>
> Cc: <stable@xxxxxxxxxxxxxxx> # 6.3: bf79e33cdd89 ("PCI: qcom: Enable BDF to SID translation properly")
> Fixes: ff384ab56f16 ("arm64: dts: qcom: sm8450: Use GIC-ITS for PCIe0 and PCIe1")
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
> ---
>   arch/arm64/boot/dts/qcom/sm8450.dtsi | 16 ++++------------
>   1 file changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> index b86be34a912b..024d2653cc30 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
> @@ -1777,12 +1777,8 @@ pcie0: pcie@1c00000 {
>   			ranges = <0x01000000 0x0 0x00000000 0x0 0x60200000 0x0 0x100000>,
>   				 <0x02000000 0x0 0x60300000 0x0 0x60300000 0x0 0x3d00000>;
>   
> -			/*
> -			 * MSIs for BDF (1:0.0) only works with Device ID 0x5980.
> -			 * Hence, the IDs are swapped.
> -			 */
> -			msi-map = <0x0 &gic_its 0x5981 0x1>,
> -				  <0x100 &gic_its 0x5980 0x1>;
> +			msi-map = <0x0 &gic_its 0x5980 0x1>,
> +				  <0x100 &gic_its 0x5981 0x1>;
>   			msi-map-mask = <0xff00>;
>   			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>,
>   				     <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>,
> @@ -1900,12 +1896,8 @@ pcie1: pcie@1c08000 {
>   			ranges = <0x01000000 0x0 0x00000000 0x0 0x40200000 0x0 0x100000>,
>   				 <0x02000000 0x0 0x40300000 0x0 0x40300000 0x0 0x1fd00000>;
>   
> -			/*
> -			 * MSIs for BDF (1:0.0) only works with Device ID 0x5a00.
> -			 * Hence, the IDs are swapped.
> -			 */
> -			msi-map = <0x0 &gic_its 0x5a01 0x1>,
> -				  <0x100 &gic_its 0x5a00 0x1>;
> +			msi-map = <0x0 &gic_its 0x5a00 0x1>,
> +				  <0x100 &gic_its 0x5a01 0x1>;
>   			msi-map-mask = <0xff00>;
>   			interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>,
>   				     <GIC_SPI 308 IRQ_TYPE_LEVEL_HIGH>,

Reviewed-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>