From a52c8a65026df8910b0ad58c79ae8eb1eb166a8f Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Wed, 30 Sep 2020 17:09:17 +0000 Subject: [PATCH] acpi_resource: support multiple IRQs Some DSDT entries have multiple interrupts for one device. Add support for it. This fixes ahci on NXP LS2160 and genet on RPi4 Submitted by: Greg V Reviewed by: jhb MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D25145 --- sys/dev/acpica/acpi_resource.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/sys/dev/acpica/acpi_resource.c b/sys/dev/acpica/acpi_resource.c index 79ee745e959..fbd0baaa7d3 100644 --- a/sys/dev/acpica/acpi_resource.c +++ b/sys/dev/acpica/acpi_resource.c @@ -643,17 +643,13 @@ acpi_res_set_irq(device_t dev, void *context, uint8_t *irq, int count, int trig, int pol) { struct acpi_res_context *cp = (struct acpi_res_context *)context; - rman_res_t intr; + int i; if (cp == NULL || irq == NULL) return; - /* This implements no resource relocation. */ - if (count != 1) - return; - - intr = *irq; - bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, intr, 1); + for (i = 0; i < count; i++) + bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, irq[i], 1); } static void @@ -661,17 +657,13 @@ acpi_res_set_ext_irq(device_t dev, void *context, uint32_t *irq, int count, int trig, int pol) { struct acpi_res_context *cp = (struct acpi_res_context *)context; - rman_res_t intr; + int i; if (cp == NULL || irq == NULL) return; - /* This implements no resource relocation. */ - if (count != 1) - return; - - intr = *irq; - bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, intr, 1); + for (i = 0; i < count; i++) + bus_set_resource(dev, SYS_RES_IRQ, cp->ar_nirq++, irq[i], 1); } static void