From owner-svn-src-all@FreeBSD.ORG Fri Apr 29 21:36:45 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BA0361065673; Fri, 29 Apr 2011 21:36:45 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A721B8FC16; Fri, 29 Apr 2011 21:36:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3TLajbD016699; Fri, 29 Apr 2011 21:36:45 GMT (envelope-from jhb@svn.freebsd.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3TLajgP016691; Fri, 29 Apr 2011 21:36:45 GMT (envelope-from jhb@svn.freebsd.org) Message-Id: <201104292136.p3TLajgP016691@svn.freebsd.org> From: John Baldwin Date: Fri, 29 Apr 2011 21:36:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r221231 - in head: share/man/man9 sys/kern sys/sys X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Apr 2011 21:36:45 -0000 Author: jhb Date: Fri Apr 29 21:36:45 2011 New Revision: 221231 URL: http://svn.freebsd.org/changeset/base/221231 Log: 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: head/share/man/man9/bus_adjust_resource.9 (contents, props changed) Modified: head/share/man/man9/Makefile head/share/man/man9/bus_alloc_resource.9 head/share/man/man9/rman.9 head/sys/kern/bus_if.m head/sys/kern/subr_bus.c head/sys/sys/bus.h Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Fri Apr 29 21:19:30 2011 (r221230) +++ head/share/man/man9/Makefile Fri Apr 29 21:36:45 2011 (r221231) @@ -21,6 +21,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 \ Added: head/share/man/man9/bus_adjust_resource.9 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/man/man9/bus_adjust_resource.9 Fri Apr 29 21:36:45 2011 (r221231) @@ -0,0 +1,101 @@ +.\" -*- nroff -*- +.\" +.\" Copyright (c) 2011 Advanced Computing Technologies LLC +.\" Written by: John H. Baldwin +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.\" $FreeBSD$ +.\" +.Dd April 29, 2011 +.Dt BUS_ADJUST_RESOURCE 9 +.Os +.Sh NAME +.Nm bus_adjust_resource +.Nd adjust resource allocated from a parent bus +.Sh SYNOPSIS +.In sys/param.h +.In sys/bus.h +.Pp +.In machine/bus.h +.In sys/rman.h +.In machine/resource.h +.Ft int +.Fn bus_adjust_resource "device_t dev" "int type" "struct resource *r" "u_long start" "u_long end" +.Sh DESCRIPTION +This function is used to ask the parent bus to adjust the resource range +assigned to an allocated resource. +The resource +.Fa r +should have been allocated by a previous call to +.Xr bus_alloc_resource 9 . +The new resource range must overlap the existing range of +.Fa r . +The +.Fa type +argument should match the +.Fa type +argument passed to +.Xr bus_alloc_resource 9 +when the resource was initially allocated. +.Pp +Note that none of the constraints of the original allocation request such +as alignment or boundary restrictions are checked by +.Fn bus_adjust_resource . +It is the caller's responsibility to enforce any such requirements. +.Sh RETURN VALUES +The +.Fn bus_adjust_resource +method returns zero on success or an error code on failure. +.Sh ERRORS +.Fn bus_adjust_resource +will fail if: +.Bl -tag -width Er +.It Bq Er EINVAL +The +.Fa dev +device does not have a parent device. +.It Bq Er EINVAL +The +.Fa r +resource is a shared resource. +.It Bq Er EINVAL +The new address range does not overlap with the existing address range of +.Fa r . +.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 , +.Xr device 9 , +.Xr driver 9 Modified: head/share/man/man9/bus_alloc_resource.9 ============================================================================== --- head/share/man/man9/bus_alloc_resource.9 Fri Apr 29 21:19:30 2011 (r221230) +++ head/share/man/man9/bus_alloc_resource.9 Fri Apr 29 21:36:45 2011 (r221231) @@ -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: head/share/man/man9/rman.9 ============================================================================== --- head/share/man/man9/rman.9 Fri Apr 29 21:19:30 2011 (r221230) +++ head/share/man/man9/rman.9 Fri Apr 29 21:36:45 2011 (r221231) @@ -462,6 +462,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: head/sys/kern/bus_if.m ============================================================================== --- head/sys/kern/bus_if.m Fri Apr 29 21:19:30 2011 (r221230) +++ head/sys/kern/bus_if.m Fri Apr 29 21:36:45 2011 (r221231) @@ -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: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Fri Apr 29 21:19:30 2011 (r221230) +++ head/sys/kern/subr_bus.c Fri Apr 29 21:36:45 2011 (r221231) @@ -3646,6 +3646,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 @@ -3976,6 +3993,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: head/sys/sys/bus.h ============================================================================== --- head/sys/sys/bus.h Fri Apr 29 21:19:30 2011 (r221230) +++ head/sys/sys/bus.h Fri Apr 29 21:36:45 2011 (r221231) @@ -304,6 +304,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, @@ -374,6 +377,8 @@ int bus_alloc_resources(device_t dev, st 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);