From 87e63247c94e99d904f7d0c2f5dd84ddb309294f Mon Sep 17 00:00:00 2001 From: Rodrigo Cataldo Date: Fri, 9 Dec 2022 10:46:42 +0100 Subject: [PATCH] dts: bindings: pcie: update interrupt-map type to compound The interrupt-map property specifies both 32-bits values and a phandle; update the type accordingly. Update the definition of pcie-host-ecam-generic on qemu arm64 to match the new type. Signed-off-by: Rodrigo Cataldo Co-authored-by: Henri Xavier --- dts/arm64/qemu/qemu-virt-a53.dtsi | 35 ++++++++++--------- dts/arm64/qemu/qemu-virt-arm64.dtsi | 35 ++++++++++--------- .../pcie/host/pci-host-ecam-generic.yaml | 2 +- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/dts/arm64/qemu/qemu-virt-a53.dtsi b/dts/arm64/qemu/qemu-virt-a53.dtsi index 5d8faadcf1d..3eeef309a20 100644 --- a/dts/arm64/qemu/qemu-virt-a53.dtsi +++ b/dts/arm64/qemu/qemu-virt-a53.dtsi @@ -112,22 +112,25 @@ 0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>; #interrupt-cells = <0x01>; interrupt-map-mask = <0x1800 0x00 0x00 0x07>; - interrupt-map = <0x00 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x00 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x00 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x00 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x800 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x800 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x800 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x800 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1000 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x1000 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x1000 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1000 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x1800 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x1800 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1800 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x1800 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x05 0x04>; + interrupt-map = <0x00 0x00 0x00 1 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x00 0x00 0x00 2 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x00 0x00 0x00 3 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x00 0x00 0x00 4 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + + 0x800 0x00 0x00 1 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x800 0x00 0x00 2 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x800 0x00 0x00 3 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x800 0x00 0x00 4 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + + 0x1000 0x00 0x00 1 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 2 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 3 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 4 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + + 0x1800 0x00 0x00 1 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 2 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 3 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 4 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE>; msi-parent = <&its>; bus-range = <0x00 0xff>; }; diff --git a/dts/arm64/qemu/qemu-virt-arm64.dtsi b/dts/arm64/qemu/qemu-virt-arm64.dtsi index 05f4180ff8c..bbd5fca560c 100644 --- a/dts/arm64/qemu/qemu-virt-arm64.dtsi +++ b/dts/arm64/qemu/qemu-virt-arm64.dtsi @@ -112,22 +112,25 @@ 0x3000000 0x80 0x00 0x80 0x00 0x80 0x00>; #interrupt-cells = <0x01>; interrupt-map-mask = <0x1800 0x00 0x00 0x07>; - interrupt-map = <0x00 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x00 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x00 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x00 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x800 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x800 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x800 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x800 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1000 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x05 0x04 - 0x1000 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x1000 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1000 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x1800 0x00 0x00 0x01 0x8002 0x00 0x00 0x00 0x06 0x04 - 0x1800 0x00 0x00 0x02 0x8002 0x00 0x00 0x00 0x03 0x04 - 0x1800 0x00 0x00 0x03 0x8002 0x00 0x00 0x00 0x04 0x04 - 0x1800 0x00 0x00 0x04 0x8002 0x00 0x00 0x00 0x05 0x04>; + interrupt-map = <0x00 0x00 0x00 1 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x00 0x00 0x00 2 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x00 0x00 0x00 3 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x00 0x00 0x00 4 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + + 0x800 0x00 0x00 1 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x800 0x00 0x00 2 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x800 0x00 0x00 3 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x800 0x00 0x00 4 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + + 0x1000 0x00 0x00 1 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 2 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 3 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x1000 0x00 0x00 4 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + + 0x1800 0x00 0x00 1 &gic 0 0 GIC_SPI 0x06 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 2 &gic 0 0 GIC_SPI 0x03 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 3 &gic 0 0 GIC_SPI 0x04 IRQ_TYPE_EDGE + 0x1800 0x00 0x00 4 &gic 0 0 GIC_SPI 0x05 IRQ_TYPE_EDGE>; msi-parent = <&its>; bus-range = <0x00 0xff>; }; diff --git a/dts/bindings/pcie/host/pci-host-ecam-generic.yaml b/dts/bindings/pcie/host/pci-host-ecam-generic.yaml index a6e6a52d131..edd2f1a7cbc 100644 --- a/dts/bindings/pcie/host/pci-host-ecam-generic.yaml +++ b/dts/bindings/pcie/host/pci-host-ecam-generic.yaml @@ -26,7 +26,7 @@ properties: type: array interrupt-map: - type: array + type: compound bus-range: type: array