From 7e82dccf6cbcaf5c1b880acc7a0b16576f4b6f58 Mon Sep 17 00:00:00 2001 From: Hannu Lyytinen Date: Wed, 1 Nov 2023 09:04:32 +0200 Subject: [PATCH] irq 3/3: Support seL4 accelerator changes Signed-off-by: Hannu Lyytinen --- hw/arm/virt.c | 4 ++-- hw/pci-host/gpex.c | 2 +- include/hw/pci-host/gpex.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 653fd0ae0d4..2bfc925fa4c 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -109,7 +109,7 @@ /* Number of external interrupt lines to configure the GIC with */ -#define NUM_IRQS 256 +#define NUM_IRQS 512 #define PLATFORM_BUS_NUM_IRQS 64 @@ -186,7 +186,7 @@ static MemMapEntry extended_memmap[] = { static const int a15irqmap[] = { [VIRT_UART] = 1, [VIRT_RTC] = 2, - [VIRT_PCIE] = 3, /* ... to 6 */ + [VIRT_PCIE] = 176, /* ... to 6 */ [VIRT_GPIO] = 7, [VIRT_SECURE_UART] = 8, [VIRT_ACPI_GED] = 9, diff --git a/hw/pci-host/gpex.c b/hw/pci-host/gpex.c index 2a93e583d20..d8f63277f31 100644 --- a/hw/pci-host/gpex.c +++ b/hw/pci-host/gpex.c @@ -151,7 +151,7 @@ static void gpex_host_realize(DeviceState *dev, Error **errp) pci->bus = pci_register_root_bus(dev, "pcie.0", gpex_set_irq, sel4_pci_swizzle_map_irq_fn, s, &s->io_mmio, - &s->io_ioport, 0, 4, TYPE_PCIE_BUS); + &s->io_ioport, 0, GPEX_NUM_IRQS, TYPE_PCIE_BUS); pci_bus_set_route_irq_fn(pci->bus, gpex_route_intx_pin_to_irq); qdev_realize(DEVICE(&s->gpex_root), BUS(pci->bus), &error_fatal); diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index fcf8b638200..700de4d9759 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -32,7 +32,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(GPEXHost, GPEX_HOST) #define TYPE_GPEX_ROOT_DEVICE "gpex-root" OBJECT_DECLARE_SIMPLE_TYPE(GPEXRootState, GPEX_ROOT_DEVICE) -#define GPEX_NUM_IRQS 4 +#define GPEX_NUM_IRQS (32*4) struct GPEXRootState { /*< private >*/