[PATCH v4 1/2] nxp/dts: add pcie aer interrupt-name property in the dts
Bjorn Helgaas
helgaas at kernel.org
Mon Sep 12 15:13:58 PDT 2016
On Wed, Aug 31, 2016 at 02:37:21PM +0800, Po Liu wrote:
> NXP some platforms aer interrupt was not MSI/MSI-X/INTx
> but using interrupt line independently. This patch add a "aer"
> interrupt-names for aer interrupt.
> With the interrupt-names "aer", code could probe aer interrupt
> line for pcie root port, replace the aer interrupt service irq.
> This is intend to fixup the Layerscape platforms which aer interrupt
> was not MSI/MSI-X/INTx, but using interrupt line independently.
>
> Signed-off-by: Po Liu <po.liu at nxp.com>
Rob and Shawn had comments here, and I'm not sure they ever got resolved.
> ---
> changes for V4:
> - Add comments explain why to add this patch
> - Move the binding changes to pci code patch
>
> arch/arm/boot/dts/ls1021a.dtsi | 6 ++++--
> arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 18 +++++++++---------
> arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 16 ++++++++--------
> 3 files changed, 21 insertions(+), 19 deletions(-)
>
> diff --git a/arch/arm/boot/dts/ls1021a.dtsi b/arch/arm/boot/dts/ls1021a.dtsi
> index 368e219..443e50b 100644
> --- a/arch/arm/boot/dts/ls1021a.dtsi
> +++ b/arch/arm/boot/dts/ls1021a.dtsi
> @@ -634,7 +634,8 @@
> reg = <0x00 0x03400000 0x0 0x00010000 /* controller registers */
> 0x40 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <GIC_SPI 177 IRQ_TYPE_LEVEL_HIGH>; /* controller interrupt */
> + interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>; /* aer interrupt */
> + interrupt-names = "aer";
> fsl,pcie-scfg = <&scfg 0>;
> #address-cells = <3>;
> #size-cells = <2>;
> @@ -657,7 +658,8 @@
> reg = <0x00 0x03500000 0x0 0x00010000 /* controller registers */
> 0x48 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <GIC_SPI 178 IRQ_TYPE_LEVEL_HIGH>;
> + interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; /* aer interrupt */
> + interrupt-names = "aer";
> fsl,pcie-scfg = <&scfg 1>;
> #address-cells = <3>;
> #size-cells = <2>;
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> index e669fbd..654071d 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi
> @@ -527,9 +527,9 @@
> reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */
> 0x40 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 118 0x4>, /* controller interrupt */
> - <0 117 0x4>; /* PME interrupt */
> - interrupt-names = "intr", "pme";
> + interrupts = <0 117 0x4>, /* PME interrupt */
> + <0 118 0x4>; /* aer interrupt */
> + interrupt-names = "pme", "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> @@ -552,9 +552,9 @@
> reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
> 0x48 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 128 0x4>,
> - <0 127 0x4>;
> - interrupt-names = "intr", "pme";
> + interrupts = <0 127 0x4>,
> + <0 128 0x4>;
> + interrupt-names = "pme", "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> @@ -577,9 +577,9 @@
> reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
> 0x50 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 162 0x4>,
> - <0 161 0x4>;
> - interrupt-names = "intr", "pme";
> + interrupts = <0 161 0x4>,
> + <0 162 0x4>;
> + interrupt-names = "pme", "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> diff --git a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
> index 21023a3..58844e8 100644
> --- a/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
> +++ b/arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi
> @@ -583,8 +583,8 @@
> reg = <0x00 0x03400000 0x0 0x00100000 /* controller registers */
> 0x10 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 108 0x4>; /* Level high type */
> - interrupt-names = "intr";
> + interrupts = <0 108 0x4>; /* aer interrupt */
> + interrupt-names = "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> @@ -607,8 +607,8 @@
> reg = <0x00 0x03500000 0x0 0x00100000 /* controller registers */
> 0x12 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 113 0x4>; /* Level high type */
> - interrupt-names = "intr";
> + interrupts = <0 113 0x4>; /* aer interrupt */
> + interrupt-names = "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> @@ -631,8 +631,8 @@
> reg = <0x00 0x03600000 0x0 0x00100000 /* controller registers */
> 0x14 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 118 0x4>; /* Level high type */
> - interrupt-names = "intr";
> + interrupts = <0 118 0x4>; /* aer interrupt */
> + interrupt-names = "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> @@ -655,8 +655,8 @@
> reg = <0x00 0x03700000 0x0 0x00100000 /* controller registers */
> 0x16 0x00000000 0x0 0x00002000>; /* configuration space */
> reg-names = "regs", "config";
> - interrupts = <0 123 0x4>; /* Level high type */
> - interrupt-names = "intr";
> + interrupts = <0 123 0x4>; /* aer interrupt */
> + interrupt-names = "aer";
> #address-cells = <3>;
> #size-cells = <2>;
> device_type = "pci";
> --
> 2.1.0.27.g96db324
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
More information about the linux-arm-kernel
mailing list