From nobody Thu Dec 18 20:48:07 2025 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 4dXN6H4Fxsz6LlK0 for ; Thu, 18 Dec 2025 20:48:07 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dXN6H35vnz3PPr for ; Thu, 18 Dec 2025 20:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766090887; 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=H0S7GZbhtSw6wTlxF1uTScva0AnRnXikFJWJ1TsoFE4=; b=dR4D5lESt3xNNvTNa7b2ObgyrEd5QcfrxAEPLPTvayYPkUuSZ51jOo0jYJTGVRvuRJ38Z1 3CjOJb7Fo/4CH823h5w/EShWVOM81W/qelFBuSPb8xMyqk0ptZg/kd/xh3EWTlLKFnWFRB 1IyRetXBDlWCJozfIua8JZw82MHeBQdkHN4kr7oEcjEsD/jwBscSdqOmqkMm0e//PvvkZC Ht2f2UlhWgJ+7GVpCUonT4Ce/2GqIaT9T2hRPcfeVLk7FGTKuBXCSWYzNWw9FGjybQFLRE TEVEr+qksV/tyexGCWvIMh8U/0tM79/N6LzSN6gLtVzASeJ2w6SLH1G34aU4Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1766090887; 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=H0S7GZbhtSw6wTlxF1uTScva0AnRnXikFJWJ1TsoFE4=; b=Zwmi7oEV3fsy+jI4JXnUYuK1Bh8GSVITlkylDKo/5Wx0dWangOPS1q15Oq8ZlnmAgnUbX/ yb5xRkJh1Lnop4rCZsOEZ3BdGik9Ja/herpq8cKrQbKw3GYCRa4w5Nm4hkzJkWBRtWMUxB aHQ53Ro8K3gpPQUTxLjxU5Vo9S9AaRX4KenxnmnWiRwqTK9Y2BZFB1VAQBOMEeNLNkPhvO Wtxj5aNF8eSoAnGnceE3uvkDW+DAQzwjKlyPjSTjMKoV/fbw9RBs1MABtV7gDXnPbhpYvu 4TLvLMyNffp/XCdLY16ze14y9zQVcxDsRZAsVlGdz2Pa0r2wYQS9Bi6V/BU+nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1766090887; a=rsa-sha256; cv=none; b=gp5iRS9+15ZetU05bc5NE8+1exOLOcxGJ4I8TLYRm6g5v92h9VWurCGJ73KCmYk99ZMnJ0 gysoKGVupwhYGEKbOkdXB26YEkaHiQvUD8G+L6BWeCaocjutMqad/nrWVLhXZUR7RsJLcl N6KVc36M8itrfFR8HpYxMr61Ekpj6N3xF6mS8MOa5ZocGGaamv42wTs6zy42Xu1YVqcagv MljirmLnaCCpWNw+tSSMILcefYe5+tShWs3TLYw+9KPwEIdgSjlec7oKIJKGErlFwt7Kjj CGza3FcPbJr5UPxa8ieKGjDGXNPrAv4klbj7B2HoRZhpYb5/g1763KSPOBX8nw== 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 4dXN6H2CPXzv7s for ; Thu, 18 Dec 2025 20:48:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3c0d5 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 18 Dec 2025 20:48:07 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 108b5d90bc1f - stable/14 - bus_alloc_resource: First step in passing resource IDs by value 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 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/14 X-Git-Reftype: branch X-Git-Commit: 108b5d90bc1fa8ed83cfd6f58e636193e03e8049 Auto-Submitted: auto-generated Date: Thu, 18 Dec 2025 20:48:07 +0000 Message-Id: <69446887.3c0d5.7d4cc482@gitrepo.freebsd.org> The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=108b5d90bc1fa8ed83cfd6f58e636193e03e8049 commit 108b5d90bc1fa8ed83cfd6f58e636193e03e8049 Author: John Baldwin AuthorDate: 2025-10-30 15:14:27 +0000 Commit: John Baldwin CommitDate: 2025-12-18 20:22:46 +0000 bus_alloc_resource: First step in passing resource IDs by value Add wrapper inline functions for bus_alloc_resource* that accept a resource ID by value (instead of a pointer). The rest of the bus resource API (outside of compat shims) does not accept resource IDs as arguments, but instead obtains the resource ID from the resource itself when needed. As such, there is no reason to return any potentially modified resource IDs to the caller. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D53401 (cherry picked from commit 7eb213614b90cde31707a53c4b8ae6acacf2aa0f) --- share/man/man9/bus_alloc_resource.9 | 24 +++++++-------------- sys/kern/subr_bus.c | 2 +- sys/sys/bus.h | 42 +++++++++++++++++++++++++++++++++++++ sys/sys/param.h | 2 +- 4 files changed, 51 insertions(+), 19 deletions(-) diff --git a/share/man/man9/bus_alloc_resource.9 b/share/man/man9/bus_alloc_resource.9 index 84a4c9c530c9..5d309229a34e 100644 --- a/share/man/man9/bus_alloc_resource.9 +++ b/share/man/man9/bus_alloc_resource.9 @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 20, 2016 +.Dd October 30, 2025 .Dt BUS_ALLOC_RESOURCE 9 .Os .Sh NAME @@ -43,14 +43,14 @@ .In machine/resource.h .Ft struct resource * .Fo bus_alloc_resource -.Fa "device_t dev" "int type" "int *rid" "rman_res_t start" "rman_res_t end" +.Fa "device_t dev" "int type" "int rid" "rman_res_t start" "rman_res_t end" .Fa "rman_res_t count" "u_int flags" .Fc .Ft struct resource * -.Fn bus_alloc_resource_any "device_t dev" "int type" "int *rid" "u_int flags" +.Fn bus_alloc_resource_any "device_t dev" "int type" "int rid" "u_int flags" .Ft struct resource * .Fo bus_alloc_resource_anywhere -.Fa "device_t dev" "int type" "int *rid" "rman_res_t count" "u_int flags" +.Fa "device_t dev" "int type" "int rid" "rman_res_t count" "u_int flags" .Fc .Sh DESCRIPTION This is an easy interface to the resource-management functions. @@ -106,15 +106,13 @@ for I/O memory .El .It .Fa rid -points to a bus specific handle that identifies the resource being allocated. +is a bus specific handle that identifies the resource being allocated. For ISA this is an index into an array of resources that have been setup for this device by either the PnP mechanism, or via the hints mechanism. For PCCARD, this is an index into the array of resources described by the PC Card's CIS entry. For PCI, the offset into PCI config space which has the BAR to use to access the resource. -The bus methods are free to change the RIDs that they are given as a parameter. -You must not depend on the value you gave it earlier. .It .Fa start and @@ -175,20 +173,12 @@ A pointer to is returned on success, a null pointer otherwise. .Sh EXAMPLES This is some example code that allocates a 32 byte I/O port range and an IRQ. -The values of -.Va portid -and -.Va irqid -should be saved in the softc of the device after these calls. .Bd -literal struct resource *portres, *irqres; - int portid, irqid; - portid = 0; - irqid = 0; - portres = bus_alloc_resource(dev, SYS_RES_IOPORT, &portid, + portres = bus_alloc_resource(dev, SYS_RES_IOPORT, 0, 0ul, ~0ul, 32, RF_ACTIVE); - irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, &irqid, + irqres = bus_alloc_resource_any(dev, SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE); .Ed .Sh SEE ALSO diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index ce7209e5f852..078ea7002013 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4676,7 +4676,7 @@ bus_release_resources(device_t dev, const struct resource_spec *rs, * parent of @p dev. */ struct resource * -bus_alloc_resource(device_t dev, int type, int *rid, rman_res_t start, +(bus_alloc_resource)(device_t dev, int type, int *rid, rman_res_t start, rman_res_t end, rman_res_t count, u_int flags) { struct resource *res; diff --git a/sys/sys/bus.h b/sys/sys/bus.h index a2189e068293..a9b22cd5d6cb 100644 --- a/sys/sys/bus.h +++ b/sys/sys/bus.h @@ -617,6 +617,48 @@ bus_alloc_resource_anywhere(device_t dev, int type, int *rid, return (bus_alloc_resource(dev, type, rid, 0, ~0, count, flags)); } +/* Compat shims for bus_alloc_resource API. */ +static __inline struct resource * +bus_alloc_resource_const(device_t dev, int type, int rid, rman_res_t start, + rman_res_t end, rman_res_t count, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, start, end, count, flags)); +} + +static __inline struct resource * +bus_alloc_resource_any_const(device_t dev, int type, int rid, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, 0, ~0, 1, flags)); +} + +static __inline struct resource * +bus_alloc_resource_anywhere_const(device_t dev, int type, int rid, + rman_res_t count, u_int flags) +{ + return (bus_alloc_resource(dev, type, &rid, 0, ~0, count, flags)); +} + +#define bus_alloc_resource(dev, type, rid, start, end, count, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource, \ + unsigned int *: bus_alloc_resource, \ + default: bus_alloc_resource_const) \ + ((dev), (type), (rid), (start), (end), (count), (flags)) + +#define bus_alloc_resource_any(dev, type, rid, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource_any, \ + unsigned int *: bus_alloc_resource_any, \ + default: bus_alloc_resource_any_const) \ + ((dev), (type), (rid), (flags)) + +#define bus_alloc_resource_anywhere(dev, type, rid, count, flags) \ + _Generic((rid), \ + int *: bus_alloc_resource_anywhere, \ + unsigned int *: bus_alloc_resource_anywhere, \ + default: bus_alloc_resource_anywhere_const) \ + ((dev), (type), (rid), (count), (flags)) + /* Compat shims for simpler bus resource API. */ int bus_adjust_resource_new(device_t child, struct resource *r, rman_res_t start, rman_res_t end); diff --git a/sys/sys/param.h b/sys/sys/param.h index 26f201a21715..73f122785266 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -76,7 +76,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1403506 +#define __FreeBSD_version 1403507 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,