From nobody Wed Nov 11 16:49:20 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 4jPqHP1GSgz70SN1 for ; Wed, 11 Nov 2026 16:49:21 +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 4jPqHP0FNrz4lxw for ; Wed, 11 Nov 2026 16:49:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415761; 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=cwED2DGcQzCMRCGRqDM9pnQZWrInszKsHvZ8sDcxlE4=; b=yYZnl7/dbHQ3JdMXBUdmALk4d7aV8RWZR7b5ob6Mz5T7x4tnngip4wW3Cv7WvNAe/ovdN9 sz6dfCWYJGneqjGQsWii0YT5ALYynhSqTtW70VD1qn09+VA5MDmI1LEipyEo/kX2ZnukJg /YXTU5MxCXoc7eV5O+PK/QIXEl5K0AS2EgGh7idjVl7pwmuxJU5dM0LNRkm7ZnmO9Si1El 4u+baUYAuNZUgP+FaPRkZvRWHjwZWoKP9UMkSppZXwvwkXo6NYrpmgkURMHv+qojnpI53t SDch5tAFSwJxV+lLdiaslSZb4de21eKL/2/SELiWSq6VCLy8Vl+W+EZUjfAFbw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794415761; b=OqDKqZ0aTs9vnFiLmjLV9RYlotn60YyTgIruKHsOJtO2iJ0rg35d0wLdblKETs9yQnc4fC 8coCMjr2JTpphGLhqmKMT3larammD9W7mzf2P+zLa/5xwzfTGy2LNiYaWTMabdcqnGVrKI iZA0xHRPDyZNgJP4WSOOyJNKkCMnvXhXtfuqOlMwTcDHk4pO/9kGPXS2Ed+cacdVowYDkL MZw18IdNAuWst76Tka6jU0c5SlcMdNMvDUn3XT4hsoZtHESOXmRh0JEHzYzBvQoQI2mqm3 /MptC1w9j98H8nLOjlei5OwlHfYCNKND1JouxOPvQXua29SAJHO/oKpvPuLzqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794415761; 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=cwED2DGcQzCMRCGRqDM9pnQZWrInszKsHvZ8sDcxlE4=; b=q+BwjX2S6Pd6jicQuo9jd82yEn18UVj216oAySDEdNwORQtvBwH7PyvEJ23ocEqhV3qAET myZlgCMyYO79tdCmBkAxviLfVTIKBaULM2LSftHGfTGTdNFeEAHGq4uKY+5umyQhXRyRIQ WazYRR5l8iy4M9+qbiSMHfXA3FWlp42/r2FotdmKckmYmBzQ8gWi72QGu3qilQlpkH3xpx 9/XrQuqiVWmz9nDZHOqJqdqzRvJz4g/IcWF8FYQQ9BfesBTSbWI3OByjDFphYjEmfPXsvK FxQezPdzaAepC7HnbnyTOnY0Q23EQ9gkI0PSnHqEgtaJ2+vxtMcPPu3II4Qe1g== 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 4jPqHN71SPzMSP for ; Wed, 11 Nov 2026 16:49:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1bbd4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 11 Nov 2026 16:49:20 +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: 6b4a47805731 - main - arm64/vmm: vgic_v3: Register the 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: 6b4a478057315e8b61935e062fd730298c559467 Auto-Submitted: auto-generated Date: Wed, 11 Nov 2026 16:49:20 +0000 Message-Id: <6af49c90.1bbd4.27a92780@gitrepo.freebsd.org> The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=6b4a478057315e8b61935e062fd730298c559467 commit 6b4a478057315e8b61935e062fd730298c559467 Author: Kajetan Puchalski AuthorDate: 2026-11-02 16:53:56 +0000 Commit: Andrew Turner CommitDate: 2026-11-11 16:32:53 +0000 arm64/vmm: vgic_v3: Register the maintenance interrupt If one is available, register the maintenance IRQ so that vmm can receive and process guest exits when the maintenance IRQ is asserted. Since vmm and vgic can still operate without it, print a warning but attach the vgic regardless if the maintenance IRQ cannot be registered. Signed-off-by: Kajetan Puchalski Reviewed by: andrew Sponsored by: Arm Ltd Pull Request: https://github.com/freebsd/freebsd-src/pull/2530 --- sys/arm64/vmm/io/vgic_v3.c | 96 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 2 deletions(-) diff --git a/sys/arm64/vmm/io/vgic_v3.c b/sys/arm64/vmm/io/vgic_v3.c index 517bf6290f89..22352beec87b 100644 --- a/sys/arm64/vmm/io/vgic_v3.c +++ b/sys/arm64/vmm/io/vgic_v3.c @@ -2136,6 +2136,13 @@ vgic_v3_init(device_t dev) virt_features.ich_lr_num = ICH_VTR_EL2_LISTREGS(ich_vtr_el2); } +struct vgic_v3_softc { + device_t gic_dev; + struct resource *maint_irq; + void *maint_cookie; + int maint_rid; +}; + static int vgic_v3_probe(device_t dev) { @@ -2150,9 +2157,82 @@ vgic_v3_probe(device_t dev) return (BUS_PROBE_DEFAULT); } +static int +vgic_v3_release_maint_irq(struct vgic_v3_softc *sc) +{ + int error; + + if (sc->maint_cookie != NULL) { + error = bus_teardown_intr(sc->gic_dev, sc->maint_irq, + sc->maint_cookie); + if (error != 0) + return (error); + + sc->maint_cookie = NULL; + } + + if (sc->maint_irq != NULL) { + error = bus_release_resource(sc->gic_dev, SYS_RES_IRQ, + sc->maint_rid, sc->maint_irq); + if (error != 0) + return (error); + + sc->maint_irq = NULL; + } + + return (0); +} + +static int +vgic_v3_maint_filter(void *arg) +{ + return (FILTER_HANDLED); +} + static int vgic_v3_attach(device_t dev) { + struct vgic_v3_softc *sc; + rman_res_t irq_map, count; + int error, cleanup_error; + + sc = device_get_softc(dev); + sc->gic_dev = device_get_parent(dev); + sc->maint_rid = 0; + + error = bus_get_resource(sc->gic_dev, SYS_RES_IRQ, sc->maint_rid, + &irq_map, &count); + + if (error) + goto fail; + + if (count != 1) { + error = EINVAL; + goto fail; + } + + sc->maint_irq = bus_alloc_resource_any(sc->gic_dev, SYS_RES_IRQ, + &sc->maint_rid, RF_ACTIVE); + if (sc->maint_irq == NULL) { + error = ENXIO; + goto fail; + } + + error = bus_setup_intr(sc->gic_dev, sc->maint_irq, + INTR_TYPE_MISC | INTR_MPSAFE, vgic_v3_maint_filter, NULL, sc, + &sc->maint_cookie); + if (error) { + sc->maint_cookie = NULL; + goto fail; + } + + goto out; +fail: + device_printf(dev, "Maintenance IRQ setup failed (%d)\n", error); + cleanup_error = vgic_v3_release_maint_irq(sc); + if (cleanup_error) + device_printf(dev, "IRQ cleanup failed: %d\n", cleanup_error); +out: vgic_dev = dev; return (0); } @@ -2160,7 +2240,18 @@ vgic_v3_attach(device_t dev) static int vgic_v3_detach(device_t dev) { - vgic_dev = NULL; + struct vgic_v3_softc *sc; + int error; + + sc = device_get_softc(dev); + + error = vgic_v3_release_maint_irq(sc); + if (error) + return (error); + + if (vgic_dev == dev) + vgic_dev = NULL; + return (0); } @@ -2190,6 +2281,7 @@ static device_method_t vgic_v3_methods[] = { }; /* TODO: Create a vgic base class? */ -DEFINE_CLASS_0(vgic, vgic_v3_driver, vgic_v3_methods, 0); +DEFINE_CLASS_0(vgic, vgic_v3_driver, vgic_v3_methods, + sizeof(struct vgic_v3_softc)); DRIVER_MODULE(vgic_v3, gic, vgic_v3_driver, 0, 0);