From nobody Tue Jun 23 16:28:08 2026 X-Original-To: dev-commits-src-branches@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 4gl9V05kpSz6hhbl for ; Tue, 23 Jun 2026 16:28:08 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gl9V02KwJz3Mch for ; Tue, 23 Jun 2026 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782232088; 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=0CpAYbmbdrRC8v4/L7KHrhZZzYmMOh7uk4bZIa4ci64=; b=q4UMZy35d5PXEQPOFyCU4D8YE9yIz/OQZCbGZ8LGrC+HpSH0oL4ZIR3QudaybMGa7QCazM pyXacvBAGGgY9bS0OWey3+aR9FGClZ72Sx5lOjRPVpD9M1nblgIoDYsAQ5x3zcIX3xH1MF vWGTZqe1afIhUGHFsp22iAFw5WHqV3Fz3wyO0Y7kScgpIFizdz7qytliWVN56VhisF4gb0 H0JYGfCJBReIXbiEq3LdiW5KiW52QMWFzuaw5/ZWMLymqRUiykBb55Z0YHuFZZX+LsHjJQ BVye70t7s/Tm/Chk1swjLRmzb6d91ySvQuHRuGVEQjLuORZK6bCZUrQh9GoUrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782232088; a=rsa-sha256; cv=none; b=lshqFgW6USCJnwz4hQJ1bt7tiTThoP7vWP3Y4XPa/ii4MNOpYzmKaH90bJRaKqv81+i0LP IJqt+66Ld3sZaMj0SzmJwPlMpqBLTqLOZanDBIcrmbzuT5TaSok2y2ZPNthc4soZBBd0py q1gr483zyx/9qdqKBRJs5yyDmiupRFIHxeO3xi+meSvKcsnSaw5HcoPKifHfMR+9jq0vTw 1lKAkFoY4li8z/B3gFfOiVHi8q2YWkO+gUDYAiZ8QFI78bDVyMhn8OiwaIjP9br0+NmZUg Zc/IIdR3UvsCCYB5DzRdhzKr1v2bCMbs0VGH2D6/C89ModRgz66VHK8XbQ50sQ== 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=1782232088; 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=0CpAYbmbdrRC8v4/L7KHrhZZzYmMOh7uk4bZIa4ci64=; b=sUA/C4Z7sN2a8cf4BC8myVAw0yl/HCBNblJz3vSQBT6+iGVjJ5pca7xJhvdpIO1nTGqyUx YONefMXATvRPKkRVMrHTiw2HVQaTF5VN1QbJKm+M9idTDlsNCbrbSJRj7HW7LphQvfa9lF IJqmAC5ELl04TiUedC8MLrvC4oWyoWRxKcWs1HRVoxL8xL2smNviV8rhTTuxfsPdMdyIrG KNxFiVsdP5lJMzjyQeMt07fOewDqFYSt6vccrSAPiuoB2A4PwFU3MaE6oW9t0N46ola9F5 MBMzRQdIEubPpEV3lvrrsL/c/+QxuMOCPKUJIClrpHw4mV46yj4F8YnbR6HNCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gl9V01FF7zhrR for ; Tue, 23 Jun 2026 16:28:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26ccb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 23 Jun 2026 16:28:08 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: a067a7170b84 - stable/15 - bus: Add __BUS_ACCESSOR_DEFAULT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a067a7170b84320211ef834cb11bc77541933fbf Auto-Submitted: auto-generated Date: Tue, 23 Jun 2026 16:28:08 +0000 Message-Id: <6a3ab418.26ccb.15e3c4e1@gitrepo.freebsd.org> The branch stable/15 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=a067a7170b84320211ef834cb11bc77541933fbf commit a067a7170b84320211ef834cb11bc77541933fbf Author: John Baldwin AuthorDate: 2026-02-24 20:29:40 +0000 Commit: John Baldwin CommitDate: 2026-06-23 16:00:59 +0000 bus: Add __BUS_ACCESSOR_DEFAULT This macro is similar to __BUS_ACCESSOR in that it creates three helper routines for an ivar, but the "get" wrapper returns a default value if BUS_READ_IVAR does not return a value. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D55353 (cherry picked from commit b937f9bf750907602606691dd92fb6d70e9f88da) --- sys/sys/bus.h | 40 +++++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/sys/sys/bus.h b/sys/sys/bus.h index f1b4e0a7c55c..b679bef30e92 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -944,7 +944,7 @@ DECLARE_MODULE(_name##_##busname, _name##_##busname##_mod, \ /** * Generic ivar accessor generation macros for bus drivers */ -#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ +#define __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ static __inline bool \ varp ## _has_ ## var(device_t dev) \ @@ -957,29 +957,47 @@ varp ## _has_ ## var(device_t dev) \ return (e == 0); \ } \ \ +static __inline void \ +varp ## _set_ ## var(device_t dev, type t) \ +{ \ + uintptr_t v = (uintptr_t) t; \ + int e __diagused; \ + e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, v); \ + KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ + __func__, device_get_nameunit(dev), \ + device_get_nameunit(device_get_parent(dev)), e)); \ +} + +#define __BUS_ACCESSOR(varp, var, ivarp, ivar, type) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ + \ static __inline type \ varp ## _get_ ## var(device_t dev) \ { \ uintptr_t v = 0; \ int e __diagused; \ + \ e = BUS_READ_IVAR(device_get_parent(dev), dev, \ ivarp ## _IVAR_ ## ivar, &v); \ KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ __func__, device_get_nameunit(dev), \ device_get_nameunit(device_get_parent(dev)), e)); \ return ((type) v); \ -} \ +} + +#define __BUS_ACCESSOR_DEFAULT(varp, var, ivarp, ivar, type, default) \ + __BUS_ACCESSOR_COMMON(varp, var, ivarp, ivar, type) \ \ -static __inline void \ -varp ## _set_ ## var(device_t dev, type t) \ +static __inline type \ +varp ## _get_ ## var(device_t dev) \ { \ - uintptr_t v = (uintptr_t) t; \ - int e __diagused; \ - e = BUS_WRITE_IVAR(device_get_parent(dev), dev, \ - ivarp ## _IVAR_ ## ivar, v); \ - KASSERT(e == 0, ("%s failed for %s on bus %s, error = %d", \ - __func__, device_get_nameunit(dev), \ - device_get_nameunit(device_get_parent(dev)), e)); \ + uintptr_t v = 0; \ + int e; \ + \ + e = BUS_READ_IVAR(device_get_parent(dev), dev, \ + ivarp ## _IVAR_ ## ivar, &v); \ + return (e == 0 ? (type) v : (default)); \ } struct device_location_cache;