Author: jhb
Date: Fri Jun 24 16:06:50 2011
New Revision: 223507
URL: http://svn.freebsd.org/changeset/base/223507
Log:
MFC 221231,221450,222600:
Add a new bus method, BUS_ADJUST_RESOURCE() that is intended to be a
wrapper around rman_adjust_resource(). Include a generic implementation,
bus_generic_adjust_resource() which passes the request up to the parent
bus. There is currently no default implementation. A
bus_adjust_resource() wrapper is provided for use in drivers.
Added:
stable/8/share/man/man9/bus_adjust_resource.9
- copied, changed from r221231, head/share/man/man9/bus_adjust_resource.9
Modified:
stable/8/share/man/man9/Makefile
stable/8/share/man/man9/bus_alloc_resource.9
stable/8/share/man/man9/rman.9
stable/8/sys/kern/bus_if.m
stable/8/sys/kern/subr_bus.c
stable/8/sys/sys/bus.h
Directory Properties:
stable/8/share/man/man9/ (props changed)
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
Modified: stable/8/share/man/man9/Makefile
==============================================================================
--- stable/8/share/man/man9/Makefile Fri Jun 24 14:56:38 2011
(r223506)
+++ stable/8/share/man/man9/Makefile Fri Jun 24 16:06:50 2011
(r223507)
@@ -22,6 +22,7 @@ MAN= accept_filter.9 \
BUF_UNLOCK.9 \
bus_activate_resource.9 \
BUS_ADD_CHILD.9 \
+ bus_adjust_resource.9 \
bus_alloc_resource.9 \
BUS_BIND_INTR.9 \
bus_child_present.9 \
Copied and modified: stable/8/share/man/man9/bus_adjust_resource.9 (from
r221231, head/share/man/man9/bus_adjust_resource.9)
==============================================================================
--- head/share/man/man9/bus_adjust_resource.9 Fri Apr 29 21:36:45 2011
(r221231, copy source)
+++ stable/8/share/man/man9/bus_adjust_resource.9 Fri Jun 24 16:06:50
2011 (r223507)
@@ -67,6 +67,15 @@ It is the caller's responsibility to enf
The
.Fn bus_adjust_resource
method returns zero on success or an error code on failure.
+.Sh EXAMPLES
+Grow an existing memory resource by 4096 bytes.
+.Bd -literal
+ struct resource *res;
+ int error;
+
+ error = bus_adjust_resource(dev, SYS_RES_MEMORY, res,
+ rman_get_start(res), rman_get_end(res) + 0x1000);
+.Ed
.Sh ERRORS
.Fn bus_adjust_resource
will fail if:
@@ -85,15 +94,6 @@ The new address range does not overlap w
.It Bq Er EBUSY
The new address range conflicts with another allocated resource.
.El
-.Sh EXAMPLES
-Grow an existing memory resource by 4096 bytes.
-.Bd -literal
- struct resource *res;
- int error;
-
- error = bus_adjust_resource(dev, SYS_RES_MEMORY, res,
- rman_get_start(res), rman_get_end(res) + 0x1000);
-.Ed
.Sh SEE ALSO
.Xr bus_alloc_resource 9 ,
.Xr bus_release_resource 9 ,
Modified: stable/8/share/man/man9/bus_alloc_resource.9
==============================================================================
--- stable/8/share/man/man9/bus_alloc_resource.9 Fri Jun 24 14:56:38
2011 (r223506)
+++ stable/8/share/man/man9/bus_alloc_resource.9 Fri Jun 24 16:06:50
2011 (r223507)
@@ -171,6 +171,7 @@ should be saved in the softc of the devi
.Ed
.Sh SEE ALSO
.Xr bus_activate_resource 9 ,
+.Xr bus_adjust_resource 9 ,
.Xr bus_release_resource 9 ,
.Xr device 9 ,
.Xr driver 9
Modified: stable/8/share/man/man9/rman.9
==============================================================================
--- stable/8/share/man/man9/rman.9 Fri Jun 24 14:56:38 2011
(r223506)
+++ stable/8/share/man/man9/rman.9 Fri Jun 24 16:06:50 2011
(r223507)
@@ -461,6 +461,7 @@ function returns a pointer to the device
.Fa r .
.Sh SEE ALSO
.Xr bus_activate_resource 9 ,
+.Xr bus_adjust_resource 9 ,
.Xr bus_alloc_resource 9 ,
.Xr bus_release_resource 9 ,
.Xr bus_set_resource 9 ,
Modified: stable/8/sys/kern/bus_if.m
==============================================================================
--- stable/8/sys/kern/bus_if.m Fri Jun 24 14:56:38 2011 (r223506)
+++ stable/8/sys/kern/bus_if.m Fri Jun 24 16:06:50 2011 (r223507)
@@ -297,6 +297,30 @@ METHOD int deactivate_resource {
};
/**
+ * @brief Adjust a resource
+ *
+ * Adjust the start and/or end of a resource allocated by
+ * BUS_ALLOC_RESOURCE. At least part of the new address range must overlap
+ * with the existing address range. If the successful, the resource's range
+ * will be adjusted to [start, end] on return.
+ *
+ * @param _dev the parent device of @p _child
+ * @param _child the device which allocated the resource
+ * @param _type the type of resource
+ * @param _res the resource to adjust
+ * @param _start the new starting address of the resource range
+ * @param _end the new ending address of the resource range
+ */
+METHOD int adjust_resource {
+ device_t _dev;
+ device_t _child;
+ int _type;
+ struct resource *_res;
+ u_long _start;
+ u_long _end;
+};
+
+/**
* @brief Release a resource
*
* Free a resource allocated by the BUS_ALLOC_RESOURCE. The @p _rid
Modified: stable/8/sys/kern/subr_bus.c
==============================================================================
--- stable/8/sys/kern/subr_bus.c Fri Jun 24 14:56:38 2011
(r223506)
+++ stable/8/sys/kern/subr_bus.c Fri Jun 24 16:06:50 2011
(r223507)
@@ -3506,6 +3506,23 @@ bus_generic_teardown_intr(device_t dev,
}
/**
+ * @brief Helper function for implementing BUS_ADJUST_RESOURCE().
+ *
+ * This simple implementation of BUS_ADJUST_RESOURCE() simply calls the
+ * BUS_ADJUST_RESOURCE() method of the parent of @p dev.
+ */
+int
+bus_generic_adjust_resource(device_t dev, device_t child, int type,
+ struct resource *r, u_long start, u_long end)
+{
+ /* Propagate up the bus hierarchy until someone handles it. */
+ if (dev->parent)
+ return (BUS_ADJUST_RESOURCE(dev->parent, child, type, r, start,
+ end));
+ return (EINVAL);
+}
+
+/**
* @brief Helper function for implementing BUS_ALLOC_RESOURCE().
*
* This simple implementation of BUS_ALLOC_RESOURCE() simply calls the
@@ -3828,6 +3845,21 @@ bus_alloc_resource(device_t dev, int typ
}
/**
+ * @brief Wrapper function for BUS_ADJUST_RESOURCE().
+ *
+ * This function simply calls the BUS_ADJUST_RESOURCE() method of the
+ * parent of @p dev.
+ */
+int
+bus_adjust_resource(device_t dev, int type, struct resource *r, u_long start,
+ u_long end)
+{
+ if (dev->parent == NULL)
+ return (EINVAL);
+ return (BUS_ADJUST_RESOURCE(dev->parent, dev, type, r, start, end));
+}
+
+/**
* @brief Wrapper function for BUS_ACTIVATE_RESOURCE().
*
* This function simply calls the BUS_ACTIVATE_RESOURCE() method of the
Modified: stable/8/sys/sys/bus.h
==============================================================================
--- stable/8/sys/sys/bus.h Fri Jun 24 14:56:38 2011 (r223506)
+++ stable/8/sys/sys/bus.h Fri Jun 24 16:06:50 2011 (r223507)
@@ -289,6 +289,9 @@ int bus_generic_activate_resource(device
device_t
bus_generic_add_child(device_t dev, u_int order, const char *name,
int unit);
+int bus_generic_adjust_resource(device_t bus, device_t child, int type,
+ struct resource *r, u_long start,
+ u_long end);
struct resource *
bus_generic_alloc_resource(device_t bus, device_t child, int type,
int *rid, u_long start, u_long end,
@@ -357,6 +360,8 @@ struct resource_spec {
int bus_alloc_resources(device_t dev, struct resource_spec *rs, struct
resource **res);
void bus_release_resources(device_t dev, const struct resource_spec *rs,
struct resource **res);
+int bus_adjust_resource(device_t child, int type, struct resource *r,
+ u_long start, u_long end);
struct resource *bus_alloc_resource(device_t dev, int type, int *rid,
u_long start, u_long end, u_long count,
u_int flags);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
