git: 7eb213614b90 - main - bus_alloc_resource: First step in passing resource IDs by value
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 30 Oct 2025 15:19:40 UTC
The branch main has been updated by jhb:
URL: https://cgit.FreeBSD.org/src/commit/?id=7eb213614b90cde31707a53c4b8ae6acacf2aa0f
commit 7eb213614b90cde31707a53c4b8ae6acacf2aa0f
Author: John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2025-10-30 15:14:27 +0000
Commit: John Baldwin <jhb@FreeBSD.org>
CommitDate: 2025-10-30 15:19:01 +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
---
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 bf5bda7e058d..b84f69cfd03e 100644
--- a/sys/kern/subr_bus.c
+++ b/sys/kern/subr_bus.c
@@ -4633,7 +4633,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 e7ce152160f8..4cc8091bf775 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -600,6 +600,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_old(device_t child, int type, struct resource *r,
rman_res_t start, rman_res_t end);
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 7cfa3c6aa4a8..957f1762a17c 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -74,7 +74,7 @@
* cannot include sys/param.h and should only be updated here.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1600002
+#define __FreeBSD_version 1600003
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,