upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

simplebus: Consistently map SYS_RES_IOPORT to SYS_RES_MEMORY

Browse source 
Reviewed by:	imp
Differential Revision:	https://reviews.freebsd.org/D43442

(cherry picked from commit 3cf553288b968106e40882bb73b30da652614ba0)
This commit is contained in:
John Baldwin 2024-01-23 09:38:25 -08:00
parent a93707671c
commit 672a0a76ed
1 changed files with 83 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

90
sys/dev/fdt/simplebus.c
View file

@ -47,6 +47,19 @@
static int simplebus_probe(device_t dev);
static struct resource *simplebus_alloc_resource(device_t, device_t, int,
int *, rman_res_t, rman_res_t, rman_res_t, u_int);
static int simplebus_adjust_resource(device_t bus, device_t child,
int type, struct resource *r, rman_res_t start, rman_res_t end);
static int simplebus_release_resource(device_t bus, device_t child,
int type, int rid, struct resource *r);
static int simplebus_activate_resource(device_t bus,
device_t child, int type, int rid, struct resource *r);
static int simplebus_deactivate_resource(device_t bus,
device_t child, int type, int rid, struct resource *r);
static int simplebus_map_resource(device_t bus, device_t child,
int type, struct resource *r, struct resource_map_request *args,
struct resource_map *map);
static int simplebus_unmap_resource(device_t bus, device_t child,
int type, struct resource *r, struct resource_map *map);
static void simplebus_probe_nomatch(device_t bus, device_t child);
static int simplebus_print_child(device_t bus, device_t child);
static device_t simplebus_add_child(device_t dev, u_int order,
@ -84,10 +97,12 @@ static device_method_t simplebus_methods[] = {
DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
DEVMETHOD(bus_alloc_resource, simplebus_alloc_resource),
DEVMETHOD(bus_release_resource, bus_generic_release_resource),
DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
DEVMETHOD(bus_adjust_resource, bus_generic_adjust_resource),
DEVMETHOD(bus_release_resource, simplebus_release_resource),
DEVMETHOD(bus_activate_resource, simplebus_activate_resource),
DEVMETHOD(bus_deactivate_resource, simplebus_deactivate_resource),
DEVMETHOD(bus_adjust_resource, simplebus_adjust_resource),
DEVMETHOD(bus_map_resource, simplebus_map_resource),
DEVMETHOD(bus_unmap_resource, simplebus_unmap_resource),
DEVMETHOD(bus_set_resource, bus_generic_rl_set_resource),
DEVMETHOD(bus_get_resource, bus_generic_rl_get_resource),
DEVMETHOD(bus_child_pnpinfo, ofw_bus_gen_child_pnpinfo),
@ -433,6 +448,9 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,
sc = device_get_softc(bus);
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
/*
* Request for the default allocation with a given rid: use resource
* list stored in the local device info.
@ -441,9 +459,6 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,
if ((di = device_get_ivars(child)) == NULL)
return (NULL);
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
rle = resource_list_find(&di->rl, type, *rid);
if (rle == NULL) {
if (bootverbose)
@ -481,6 +496,67 @@ simplebus_alloc_resource(device_t bus, device_t child, int type, int *rid,
count, flags));
}
static int
simplebus_adjust_resource(device_t bus, device_t child, int type,
struct resource *r, rman_res_t start, rman_res_t end)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_adjust_resource(bus, child, type, r, start, end));
}
static int
simplebus_release_resource(device_t bus, device_t child, int type, int rid,
struct resource *r)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_release_resource(bus, child, type, rid, r));
}
static int
simplebus_activate_resource(device_t bus, device_t child, int type, int rid,
struct resource *r)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_activate_resource(bus, child, type, rid, r));
}
static int
simplebus_deactivate_resource(device_t bus, device_t child, int type, int rid,
struct resource *r)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_deactivate_resource(bus, child, type, rid, r));
}
static int
simplebus_map_resource(device_t bus, device_t child, int type,
struct resource *r, struct resource_map_request *args,
struct resource_map *map)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_map_resource(bus, child, type, r, args, map));
}
static int
simplebus_unmap_resource(device_t bus, device_t child, int type,
struct resource *r, struct resource_map *map)
{
if (type == SYS_RES_IOPORT)
type = SYS_RES_MEMORY;
return (bus_generic_unmap_resource(bus, child, type, r, map));
}
static int
simplebus_print_res(struct simplebus_devinfo *di)
{