d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a new bus method, BUS_ADJUST_RESOURCE() that is intended to be a

Browse Source 
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.
This commit is contained in:
John Baldwin 2011-04-29 21:36:45 +00:00
parent 0abd21bdb8
commit 85ee63c923
7 changed files with 165 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
share/man/man9/Makefile
View File

@ -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 \

101
share/man/man9/bus_adjust_resource.9 Normal file
View File

@ -0,0 +1,101 @@
.\" -*- nroff -*-
.\"
.\" Copyright (c) 2011 Advanced Computing Technologies LLC
.\" Written by: John H. Baldwin <jhb@FreeBSD.org>
.\" 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

1
share/man/man9/bus_alloc_resource.9
View File

@ -171,6 +171,7 @@ should be saved in the softc of the device after these calls.
.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

1
share/man/man9/rman.9
View File

@ -462,6 +462,7 @@ function returns a pointer to the device which reserved the resource
.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 ,

24
sys/kern/bus_if.m
View File

@ -296,6 +296,30 @@ METHOD int deactivate_resource {
struct resource *_r;
};
/**
* @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
*

32
sys/kern/subr_bus.c
View File

@ -3645,6 +3645,23 @@ bus_generic_teardown_intr(device_t dev, device_t child, struct resource *irq,
return (EINVAL);
}
/**
* @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().
*
@ -3975,6 +3992,21 @@ bus_alloc_resource(device_t dev, int type, int *rid, u_long start, u_long end,
count, flags));
}
/**
* @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().
*

5
sys/sys/bus.h
View File

@ -304,6 +304,9 @@ int bus_generic_activate_resource(device_t dev, device_t child, int type,
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, struct resource_spec *rs,
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);