From de6536e34df5d7e1d7c8977b472e693b6f71ef76 Mon Sep 17 00:00:00 2001 From: jhb Date: Thu, 20 Dec 2007 21:42:43 +0000 Subject: MFamd64/ia64/i386: Only set the rman bus tags and handles in bus_activate_resource() methods instead of splitting it up between bus_alloc_resource() and bus_activate_resource(). Glanced at by: marcel --- sys/powerpc/powermac/grackle.c | 3 +-- sys/powerpc/powermac/macio.c | 3 +-- sys/powerpc/powermac/uninorth.c | 3 +-- sys/powerpc/psim/iobus.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) (limited to 'sys/powerpc') diff --git a/sys/powerpc/powermac/grackle.c b/sys/powerpc/powermac/grackle.c index 03e15f0..0566c80 100644 --- a/sys/powerpc/powermac/grackle.c +++ b/sys/powerpc/powermac/grackle.c @@ -398,8 +398,6 @@ grackle_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, &bs_le_tag); - rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { @@ -459,6 +457,7 @@ grackle_activate_resource(device_t bus, device_t child, int type, int rid, return (ENOMEM); rman_set_virtual(res, p); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(res, (u_long)p); } diff --git a/sys/powerpc/powermac/macio.c b/sys/powerpc/powermac/macio.c index 36ef06e..89cf6ac 100644 --- a/sys/powerpc/powermac/macio.c +++ b/sys/powerpc/powermac/macio.c @@ -445,8 +445,6 @@ macio_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, &bs_le_tag); - rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { @@ -494,6 +492,7 @@ macio_activate_resource(device_t bus, device_t child, int type, int rid, if (p == NULL) return (ENOMEM); rman_set_virtual(res, p); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(res, (u_long)p); } diff --git a/sys/powerpc/powermac/uninorth.c b/sys/powerpc/powermac/uninorth.c index 3510983..12bd377 100644 --- a/sys/powerpc/powermac/uninorth.c +++ b/sys/powerpc/powermac/uninorth.c @@ -382,8 +382,6 @@ uninorth_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, &bs_le_tag); - rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { @@ -429,6 +427,7 @@ uninorth_activate_resource(device_t bus, device_t child, int type, int rid, if (p == NULL) return (ENOMEM); rman_set_virtual(res, p); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(res, (u_long)p); } diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 9fc2c57..dd05538 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -339,8 +339,6 @@ iobus_alloc_resource(device_t bus, device_t child, int type, int *rid, } rman_set_rid(rv, *rid); - rman_set_bustag(rv, &bs_le_tag); - rman_set_bushandle(rv, rman_get_start(rv)); if (needactivate) { if (bus_activate_resource(child, type, *rid, rv) != 0) { @@ -388,6 +386,7 @@ iobus_activate_resource(device_t bus, device_t child, int type, int rid, if (p == NULL) return (ENOMEM); rman_set_virtual(res, p); + rman_set_bustag(rv, &bs_le_tag); rman_set_bushandle(res, (u_long)p); } -- cgit v1.1