diff options
author | grehan <grehan@FreeBSD.org> | 2004-01-13 11:20:52 +0000 |
---|---|---|
committer | grehan <grehan@FreeBSD.org> | 2004-01-13 11:20:52 +0000 |
commit | 5e6c3e74a5c479c3a0a6cf5c9aea54650ece04f5 (patch) | |
tree | b733569176f4a5f304d22f60e74bdeb559b7fa8c | |
parent | df395ed429fc91a315335c46a1bae55a83a19fe5 (diff) | |
download | FreeBSD-src-5e6c3e74a5c479c3a0a6cf5c9aea54650ece04f5.zip FreeBSD-src-5e6c3e74a5c479c3a0a6cf5c9aea54650ece04f5.tar.gz |
Remove hard-coded knowledge of specific OFW devices. Use bus_generic_probe
and add_child entry point to allow devices to use the identify
method to add themselves if need be (e.g. openpic, syscons).
Export interrupt-controller-add routine for extern int cntlr drivers.
Eliminate recursive OFW device-tree walk and only iterate the
top-level ala sparc64. Allow child devices to set the device
type with write_ivars.
Step 1 of many in removing the hard-dependency on OpenFirmware.
-rw-r--r-- | sys/powerpc/aim/nexus.c | 119 | ||||
-rw-r--r-- | sys/powerpc/include/nexusvar.h | 5 | ||||
-rw-r--r-- | sys/powerpc/powerpc/nexus.c | 119 |
3 files changed, 133 insertions, 110 deletions
diff --git a/sys/powerpc/aim/nexus.c b/sys/powerpc/aim/nexus.c index 7472bbe..836c08e 100644 --- a/sys/powerpc/aim/nexus.c +++ b/sys/powerpc/aim/nexus.c @@ -89,9 +89,9 @@ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); struct nexus_devinfo { phandle_t ndi_node; /* Some common properties. */ - char *ndi_name; - char *ndi_device_type; - char *ndi_compatible; + char *ndi_name; + char *ndi_device_type; + char *ndi_compatible; }; struct nexus_softc { @@ -107,6 +107,7 @@ static void nexus_probe_nomatch(device_t, device_t); /* * Bus interface */ +static device_t nexus_add_child(device_t, int, const char *, 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_setup_intr(device_t, device_t, struct resource *, int, @@ -125,7 +126,7 @@ static int nexus_release_resource(device_t, device_t, int, int, /* * Local routines */ -static device_t create_device_from_node(device_t, phandle_t); +static device_t nexus_device_from_node(device_t, phandle_t); static device_method_t nexus_methods[] = { /* Device interface */ @@ -137,6 +138,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface. Resource management is business of the children... */ + DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch), DEVMETHOD(bus_read_ivar, nexus_read_ivar), @@ -165,7 +167,7 @@ static int nexus_probe(device_t dev) { phandle_t root; - phandle_t pic, cpus, child, new_node, temp_node; + phandle_t child; struct nexus_softc *sc; if ((root = OF_peer(0)) == -1) @@ -173,52 +175,21 @@ nexus_probe(device_t dev) sc = device_get_softc(dev); - if ((cpus = OF_finddevice("/cpus")) != -1) { - for (child = OF_child(cpus); child; child = OF_peer(child)) - (void)create_device_from_node(dev, child); - } + /* + * Allow devices to identify + */ + bus_generic_probe(dev); + + /* + * Now walk the OFW tree to locate top-level devices + */ + for (child = OF_child(root); child != 0; child = OF_peer(child)) { + if (child == -1) + panic("nexus_probe(): OF_child failed."); + (void)nexus_device_from_node(dev, child); - if ((child = OF_finddevice("/chosen")) == -1) - printf("nexus_probe: can't find /chosen"); - - if (OF_getprop(child, "interrupt-controller", &pic, 4) != 4) -#ifndef PSIM - printf("nexus_probe: can't get interrupt-controller"); -#else - pic = OF_finddevice("/iobus/opic"); -#endif - - sc->sc_pic = create_device_from_node(dev, pic); - - if (sc->sc_pic == NULL) - printf("nexus_probe: failed to create PIC device"); - - child = root; - while (child != 0) { - if (child != pic) - (void)create_device_from_node(dev, child); - - if (child == cpus) - new_node = 0; - else - new_node = OF_child(child); - if (new_node == -1) - panic("nexus_probe: OF_child returned -1"); - if (new_node == 0) - new_node = OF_peer(child); - if (new_node == 0) { - temp_node = child; - while (new_node == 0) { - temp_node = OF_parent(temp_node); - if (temp_node == 0) - break; - new_node = OF_peer(temp_node); - } - } - child = new_node; } device_set_desc(dev, "OpenFirmware Nexus device"); - return (0); } @@ -235,12 +206,34 @@ nexus_probe_nomatch(device_t dev, device_t child) if (type == NULL) type = "(unknown)"; -#if 0 - device_printf(dev, "<%s>, type %s (no driver attached)\n", - name, type); -#endif + + if (bootverbose) + device_printf(dev, "<%s>, type %s (no driver attached)\n", + name, type); +} + +static device_t +nexus_add_child(device_t dev, int order, const char *name, int unit) +{ + device_t child; + struct nexus_devinfo *dinfo; + + child = device_add_child_ordered(dev, order, name, unit); + if (child == NULL) + return (NULL); + + dinfo = malloc(sizeof(struct nexus_devinfo), M_NEXUS, M_NOWAIT|M_ZERO); + if (dinfo == NULL) + return (NULL); + + dinfo->ndi_node = -1; + dinfo->ndi_name = name; + device_set_ivars(child, dinfo); + + return (child); } + static int nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { @@ -278,8 +271,13 @@ nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) switch (which) { case NEXUS_IVAR_NODE: case NEXUS_IVAR_NAME: - case NEXUS_IVAR_DEVICE_TYPE: return (EINVAL); + + /* Identified devices will want to set this */ + case NEXUS_IVAR_DEVICE_TYPE: + dinfo->ndi_device_type = (char *)value; + break; + default: return (ENOENT); } @@ -371,7 +369,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, if (type != SYS_RES_IRQ) { device_printf(bus, "unknown resource request from %s\n", device_get_nameunit(child)); - return (NULL); + return (EINVAL); } if (device_get_state(sc->sc_pic) != DS_ATTACHED) @@ -381,7 +379,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, } static device_t -create_device_from_node(device_t parent, phandle_t node) +nexus_device_from_node(device_t parent, phandle_t node) { device_t cdev; struct nexus_devinfo *dinfo; @@ -403,3 +401,14 @@ create_device_from_node(device_t parent, phandle_t node) return (cdev); } + +int +nexus_install_intcntlr(device_t dev) +{ + struct nexus_softc *sc; + + sc = device_get_softc(device_get_parent(dev)); + sc->sc_pic = dev; + + return (0); +} diff --git a/sys/powerpc/include/nexusvar.h b/sys/powerpc/include/nexusvar.h index 2859fa3..df8a0f6 100644 --- a/sys/powerpc/include/nexusvar.h +++ b/sys/powerpc/include/nexusvar.h @@ -50,4 +50,9 @@ NEXUS_ACCESSOR(compatible, COMPATIBLE, char *) #undef NEXUS_ACCESSOR +/* + * Install the interrupt controller device + */ +int nexus_install_intcntlr(device_t); + #endif /* _MACHINE_NEXUSVAR_H_ */ diff --git a/sys/powerpc/powerpc/nexus.c b/sys/powerpc/powerpc/nexus.c index 7472bbe..836c08e 100644 --- a/sys/powerpc/powerpc/nexus.c +++ b/sys/powerpc/powerpc/nexus.c @@ -89,9 +89,9 @@ static MALLOC_DEFINE(M_NEXUS, "nexus", "nexus device information"); struct nexus_devinfo { phandle_t ndi_node; /* Some common properties. */ - char *ndi_name; - char *ndi_device_type; - char *ndi_compatible; + char *ndi_name; + char *ndi_device_type; + char *ndi_compatible; }; struct nexus_softc { @@ -107,6 +107,7 @@ static void nexus_probe_nomatch(device_t, device_t); /* * Bus interface */ +static device_t nexus_add_child(device_t, int, const char *, 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_setup_intr(device_t, device_t, struct resource *, int, @@ -125,7 +126,7 @@ static int nexus_release_resource(device_t, device_t, int, int, /* * Local routines */ -static device_t create_device_from_node(device_t, phandle_t); +static device_t nexus_device_from_node(device_t, phandle_t); static device_method_t nexus_methods[] = { /* Device interface */ @@ -137,6 +138,7 @@ static device_method_t nexus_methods[] = { DEVMETHOD(device_resume, bus_generic_resume), /* Bus interface. Resource management is business of the children... */ + DEVMETHOD(bus_add_child, nexus_add_child), DEVMETHOD(bus_print_child, bus_generic_print_child), DEVMETHOD(bus_probe_nomatch, nexus_probe_nomatch), DEVMETHOD(bus_read_ivar, nexus_read_ivar), @@ -165,7 +167,7 @@ static int nexus_probe(device_t dev) { phandle_t root; - phandle_t pic, cpus, child, new_node, temp_node; + phandle_t child; struct nexus_softc *sc; if ((root = OF_peer(0)) == -1) @@ -173,52 +175,21 @@ nexus_probe(device_t dev) sc = device_get_softc(dev); - if ((cpus = OF_finddevice("/cpus")) != -1) { - for (child = OF_child(cpus); child; child = OF_peer(child)) - (void)create_device_from_node(dev, child); - } + /* + * Allow devices to identify + */ + bus_generic_probe(dev); + + /* + * Now walk the OFW tree to locate top-level devices + */ + for (child = OF_child(root); child != 0; child = OF_peer(child)) { + if (child == -1) + panic("nexus_probe(): OF_child failed."); + (void)nexus_device_from_node(dev, child); - if ((child = OF_finddevice("/chosen")) == -1) - printf("nexus_probe: can't find /chosen"); - - if (OF_getprop(child, "interrupt-controller", &pic, 4) != 4) -#ifndef PSIM - printf("nexus_probe: can't get interrupt-controller"); -#else - pic = OF_finddevice("/iobus/opic"); -#endif - - sc->sc_pic = create_device_from_node(dev, pic); - - if (sc->sc_pic == NULL) - printf("nexus_probe: failed to create PIC device"); - - child = root; - while (child != 0) { - if (child != pic) - (void)create_device_from_node(dev, child); - - if (child == cpus) - new_node = 0; - else - new_node = OF_child(child); - if (new_node == -1) - panic("nexus_probe: OF_child returned -1"); - if (new_node == 0) - new_node = OF_peer(child); - if (new_node == 0) { - temp_node = child; - while (new_node == 0) { - temp_node = OF_parent(temp_node); - if (temp_node == 0) - break; - new_node = OF_peer(temp_node); - } - } - child = new_node; } device_set_desc(dev, "OpenFirmware Nexus device"); - return (0); } @@ -235,12 +206,34 @@ nexus_probe_nomatch(device_t dev, device_t child) if (type == NULL) type = "(unknown)"; -#if 0 - device_printf(dev, "<%s>, type %s (no driver attached)\n", - name, type); -#endif + + if (bootverbose) + device_printf(dev, "<%s>, type %s (no driver attached)\n", + name, type); +} + +static device_t +nexus_add_child(device_t dev, int order, const char *name, int unit) +{ + device_t child; + struct nexus_devinfo *dinfo; + + child = device_add_child_ordered(dev, order, name, unit); + if (child == NULL) + return (NULL); + + dinfo = malloc(sizeof(struct nexus_devinfo), M_NEXUS, M_NOWAIT|M_ZERO); + if (dinfo == NULL) + return (NULL); + + dinfo->ndi_node = -1; + dinfo->ndi_name = name; + device_set_ivars(child, dinfo); + + return (child); } + static int nexus_read_ivar(device_t dev, device_t child, int which, uintptr_t *result) { @@ -278,8 +271,13 @@ nexus_write_ivar(device_t dev, device_t child, int which, uintptr_t value) switch (which) { case NEXUS_IVAR_NODE: case NEXUS_IVAR_NAME: - case NEXUS_IVAR_DEVICE_TYPE: return (EINVAL); + + /* Identified devices will want to set this */ + case NEXUS_IVAR_DEVICE_TYPE: + dinfo->ndi_device_type = (char *)value; + break; + default: return (ENOENT); } @@ -371,7 +369,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, if (type != SYS_RES_IRQ) { device_printf(bus, "unknown resource request from %s\n", device_get_nameunit(child)); - return (NULL); + return (EINVAL); } if (device_get_state(sc->sc_pic) != DS_ATTACHED) @@ -381,7 +379,7 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid, } static device_t -create_device_from_node(device_t parent, phandle_t node) +nexus_device_from_node(device_t parent, phandle_t node) { device_t cdev; struct nexus_devinfo *dinfo; @@ -403,3 +401,14 @@ create_device_from_node(device_t parent, phandle_t node) return (cdev); } + +int +nexus_install_intcntlr(device_t dev) +{ + struct nexus_softc *sc; + + sc = device_get_softc(device_get_parent(dev)); + sc->sc_pic = dev; + + return (0); +} |