diff options
| -rw-r--r-- | sys/amd64/amd64/nexus.c | 78 | ||||
| -rw-r--r-- | sys/i386/i386/nexus.c | 78 | ||||
| -rw-r--r-- | sys/i386/include/nexusvar.h | 43 |
3 files changed, 16 insertions, 183 deletions
diff --git a/sys/amd64/amd64/nexus.c b/sys/amd64/amd64/nexus.c index cd45080..89323b8 100644 --- a/sys/amd64/amd64/nexus.c +++ b/sys/amd64/amd64/nexus.c @@ -57,7 +57,6 @@ #include <vm/pmap.h> #include <machine/pmap.h> -#include <machine/nexusvar.h> #include <machine/resource.h> #ifdef APIC_IO #include <machine/smp.h> @@ -79,7 +78,6 @@ static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { struct resource_list nx_resources; - int nx_pcibus; }; #define DEVTONX(dev) ((struct nexus_device *)device_get_ivars(dev)) @@ -94,8 +92,6 @@ static device_t nexus_add_child(device_t bus, int order, const char *name, int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -static int nexus_read_ivar(device_t, device_t, int, uintptr_t *); -static int nexus_write_ivar(device_t, device_t, int, uintptr_t); static int nexus_activate_resource(device_t, device_t, int, int, struct resource *); static int nexus_deactivate_resource(device_t, device_t, int, int, @@ -122,8 +118,6 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_read_ivar, nexus_read_ivar), - DEVMETHOD(bus_write_ivar, nexus_write_ivar), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), @@ -226,41 +220,21 @@ nexus_probe(device_t dev) || rman_manage_region(&mem_rman, 0, ~0)) panic("nexus_probe mem_rman"); - return bus_generic_probe(dev); + return 0; } static int nexus_attach(device_t dev) { - device_t child; + device_t child; - /* - * First, deal with the children we know about already - */ - bus_generic_attach(dev); - /* - * And if we didn't see EISA or ISA on a pci bridge, create some - * connection points now so they show up "on motherboard". - */ - if (!devclass_get_device(devclass_find("eisa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "eisa", 0); - if (child == NULL) - panic("nexus_attach eisa"); - device_probe_and_attach(child); - } - if (!devclass_get_device(devclass_find("mca"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "mca", 0); - if (child == 0) - panic("nexus_probe mca"); - device_probe_and_attach(child); - } - if (!devclass_get_device(devclass_find("isa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "isa", 0); + bus_generic_probe(dev); + if (!devclass_get_device(devclass_find("acpi"), 0)) { + child = BUS_ADD_CHILD(dev, 0, "legacy", 0); if (child == NULL) - panic("nexus_attach isa"); - device_probe_and_attach(child); + panic("nexus_attach legacy"); } - + bus_generic_attach(dev); return 0; } @@ -271,7 +245,7 @@ nexus_print_all_resources(device_t dev) struct resource_list *rl = &ndev->nx_resources; int retval = 0; - if (SLIST_FIRST(rl) || ndev->nx_pcibus != -1) + if (SLIST_FIRST(rl)) retval += printf(" at"); retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); @@ -284,13 +258,10 @@ nexus_print_all_resources(device_t dev) static int nexus_print_child(device_t bus, device_t child) { - struct nexus_device *ndev = DEVTONX(child); int retval = 0; retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); - if (ndev->nx_pcibus != -1) - retval += printf(" pcibus %d", ndev->nx_pcibus); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); @@ -306,7 +277,6 @@ nexus_add_child(device_t bus, int order, const char *name, int unit) if (!ndev) return(0); resource_list_init(&ndev->nx_resources); - ndev->nx_pcibus = -1; child = device_add_child_ordered(bus, order, name, unit); @@ -316,38 +286,6 @@ nexus_add_child(device_t bus, int order, const char *name, int unit) return(child); } -static int -nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) -{ - struct nexus_device *ndev = DEVTONX(child); - - switch (which) { - case NEXUS_IVAR_PCIBUS: - *result = ndev->nx_pcibus; - break; - default: - return ENOENT; - } - return 0; -} - - -static int -nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) -{ - struct nexus_device *ndev = DEVTONX(child); - - switch (which) { - case NEXUS_IVAR_PCIBUS: - ndev->nx_pcibus = value; - break; - default: - return ENOENT; - } - return 0; -} - - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c index cd45080..89323b8 100644 --- a/sys/i386/i386/nexus.c +++ b/sys/i386/i386/nexus.c @@ -57,7 +57,6 @@ #include <vm/pmap.h> #include <machine/pmap.h> -#include <machine/nexusvar.h> #include <machine/resource.h> #ifdef APIC_IO #include <machine/smp.h> @@ -79,7 +78,6 @@ static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device"); struct nexus_device { struct resource_list nx_resources; - int nx_pcibus; }; #define DEVTONX(dev) ((struct nexus_device *)device_get_ivars(dev)) @@ -94,8 +92,6 @@ static device_t nexus_add_child(device_t bus, int order, const char *name, int unit); static struct resource *nexus_alloc_resource(device_t, device_t, int, int *, u_long, u_long, u_long, u_int); -static int nexus_read_ivar(device_t, device_t, int, uintptr_t *); -static int nexus_write_ivar(device_t, device_t, int, uintptr_t); static int nexus_activate_resource(device_t, device_t, int, int, struct resource *); static int nexus_deactivate_resource(device_t, device_t, int, int, @@ -122,8 +118,6 @@ static device_method_t nexus_methods[] = { /* Bus interface */ DEVMETHOD(bus_print_child, nexus_print_child), DEVMETHOD(bus_add_child, nexus_add_child), - DEVMETHOD(bus_read_ivar, nexus_read_ivar), - DEVMETHOD(bus_write_ivar, nexus_write_ivar), DEVMETHOD(bus_alloc_resource, nexus_alloc_resource), DEVMETHOD(bus_release_resource, nexus_release_resource), DEVMETHOD(bus_activate_resource, nexus_activate_resource), @@ -226,41 +220,21 @@ nexus_probe(device_t dev) || rman_manage_region(&mem_rman, 0, ~0)) panic("nexus_probe mem_rman"); - return bus_generic_probe(dev); + return 0; } static int nexus_attach(device_t dev) { - device_t child; + device_t child; - /* - * First, deal with the children we know about already - */ - bus_generic_attach(dev); - /* - * And if we didn't see EISA or ISA on a pci bridge, create some - * connection points now so they show up "on motherboard". - */ - if (!devclass_get_device(devclass_find("eisa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "eisa", 0); - if (child == NULL) - panic("nexus_attach eisa"); - device_probe_and_attach(child); - } - if (!devclass_get_device(devclass_find("mca"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "mca", 0); - if (child == 0) - panic("nexus_probe mca"); - device_probe_and_attach(child); - } - if (!devclass_get_device(devclass_find("isa"), 0)) { - child = BUS_ADD_CHILD(dev, 0, "isa", 0); + bus_generic_probe(dev); + if (!devclass_get_device(devclass_find("acpi"), 0)) { + child = BUS_ADD_CHILD(dev, 0, "legacy", 0); if (child == NULL) - panic("nexus_attach isa"); - device_probe_and_attach(child); + panic("nexus_attach legacy"); } - + bus_generic_attach(dev); return 0; } @@ -271,7 +245,7 @@ nexus_print_all_resources(device_t dev) struct resource_list *rl = &ndev->nx_resources; int retval = 0; - if (SLIST_FIRST(rl) || ndev->nx_pcibus != -1) + if (SLIST_FIRST(rl)) retval += printf(" at"); retval += resource_list_print_type(rl, "port", SYS_RES_IOPORT, "%#lx"); @@ -284,13 +258,10 @@ nexus_print_all_resources(device_t dev) static int nexus_print_child(device_t bus, device_t child) { - struct nexus_device *ndev = DEVTONX(child); int retval = 0; retval += bus_print_child_header(bus, child); retval += nexus_print_all_resources(child); - if (ndev->nx_pcibus != -1) - retval += printf(" pcibus %d", ndev->nx_pcibus); retval += printf(" on motherboard\n"); /* XXX "motherboard", ick */ return (retval); @@ -306,7 +277,6 @@ nexus_add_child(device_t bus, int order, const char *name, int unit) if (!ndev) return(0); resource_list_init(&ndev->nx_resources); - ndev->nx_pcibus = -1; child = device_add_child_ordered(bus, order, name, unit); @@ -316,38 +286,6 @@ nexus_add_child(device_t bus, int order, const char *name, int unit) return(child); } -static int -nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) -{ - struct nexus_device *ndev = DEVTONX(child); - - switch (which) { - case NEXUS_IVAR_PCIBUS: - *result = ndev->nx_pcibus; - break; - default: - return ENOENT; - } - return 0; -} - - -static int -nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) -{ - struct nexus_device *ndev = DEVTONX(child); - - switch (which) { - case NEXUS_IVAR_PCIBUS: - ndev->nx_pcibus = value; - break; - default: - return ENOENT; - } - return 0; -} - - /* * Allocate a resource on behalf of child. NB: child is usually going to be a * child of one of our descendants, not a direct child of nexus0. diff --git a/sys/i386/include/nexusvar.h b/sys/i386/include/nexusvar.h deleted file mode 100644 index be38f33..0000000 --- a/sys/i386/include/nexusvar.h +++ /dev/null @@ -1,43 +0,0 @@ -/*- - * Copyright (c) 2000 Peter Wemm <peter@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$ - */ - -#ifndef _MACHINE_NEXUSVAR_H_ -#define _MACHINE_NEXUSVAR_H_ 1 - -enum nexus_device_ivars { - NEXUS_IVAR_PCIBUS -}; - -#define NEXUS_ACCESSOR(var, ivar, type) \ - __BUS_ACCESSOR(nexus, var, NEXUS, ivar, type) - -NEXUS_ACCESSOR(pcibus, PCIBUS, u_int32_t) - -#undef NEXUS_ACCESSOR - -#endif /* !_MACHINE_NEXUSVAR_H_ */ |
