From nobody Wed Nov 11 16:49:19 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4jPqHN1znsz70SYs for ; Wed, 11 Nov 2026 16:49:20 +0000 (UTC) (envelope-from git@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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jPqHM71Lwz4m6B for ; Wed, 11 Nov 2026 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msea8lmQIRk5pRH85uuVBVhzt8HPP147kM9BPmiNOiU=; b=VcYWLxBPwQhbUrXaUqHjFRyEbcN/NTuDMf+/cGEn/B7JIXK0u07oIcalidoLT9Y7OZVIDD SJobRtoc35gf+74M9zS4/5kmolm29eB3Bm7M/oTVbhW2ioiB3EO+4uh6dft7EOalM0uMEk 0ab5M6t2RtxDSiEKeoie4zCWu2jREbp2cK1CvdzmK+ZbSxHILS5TH8GTILFMSbs8ZQ2Hyb iCnxUhdLc4hW+0oiVfkIBtkFaec5uNHfFYFHUv1z8baRxO6bSt0ZmhjMNGnLKGn3skffQk TSaXqsEpym6WU0FLbBTelTEGtbcTYQQKh/CYSXECKdWfT/G2EsPTwAM9X4HnDA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415760; b=aqgfRMYrLJ3NT7MGa1VObMdcA++QXwUqLYCvNJEU8z9/Q1uXhxThholWFfbswrJNNpm2aX Vj1hVQWM+dAowETGMaqVJwJtBVH2IDbt33e21bogkK5W5sIYQ3lDFvZ3BuMKrWQz2Eqb01 ySohEVFXLucFrM+zIunpqeEm7DxMHSeJpsenrioyF6/2/WiOvd7So8a81pgQau+OB9AGGx C1OZhA5HAOILKqGcvVFrHf41ODS0YvzBgJE/fn9W/bQ/jGONMcQX7fFpTfRZI/8MiBy9Wy Icv5Fhy2m+yDgL4A5TeUDpuKxqe0swGg+WfQu/I8vKwGwIztQ554IkeSwKZAbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415760; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=msea8lmQIRk5pRH85uuVBVhzt8HPP147kM9BPmiNOiU=; b=SDl0S2tVznmwICG4050VTQac5tCCkknF0/UCo81PyJGau4Z2Sn+Y0IU0oqGlZ6tHgRxQtF 4eFOqwt6o55t2ori0RoBW7q9rwJ3Carx29PRKw6DYaWCItoOgpKDAcQBKte9fIBBU9J3pl Xbj7x6M4TkDGo5YgGcKW4SbFZ1Wzx9cUcijJXK1zqKxHvxslnV6HuriA0PMG+e+u2kjSo9 sAGKgf2VfqVEID6cUkzBENN+a4zyEm3kS/9PwAcpVggdJ0PS0F1vAAi3zZezmy08IA1I9/ OTGrRjO3WfK5QI2sPDoSZPXGjcAMqr8NvME9nWwxNePicIev7TEcOmr0qm10ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jPqHM6h5PzMh7 for ; Wed, 11 Nov 2026 16:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1b8e4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:19 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Cc: Kajetan Puchalski From: Andrew Turner Subject: git: d4085297f4b5 - main - arm64/gicv3: Expose the ACPI maintenance interrupt List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4085297f4b5bcfed856ec059c6403796cc2fc9f Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:19 +0000 Message-Id: <6af49c8f.1b8e4.1496a3da@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d4085297f4b5bcfed856ec059c6403796cc2fc9f commit d4085297f4b5bcfed856ec059c6403796cc2fc9f Author: Kajetan Puchalski AuthorDate: 2026-11-02 16:44:10 +0000 Commit: Andrew Turner CommitDate: 2026-11-11 16:32:52 +0000 arm64/gicv3: Expose the ACPI maintenance interrupt The ACPI entry describing the maintenance interrupt INTID is already available as "VgicInterrupt", but it is not exposed to the GIC driver. Check that the value is valid and consistent between CPUs, then publish it for the GIC driver to use under rid 0 if so. Print a warning if the maintenance interrupt is configured to be edge-sensitive in ACPI, as the GIC spec explicitly states "maintenance interrupts are level-sensitive". Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2527 --- sys/arm64/arm64/gic_v3_acpi.c | 51 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/gic_v3_acpi.c b/sys/arm64/arm64/gic_v3_acpi.c index 9fbd5e02043b..02084db0575d 100644 --- a/sys/arm64/arm64/gic_v3_acpi.c +++ b/sys/arm64/arm64/gic_v3_acpi.c @@ -89,12 +89,15 @@ struct madt_table_data { int count; bool rdist_use_gicc; bool have_vgic; + u_int maint_irq; + bool maint_irq_valid; }; static void madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) { struct madt_table_data *madt_data; + ACPI_MADT_GENERIC_INTERRUPT *gicc; madt_data = (struct madt_table_data *)arg; @@ -112,6 +115,30 @@ madt_handler(ACPI_SUBTABLE_HEADER *entry, void *arg) case ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR: break; + case ACPI_MADT_TYPE_GENERIC_INTERRUPT: + gicc = (ACPI_MADT_GENERIC_INTERRUPT *)entry; + if (!(gicc->Flags & + (ACPI_MADT_ENABLED | ACPI_MADT_GICC_ONLINE_CAPABLE))) + break; + + if (gicc->Flags & ACPI_MADT_VGIC_IRQ_MODE) + device_printf(madt_data->parent, + "gic: Maintenance interrupt configured as edge-triggered, ignoring\n"); + + /* Require the maintenance IRQ to be an ordinary PPI */ + if (gicc->VgicInterrupt < GIC_FIRST_PPI || + gicc->VgicInterrupt > GIC_LAST_PPI) { + madt_data->maint_irq_valid = false; + break; + } + + if (madt_data->maint_irq == 0) + madt_data->maint_irq = gicc->VgicInterrupt; + /* Require consistency between CPUs */ + else if (madt_data->maint_irq != gicc->VgicInterrupt) + madt_data->maint_irq_valid = false; + break; + default: break; } @@ -171,6 +198,7 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent) vm_paddr_t physaddr; uintptr_t private; device_t dev; + int error; physaddr = acpi_find_table(ACPI_SIG_MADT); if (physaddr == 0) @@ -182,9 +210,9 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent) return; } + memset(&madt_data, 0, sizeof(madt_data)); madt_data.parent = parent; - madt_data.dist = NULL; - madt_data.count = 0; + madt_data.maint_irq_valid = true; acpi_walk_subtables(madt + 1, (char *)madt + madt->Header.Length, madt_handler, &madt_data); @@ -230,10 +258,25 @@ gic_v3_acpi_identify(driver_t *driver, device_t parent) } private = madt_data.dist->Version; - /* Flag that the VGIC is in use */ - if (madt_data.have_vgic) + if (madt_data.have_vgic) { + /* Flag that the VGIC is in use */ private |= GICV3_PRIV_VGIC; + if (madt_data.maint_irq_valid && madt_data.maint_irq != 0) { + error = BUS_SET_RESOURCE(parent, dev, SYS_RES_IRQ, 0, + madt_data.maint_irq, 1); + + if (error) { + device_printf(dev, + "Could not add maintenance IRQ resource: %d\n", + error); + } + } else { + device_printf(dev, + "No consistent maintenance PPI in MADT\n"); + } + } + acpi_set_private(dev, (void *)private); out: