arm64: marvell: MSI support updates
Subsystems (2)
cover arm64: marvell: MSI support updates
Hello,
This small set of patches brings some MSI updates on Armada 3700 and Armada 7K/8K:
- On Armada 3700, it removes a useless msi-parent property. This patch should only be merged once "pci: pci-aardvark: move to MSI handling using generic MSI support" has been applied and merged by the PCI maintainer, otherwise MSI support will be broken.
- On Armada 7K/8K, it enables MSI support by using the GIC v2m. Adding an msi-parent property is enough to achieve this. This can be applied right away.
Thanks,
Thomas
Thomas Petazzoni (2):
arm64: dts: marvell: remove msi-parent from PCIe on Armada 3700
arm64: dts: marvell: enable MSI for PCIe on Armada 7K/8K
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 - arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 +++ arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-)
Signature · 1 line
2.7.4
PATCH 1/2 arm64: dts: marvell: remove msi-parent from PCIe on Armada 3700
Following the switch of the Aardvark PCIe controller driver to the generic MSI support, the msi-parent property in the PCIe controller, pointing to itself is no longer needed: since the MSI irq domain is associated to the PCIe controller Device Tree node, this is sufficient for the interrupt resolution logic to work.
---
Please only apply once "pci: pci-aardvark: move to MSI handling using generic MSI support" is merged, or it will break MSI support on Armada 3700.
--- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 - 1 file changed, 1 deletion(-)
arch/arm64/boot/dts/marvell/armada-37xx.dtsi +0 -1
@@ -187,7 +187,6 @@ bus-range = <0x00 0xff>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <1>; - msi-parent = <&pcie0>; msi-controller; ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x1000000 /* Port 0 MEM */ 0x81000000 0 0xe9000000 0 0xe9000000 0 0x10000>; /* Port 0 IO*/
Signature · 1 line
2.7.4
PATCH 1/2 arm64: dts: marvell: remove msi-parent from PCIe on Armada 3700
Hi Thomas,
Quoted 11 lines · Thomas Petazzoni
Following the switch of the Aardvark PCIe controller driver to the generic MSI support, the msi-parent property in the PCIe controller, pointing to itself is no longer needed: since the MSI irq domain is associated to the PCIe controller Device Tree node, this is sufficient for the interrupt resolution logic to work.
Signed-off-by Thomas Petazzoni <[email protected]>---
Please only apply once "pci: pci-aardvark: move to MSI handling using generic MSI support" is merged, or it will break MSI support on Armada 3700.
What is the status of this patch?
Can I remove it from my mailbox?
it seemed that "pci: pci-aardvark: move to MSI handling using generic MSI support" was never merged.
Thanks,
Gregory
Quoted 19 lines
--- arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 - 1 file changed, 1 deletion(-)arch/arm64/boot/dts/marvell/armada-37xx.dtsi +0
-1@@ -187,7 +187,6 @@ bus-range = <0x00 0xff>; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; #interrupt-cells = <1>; - msi-parent = <&pcie0>; msi-controller; ranges = <0x82000000 0 0xe8000000 0 0xe8000000 0 0x1000000 /* Port 0 MEM */ 0x81000000 0 0xe9000000 0 0xe9000000 0 0x10000>; /* Port 0 IO*/Signature · 1 line
2.7.4
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH 1/2 arm64: dts: marvell: remove msi-parent from PCIe on Armada 3700
Hello,
Quoted 2 lines · Gregory CLEMENT
What is the status of this patch?
Can I remove it from my mailbox?
Yes, remove it from your inbox, I'll resend once the patch it depends on has been merged.
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux and Kernel engineering http://free-electrons.com
PATCH 2/2 arm64: dts: marvell: enable MSI for PCIe on Armada 7K/8K
In reply to Thomas PetazzoniThis commit adds a reference to the appropriate MSI controller in the description of the PCIe controllers on Marvel Armada 7K and 8K platforms.
--- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 +++ arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 +++ 2 files changed, 6 insertions(+)
arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +3 -0
@@ -177,6 +177,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
@@ -202,6 +203,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
@@ -228,6 +230,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +3 -0
@@ -177,6 +177,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
@@ -202,6 +203,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
@@ -228,6 +230,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =
Signature · 1 line
2.7.4
PATCH 2/2 arm64: dts: marvell: enable MSI for PCIe on Armada 7K/8K
Hi Thomas,
Quoted 3 lines · Thomas Petazzoni
This commit adds a reference to the appropriate MSI controller in the description of the PCIe controllers on Marvel Armada 7K and 8K platforms.
Applied on mvebu/dt64
Thanks,
Gregory
Quoted 66 lines
Signed-off-by Thomas Petazzoni <[email protected]>--- arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi | 3 +++ arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 3 +++ 2 files changed, 6 insertions(+)arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi +3
-0@@ -177,6 +177,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =@@ -202,6 +203,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =@@ -228,6 +230,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi +3
-0@@ -177,6 +177,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =@@ -202,6 +203,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =@@ -228,6 +230,7 @@ #interrupt-cells = <1>; device_type = "pci"; dma-coherent; + msi-parent = <&gic_v2m0>; bus-range = <0 0xff>; ranges =Signature · 1 line
2.7.4
Signature · 4 lines
Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com