Skip to content

Commit 98f7d57

Browse files
tpetazzonigclement
authored andcommitted
arm64: dts: marvell: fix interrupt-map property for Armada CP110 PCIe controller
The interrupt-map property used in the description of the Marvell Armada 7K/8K PCIe controllers has a bogus extraneous 0 that causes the interrupt conversion to not be done properly. This causes the PCIe PME and AER root port service drivers to fail their initialization: [ 5.019900] genirq: Setting trigger mode 7 for irq 114 failed (irq_chip_set_type_parent+0x0/0x30) [ 5.028821] pcie_pme: probe of 0001:00:00.0:pcie001 failed with error -22 [ 5.035687] genirq: Setting trigger mode 7 for irq 114 failed (irq_chip_set_type_parent+0x0/0x30) [ 5.044614] aer: probe of 0001:00:00.0:pcie002 failed with error -22 This problem was introduced when the interrupt description was switched from using the GIC directly to using the ICU interrupt controller. Indeed, the GIC has address-cells = <1>, which requires a parent unit address, while the ICU has address-cells = <0>. Fixes: 6ef84a8 ("arm64: dts: marvell: enable GICP and ICU on Armada 7K/8K") Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Reviewed-by: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
1 parent 9e7460f commit 98f7d57

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336
/* non-prefetchable memory */
337337
0x82000000 0 0xf6000000 0 0xf6000000 0 0xf00000>;
338338
interrupt-map-mask = <0 0 0 0>;
339-
interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
339+
interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
340340
interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
341341
num-lanes = <1>;
342342
clocks = <&cpm_clk 1 13>;
@@ -362,7 +362,7 @@
362362
/* non-prefetchable memory */
363363
0x82000000 0 0xf7000000 0 0xf7000000 0 0xf00000>;
364364
interrupt-map-mask = <0 0 0 0>;
365-
interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
365+
interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
366366
interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
367367

368368
num-lanes = <1>;
@@ -389,7 +389,7 @@
389389
/* non-prefetchable memory */
390390
0x82000000 0 0xf8000000 0 0xf8000000 0 0xf00000>;
391391
interrupt-map-mask = <0 0 0 0>;
392-
interrupt-map = <0 0 0 0 &cpm_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
392+
interrupt-map = <0 0 0 0 &cpm_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
393393
interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
394394

395395
num-lanes = <1>;

arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,7 @@
335335
/* non-prefetchable memory */
336336
0x82000000 0 0xfa000000 0 0xfa000000 0 0xf00000>;
337337
interrupt-map-mask = <0 0 0 0>;
338-
interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
338+
interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
339339
interrupts = <ICU_GRP_NSR 22 IRQ_TYPE_LEVEL_HIGH>;
340340
num-lanes = <1>;
341341
clocks = <&cps_clk 1 13>;
@@ -361,7 +361,7 @@
361361
/* non-prefetchable memory */
362362
0x82000000 0 0xfb000000 0 0xfb000000 0 0xf00000>;
363363
interrupt-map-mask = <0 0 0 0>;
364-
interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
364+
interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
365365
interrupts = <ICU_GRP_NSR 24 IRQ_TYPE_LEVEL_HIGH>;
366366

367367
num-lanes = <1>;
@@ -388,7 +388,7 @@
388388
/* non-prefetchable memory */
389389
0x82000000 0 0xfc000000 0 0xfc000000 0 0xf00000>;
390390
interrupt-map-mask = <0 0 0 0>;
391-
interrupt-map = <0 0 0 0 &cps_icu 0 ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
391+
interrupt-map = <0 0 0 0 &cps_icu ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
392392
interrupts = <ICU_GRP_NSR 23 IRQ_TYPE_LEVEL_HIGH>;
393393

394394
num-lanes = <1>;

0 commit comments

Comments
 (0)