[PATCH 1/2] dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller

[PATCH 1/2] dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller

[Manivannan Sadhasivam]

The binding should specify both MSI implementations and the OS/driver
should choose the one based on the platform requirements.

Fixes: 2b0d557419cd ("dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller")
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
index 01208450e05c..e106bdf93f09 100644
--- a/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/qcom,pcie.yaml
@@ -119,7 +119,7 @@ required:
   - clocks
   - clock-names
 
-oneOf:
+anyOf:
   - required:
       - interrupts
       - interrupt-names
-- 
2.25.1

[PATCH 2/2] arm64: dts: qcom: sm8450: Allow both GIC-ITS and internal MSI controller

[Manivannan Sadhasivam]

The devicetree should specify both MSI implementations and the OS/driver
should choose the one based on the platform requirements. Currently, Linux
DWC driver will choose GIC-ITS over the internal MSI controller.

Fixes: a11bbf6adef4 ("arm64: dts: qcom: sm8450: Use GIC-ITS for PCIe0 and PCIe1")
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
---
 arch/arm64/boot/dts/qcom/sm8450.dtsi | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi
index c4dd5838fac6..442b7be10858 100644
--- a/arch/arm64/boot/dts/qcom/sm8450.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi
@@ -1740,6 +1740,9 @@ pcie0: pci@1c00000 {
 			msi-map = <0x0 &gic_its 0x5981 0x1>,
 				  <0x100 &gic_its 0x5980 0x1>;
 			msi-map-mask = <0xff00>;
+			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "msi";
+			#interrupt-cells = <1>;
 			interrupt-map-mask = <0 0 0 0x7>;
 			interrupt-map = <0 0 0 1 &intc 0 0 0 149 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
 					<0 0 0 2 &intc 0 0 0 150 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
@@ -1853,6 +1856,9 @@ pcie1: pci@1c08000 {
 			msi-map = <0x0 &gic_its 0x5a01 0x1>,
 				  <0x100 &gic_its 0x5a00 0x1>;
 			msi-map-mask = <0xff00>;
+			interrupts = <GIC_SPI 307 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "msi";
+			#interrupt-cells = <1>;
 			interrupt-map-mask = <0 0 0 0x7>;
 			interrupt-map = <0 0 0 1 &intc 0 0 0 434 IRQ_TYPE_LEVEL_HIGH>, /* int_a */
 					<0 0 0 2 &intc 0 0 0 435 IRQ_TYPE_LEVEL_HIGH>, /* int_b */
-- 
2.25.1

Re: [PATCH 1/2] dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller

[Rob Herring]

On Wed, 11 Jan 2023 18:00:03 +0530, Manivannan Sadhasivam wrote:
> The binding should specify both MSI implementations and the OS/driver
> should choose the one based on the platform requirements.
> 
> Fixes: 2b0d557419cd ("dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller")
> Suggested-by: Rob Herring <robh@kernel.org>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> ---
>  Documentation/devicetree/bindings/pci/qcom,pcie.yaml | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

Re: (subset) [PATCH 1/2] dt-bindings: PCI: qcom: Allow both GIC-ITS and internal MSI controller

[Bjorn Andersson]

On Wed, 11 Jan 2023 18:00:03 +0530, Manivannan Sadhasivam wrote:
> The binding should specify both MSI implementations and the OS/driver
> should choose the one based on the platform requirements.
> 
> 

Applied, thanks!

[2/2] arm64: dts: qcom: sm8450: Allow both GIC-ITS and internal MSI controller
      commit: 0da2eff44e78ded247fe35d8a3f73508263d0948

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>