From nobody Tue Feb 24 20:33:28 2026 X-Original-To: dev-commits-src-main@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 4fL8Z11Tfwz6SrPm for ; Tue, 24 Feb 2026 20:33:29 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fL8Z052DHz3qkB for ; Tue, 24 Feb 2026 20:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Q2ZbYVOw7tK3fZP09d5cyuFTb1S397dak49XxNqJSE=; b=TTkNlUdkqA74/5OwC/rLO01HVGGHKn7UmLfhjjYHIBJLntQHK8FASA/rpGRBoGnOFkEae6 kkcPvOA6h+w1/ObdAWU1nXcwWkrDTffmmBRIyzW/nQSZYzvgKswQyvYDq4ve3Jmdd4PfMN a62jpPMotqafHEmTuk+uaKseDof4gS7vEdUtx+/PKFhzZPi7Tyb0XLES50n0YH9f3wQQum ait+CY1pg7fBd4dniV7mkVWjqBPb9NpYtdbuojp+l2TEQ+j5S7qsMpo+6KtGspBAJsfMgs LMKP3CidzjLCBUqk4P4q8vVqGfYM+zU1dnEdbdeLWXCxZmmqKMTraBL1+YW1nw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965208; a=rsa-sha256; cv=none; b=YGcPU3oCUsH5isN+e8DOOwAb5PCyXsE+BV1q3FMJt1hIoAmXVU8TRudJLzUJ10yqlWk9hI tlaLPJlw0trFMGQ2ckeVwD4PCo94qccf9St5QDkBgzle2bdQPkjJHfrUcDYpTGgSAqkbQs L9XbbS18UQ0uldsTu/zcXxx7mR5/q9QF1d2hdVtg2fH6MR7g3u4Fz9wiIDKtbq0c709Q7x b4VBj7779fFlJgSllI4QkAgopthgwXBDCmRVx9DeEzZSbYPW5PCKnGrbQswIo9GdI7Nlyb qQxULgr+byKWDKlnlq+XoqK26IyFdgYd1JLnXrh8CZ0M2M81o0p+4/joGDQnKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6Q2ZbYVOw7tK3fZP09d5cyuFTb1S397dak49XxNqJSE=; b=H8VR9khgDJ5h2Bh5M2UPVo/rPuJGU7pxXuw9PuNAyA8ZFEiLG7kzSLGqockka9hGtG8qSr POHHd1/DB3wUJvp7wOY5v3BOTVQcTJOn+n0YgjyUy4nHrHC+sRbZnZU9W4Xv2vSXnV24hK R2mfUApEfFCEiXdAWXVUZKvCcz2mFxx4sfDAVSLpbWo4jUy8gAxIYPX2DuldiWFSZ/BOHa R2acxIFOLNBB+6Gc0tDgiI2wQxqQByDGP3GHHfOjtjIwztpxdkJteJg/wiZcYdgx/sBJti c5S72XjMFtG5JSt3AFmeY4X3aMYQa/3e/KLSSGXvuRQqkDfnAS/IgCNpu9Z75g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Z04M7bzXMC for ; Tue, 24 Feb 2026 20:33:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22961 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 0bb867e9f565 - main - acpi: Split ACPI IVARs into global and private sets List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0bb867e9f56500e30948ea7c440dd1166097df7f Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:28 +0000 Message-Id: <699e0b18.22961.3b3524d9@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb867e9f56500e30948ea7c440dd1166097df7f commit 0bb867e9f56500e30948ea7c440dd1166097df7f Author: John Baldwin AuthorDate: 2026-02-24 20:30:06 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:30:06 +0000 acpi: Split ACPI IVARs into global and private sets ACPI_IVAR_HANDLE is the only true "global" IVAR that can be used across multiple bus drivers. The other IVARs are private to direct children of acpi0. However, they need to be numbered after ISA IVARs as ACPI mimics an ISA bus device. To ensure this remains true, add an ISA_IVAR_LAST to use in assert that the private ACPI IVARs do not overlap with ISA IVARs. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55354 --- sys/dev/acpica/acpi.c | 3 +++ sys/dev/acpica/acpivar.h | 6 +++--- sys/isa/isavar.h | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c index f903f265f9fa..3a664523c27e 100644 --- a/sys/dev/acpica/acpi.c +++ b/sys/dev/acpica/acpi.c @@ -1154,6 +1154,9 @@ acpi_child_deleted(device_t dev, device_t child) free(dinfo, M_ACPIDEV); } +_Static_assert(ACPI_IVAR_PRIVATE >= ISA_IVAR_LAST, + "ACPI private IVARs overlap with ISA IVARs"); + /* * Handle per-device ivars */ diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h index d1d55d2b7e5f..336f6ed1dc94 100644 --- a/sys/dev/acpica/acpivar.h +++ b/sys/dev/acpica/acpivar.h @@ -278,10 +278,10 @@ extern int acpi_override_isa_irq_polarity; * attach to ACPI. */ enum { - ACPI_IVAR_HANDLE = BUS_IVARS_ACPI, - ACPI_IVAR_PRIVATE, + ACPI_IVAR_PRIVATE = 20, ACPI_IVAR_FLAGS, - ACPI_IVAR_DOMAIN + ACPI_IVAR_DOMAIN, + ACPI_IVAR_HANDLE = BUS_IVARS_ACPI }; /* diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h index f0b880de2930..39eb7c2bc76c 100644 --- a/sys/isa/isavar.h +++ b/sys/isa/isavar.h @@ -128,7 +128,8 @@ enum isa_device_ivars { ISA_IVAR_CONFIGATTR, ISA_IVAR_PNP_CSN, ISA_IVAR_PNP_LDN, - ISA_IVAR_PNPBIOS_HANDLE + ISA_IVAR_PNPBIOS_HANDLE, + ISA_IVAR_LAST }; /*