From nobody Tue Feb 24 20:33:27 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 4fL8Yz5TLZz6SrV0 for ; Tue, 24 Feb 2026 20:33:27 +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 4fL8Yz4N3yz3qRP for ; Tue, 24 Feb 2026 20:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771965207; 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=+136S8HjmJy7VKSskPCY23TPBnI7Zoy0murx2qfMgNU=; b=pVqTlFx4m/lKF+InTd3VE94O6ptUuEaDRv0vWthGGFCXuhGflYzIIcDfStyRBQLxwjb4jr 3ERfQO/QAGq14j2IUZhQy67JhymSKyx7kJBUVF9OacwIndLqPy1Vrq8Vrr3fTz/UaHrXAM y2edUHXY18hiyBfGGoGRR+FIcsmfqGuABMRYSwvQNhMrh7zOZckVbj5OMi+Wq/tm5uixkM zyg+ILRKAvY2sMY8j+3A5vOEtqVZKp2qe/Rtlz++VsdVPy7HCanzZ7sv4x7wevNTfHrD6Y EoxArd2wkrJo4pHyi0I0E7mICibdOXvpZO2zZQ9YbjOr7xUXgOW30dTXqwQ4EQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771965207; a=rsa-sha256; cv=none; b=hzzil3BwINM1g52kKzl7ouxncPmvAu6hYx/+pZwyrWOaTYcjmuFZ2a4/TeoWc3QI5rJ7Ju Bguif3SvgUWyOSoOFB3+G/AyF6IeGKClUnktBld/o7UXOxDRxzWjFcUO1qi+qtX6u2+onu qimPh1rPWnCuBgBOgFaWKfg3B8JRYdVE3DHsLi0TzRrqV6gq7rQgCFgrvdYuw7kKSduxOO PK6qJmKTVPH2pXvzMylMckElfyLwzUJ4x10apM59wGpsFJe9WUgB0ZJwC6N1hc499EfKZe puQUOA2KPuyKqcrueIDr5Gf9NK9NORhPG0ig0MSjGS0vM/HI2VIOlzPZq2LXuA== 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=1771965207; 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=+136S8HjmJy7VKSskPCY23TPBnI7Zoy0murx2qfMgNU=; b=wuE1c60DgkwcYLMJWsLge7Qj0PGm09EkC//vwZYGEWTdH3biqRub1B3Pxj1/YmvxxRnvyI eouuP7W3oSpAvxNXIRjfF5bjQMHpytdBnSyr7sF728E1/Plmk3WqirTpQMj29k6zng17fl tdK5yb1AEaQBFQSDwA+lrU7zxdA5G/oqkEL9iXC+RK5n0T+tWu7hN2m5HCRlUVxq8NSDf5 bFpXpT8xG60J8NlYyl8c6du4NLZd54tDCl5e12A7x5ejQvik2qJlUatDai87AS2uBJzU/l owYnQZNC130dDcWwvKzVoAv0JZUxiWwsQxa5JwKzt4xjuYkztJ6/UzhAc0ShDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fL8Yz3z9gzWpG for ; Tue, 24 Feb 2026 20:33:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22878 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 24 Feb 2026 20:33:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: b937f9bf7509 - main - bus: Add __BUS_ACCESSOR_DEFAULT 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: b937f9bf750907602606691dd92fb6d70e9f88da Auto-Submitted: auto-generated Date: Tue, 24 Feb 2026 20:33:27 +0000 Message-Id: <699e0b17.22878.7d05cc3d@gitrepo.freebsd.org> The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=b937f9bf750907602606691dd92fb6d70e9f88da commit b937f9bf750907602606691dd92fb6d70e9f88da Author: John Baldwin AuthorDate: 2026-02-24 20:29:40 +0000 Commit: John Baldwin CommitDate: 2026-02-24 20:29:40 +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 --- 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 0d1baaafb4cd..a2e315bb9dee 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -943,7 +943,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) \ @@ -956,29 +956,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;