[PATCH] configs: Set IRQ_TYPE_EDGE_RISING in DT nodes of virtual PCI host controller

5 views
Skip to first unread message

Jan Kiszka

unread,
May 18, 2018, 2:40:43 AM5/18/18
to Jailhouse
We already do this for the overlay fragment the driver injects and the
Seattle dts. For the latter, use that chance to install the symbolic
value.

The background is that newer Linux kernel dislike IRQ_TYPE_NONE and
express that via WARN_ON during boot.

Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
---
configs/arm/dts/inmate-bananapi.dts | 8 ++++----
configs/arm/dts/inmate-jetson-tk1.dts | 8 ++++----
configs/arm/dts/inmate-orangepi0.dts | 8 ++++----
configs/arm/jetson-tk1.c | 2 +-
configs/arm64/dts/inmate-amd-seattle.dts | 10 ++++++----
configs/arm64/dts/inmate-espressobin.dts | 8 ++++----
configs/arm64/dts/inmate-hikey.dts | 8 ++++----
configs/arm64/dts/inmate-jetson-tx1.dts | 8 ++++----
configs/arm64/dts/inmate-qemu-arm64.dts | 8 ++++----
configs/arm64/dts/inmate-zynqmp-zcu102-2.dts | 8 ++++----
configs/arm64/dts/inmate-zynqmp-zcu102.dts | 8 ++++----
11 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/configs/arm/dts/inmate-bananapi.dts b/configs/arm/dts/inmate-bananapi.dts
index 137223205..78a29301f 100644
--- a/configs/arm/dts/inmate-bananapi.dts
+++ b/configs/arm/dts/inmate-bananapi.dts
@@ -105,10 +105,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 123 0>,
- <0 0 0 2 &gic GIC_SPI 124 0>,
- <0 0 0 3 &gic GIC_SPI 125 0>,
- <0 0 0 4 &gic GIC_SPI 126 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 123 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 124 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 125 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 126 IRQ_TYPE_EDGE_RISING>;
reg = <0x2000000 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x10000000 0x00 0x10000>;
diff --git a/configs/arm/dts/inmate-jetson-tk1.dts b/configs/arm/dts/inmate-jetson-tk1.dts
index 974e5e26e..f055b48db 100644
--- a/configs/arm/dts/inmate-jetson-tk1.dts
+++ b/configs/arm/dts/inmate-jetson-tk1.dts
@@ -88,10 +88,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 152 0>,
- <0 0 0 2 &gic GIC_SPI 153 0>,
- <0 0 0 3 &gic GIC_SPI 154 0>,
- <0 0 0 4 &gic GIC_SPI 155 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 152 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 153 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 154 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 155 IRQ_TYPE_EDGE_RISING>;
reg = <0x48000000 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x10000000 0x00 0x10000>;
diff --git a/configs/arm/dts/inmate-orangepi0.dts b/configs/arm/dts/inmate-orangepi0.dts
index 080176d64..cfdb7cdad 100644
--- a/configs/arm/dts/inmate-orangepi0.dts
+++ b/configs/arm/dts/inmate-orangepi0.dts
@@ -101,10 +101,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 123 0>,
- <0 0 0 2 &gic GIC_SPI 124 0>,
- <0 0 0 3 &gic GIC_SPI 125 0>,
- <0 0 0 4 &gic GIC_SPI 126 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 123 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 124 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 125 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 126 IRQ_TYPE_EDGE_RISING>;
reg = <0x2000000 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x10000000 0x00 0x10000>;
diff --git a/configs/arm/jetson-tk1.c b/configs/arm/jetson-tk1.c
index cc781ea8e..a46fee229 100644
--- a/configs/arm/jetson-tk1.c
+++ b/configs/arm/jetson-tk1.c
@@ -49,7 +49,7 @@ struct {
.pci_mmconfig_base = 0x48000000,
.pci_mmconfig_end_bus = 0,
.pci_is_virtual = 1,
- .pci_domain = -1,
+ .pci_domain = 1,
.arm = {
.gic_version = 2,
.gicd_base = 0x50041000,
diff --git a/configs/arm64/dts/inmate-amd-seattle.dts b/configs/arm64/dts/inmate-amd-seattle.dts
index 2616a5936..89b7d50b6 100644
--- a/configs/arm64/dts/inmate-amd-seattle.dts
+++ b/configs/arm64/dts/inmate-amd-seattle.dts
@@ -14,6 +14,8 @@
*
*/

+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
/dts-v1/;

/ {
@@ -169,10 +171,10 @@

interrupt-map-mask = <0xf800 0x0 0x0 0x7>;
interrupt-map =
- <0x1000 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x120 0x1>,
- <0x1000 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x121 0x1>,
- <0x1000 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x122 0x1>,
- <0x1000 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x123 0x1>;
+ <0x1000 0x0 0x0 0x1 &gic 0x0 0x0 0x0 0x120 IRQ_TYPE_EDGE_RISING>,
+ <0x1000 0x0 0x0 0x2 &gic 0x0 0x0 0x0 0x121 IRQ_TYPE_EDGE_RISING>,
+ <0x1000 0x0 0x0 0x3 &gic 0x0 0x0 0x0 0x122 IRQ_TYPE_EDGE_RISING>,
+ <0x1000 0x0 0x0 0x4 &gic 0x0 0x0 0x0 0x123 IRQ_TYPE_EDGE_RISING>;

dma-coherent;
dma-ranges = <0x43000000 0x0 0x0 0x0 0x0 0x100 0x0>;
diff --git a/configs/arm64/dts/inmate-espressobin.dts b/configs/arm64/dts/inmate-espressobin.dts
index 49715e8ae..5e83d7df1 100644
--- a/configs/arm64/dts/inmate-espressobin.dts
+++ b/configs/arm64/dts/inmate-espressobin.dts
@@ -76,10 +76,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 108 0>,
- <0 0 0 2 &gic GIC_SPI 109 0>,
- <0 0 0 3 &gic GIC_SPI 110 0>,
- <0 0 0 4 &gic GIC_SPI 111 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 109 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 110 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 111 IRQ_TYPE_EDGE_RISING>;
reg = <0x0 0xfc000000 0x0 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
diff --git a/configs/arm64/dts/inmate-hikey.dts b/configs/arm64/dts/inmate-hikey.dts
index c33767fe2..828d494b9 100644
--- a/configs/arm64/dts/inmate-hikey.dts
+++ b/configs/arm64/dts/inmate-hikey.dts
@@ -101,10 +101,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 111 0>,
- <0 0 0 2 &gic GIC_SPI 112 0>,
- <0 0 0 3 &gic GIC_SPI 113 0>,
- <0 0 0 4 &gic GIC_SPI 114 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 111 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 112 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 113 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 114 IRQ_TYPE_EDGE_RISING>;
reg = <0x0 0xf6000000 0x0 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
diff --git a/configs/arm64/dts/inmate-jetson-tx1.dts b/configs/arm64/dts/inmate-jetson-tx1.dts
index 8fd30e825..739a48b93 100644
--- a/configs/arm64/dts/inmate-jetson-tx1.dts
+++ b/configs/arm64/dts/inmate-jetson-tx1.dts
@@ -92,10 +92,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 152 0>,
- <0 0 0 2 &gic GIC_SPI 153 0>,
- <0 0 0 3 &gic GIC_SPI 154 0>,
- <0 0 0 4 &gic GIC_SPI 155 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 152 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 153 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 154 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 155 IRQ_TYPE_EDGE_RISING>;
reg = <0x48000000 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x10000000 0x00 0x10000>;
diff --git a/configs/arm64/dts/inmate-qemu-arm64.dts b/configs/arm64/dts/inmate-qemu-arm64.dts
index 6150a43d7..f6fd548c5 100644
--- a/configs/arm64/dts/inmate-qemu-arm64.dts
+++ b/configs/arm64/dts/inmate-qemu-arm64.dts
@@ -92,10 +92,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 108 0>,
- <0 0 0 2 &gic GIC_SPI 109 0>,
- <0 0 0 3 &gic GIC_SPI 110 0>,
- <0 0 0 4 &gic GIC_SPI 111 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 109 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 110 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 111 IRQ_TYPE_EDGE_RISING>;
reg = <0x0 0x07000000 0x0 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
diff --git a/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts b/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts
index bf86b0d27..de7028466 100644
--- a/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts
+++ b/configs/arm64/dts/inmate-zynqmp-zcu102-2.dts
@@ -74,10 +74,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 112 0>,
- <0 0 0 2 &gic GIC_SPI 113 0>,
- <0 0 0 3 &gic GIC_SPI 114 0>,
- <0 0 0 4 &gic GIC_SPI 115 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 112 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 113 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 114 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 115 IRQ_TYPE_EDGE_RISING>;
reg = <0x0 0xfc000000 0x0 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
diff --git a/configs/arm64/dts/inmate-zynqmp-zcu102.dts b/configs/arm64/dts/inmate-zynqmp-zcu102.dts
index f0819d49b..0e6dc1222 100644
--- a/configs/arm64/dts/inmate-zynqmp-zcu102.dts
+++ b/configs/arm64/dts/inmate-zynqmp-zcu102.dts
@@ -95,10 +95,10 @@
#size-cells = <2>;
#interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 7>;
- interrupt-map = <0 0 0 1 &gic GIC_SPI 108 0>,
- <0 0 0 2 &gic GIC_SPI 109 0>,
- <0 0 0 3 &gic GIC_SPI 110 0>,
- <0 0 0 4 &gic GIC_SPI 111 0>;
+ interrupt-map = <0 0 0 1 &gic GIC_SPI 108 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 2 &gic GIC_SPI 109 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 3 &gic GIC_SPI 110 IRQ_TYPE_EDGE_RISING>,
+ <0 0 0 4 &gic GIC_SPI 111 IRQ_TYPE_EDGE_RISING>;
reg = <0x0 0xfc000000 0x0 0x100000>;
ranges =
<0x02000000 0x00 0x10000000 0x0 0x10000000 0x00 0x10000>;
--
2.13.6

Jan Kiszka

unread,
May 18, 2018, 5:48:15 AM5/18/18
to Jailhouse
On 2018-05-18 08:40, Jan Kiszka wrote:
> We already do this for the overlay fragment the driver injects and the
> Seattle dts. For the latter, use that chance to install the symbolic
> value.
>
> The background is that newer Linux kernel dislike IRQ_TYPE_NONE and
> express that via WARN_ON during boot.
>
> Signed-off-by: Jan Kiszka <jan.k...@siemens.com>
> ---
> configs/arm/dts/inmate-bananapi.dts | 8 ++++----
> configs/arm/dts/inmate-jetson-tk1.dts | 8 ++++----
> configs/arm/dts/inmate-orangepi0.dts | 8 ++++----
> configs/arm/jetson-tk1.c | 2 +-
> configs/arm64/dts/inmate-amd-seattle.dts | 10 ++++++----
> configs/arm64/dts/inmate-espressobin.dts | 8 ++++----
> configs/arm64/dts/inmate-hikey.dts | 8 ++++----
> configs/arm64/dts/inmate-jetson-tx1.dts | 8 ++++----
> configs/arm64/dts/inmate-qemu-arm64.dts | 8 ++++----
> configs/arm64/dts/inmate-zynqmp-zcu102-2.dts | 8 ++++----
> configs/arm64/dts/inmate-zynqmp-zcu102.dts | 8 ++++----
> 11 files changed, 43 insertions(+), 41 deletions(-)
>

..

> diff --git a/configs/arm/jetson-tk1.c b/configs/arm/jetson-tk1.c
> index cc781ea8e..a46fee229 100644
> --- a/configs/arm/jetson-tk1.c
> +++ b/configs/arm/jetson-tk1.c
> @@ -49,7 +49,7 @@ struct {
> .pci_mmconfig_base = 0x48000000,
> .pci_mmconfig_end_bus = 0,
> .pci_is_virtual = 1,
> - .pci_domain = -1,
> + .pci_domain = 1,

This hunk sneaked in prematurely but was removed now in next again.

Jan

--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
Reply all
Reply to author
Forward
0 new messages