From owner-svn-src-all@freebsd.org Wed Sep 30 17:09:18 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7257F42C70F; Wed, 30 Sep 2020 17:09:18 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C1jR22S9Bz4WwR; Wed, 30 Sep 2020 17:09:18 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 378D823096; Wed, 30 Sep 2020 17:09:18 +0000 (UTC) (envelope-from manu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08UH9ISl051009; Wed, 30 Sep 2020 17:09:18 GMT (envelope-from manu@FreeBSD.org) Received: (from manu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08UH9Im6051008; Wed, 30 Sep 2020 17:09:18 GMT (envelope-from manu@FreeBSD.org) Message-Id: <202009301709.08UH9Im6051008@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: manu set sender to manu@FreeBSD.org using -f From: Emmanuel Vadot Date: Wed, 30 Sep 2020 17:09:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366294 - head/sys/dev/acpica X-SVN-Group: head X-SVN-Commit-Author: manu X-SVN-Commit-Paths: head/sys/dev/acpica X-SVN-Commit-Revision: 366294 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Sep 2020 17:09:18 -0000 Author: manu Date: Wed Sep 30 17:09:17 2020 New Revision: 366294 URL: https://svnweb.freebsd.org/changeset/base/366294 Log: 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 Modified: head/sys/dev/acpica/acpi_resource.c Modified: head/sys/dev/acpica/acpi_resource.c ============================================================================== --- head/sys/dev/acpica/acpi_resource.c Wed Sep 30 17:08:34 2020 (r366293) +++ head/sys/dev/acpica/acpi_resource.c Wed Sep 30 17:09:17 2020 (r366294) @@ -643,17 +643,13 @@ acpi_res_set_irq(device_t dev, void *context, uint8_t 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, uint 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