Rototill the sparc64 nexus(4) (actually this brings in the code the

sun4v nexus(4) in turn is based on):
o Change nexus(4) to manage the resources of its children so the
  respective device drivers don't need to figure them out of OFW
  themselves.
o Change nexus(4) to provide the ofw_bus KOBJ interface instead of
  using IVARs for supplying the OFW node and the subset of standard
  properties of its children. Together with the previous change this
  also allows to fully take advantage of newbus in that drivers like
  fhc(4), which attach on multiple parent busses, no longer require
  different bus front-ends as obtaining the OFW node and properties
  as well as resource allocation works the same for all supported
  busses. As such this change also is part 4/4 of allowing creator(4)
  to work in USIII-based machines as it allows this driver to attach
  on both nexus(4) and upa(4). On the other hand removing these IVARs
  breaks API compatibility with the powerpc nexus(4) but which isn't
  that bad as a) sparc64 currently doesn't share any device driver
  hanging off of nexus(4) with powerpc and b) they were no longer
  compatible regarding OFW-related extensions at the pci(4) level
  since quite some time.
o Provide bus_get_dma_tag methods in nexus(4) and its children in
  order to handle DMA tags in a hierarchical way and get rid of the
  sparc64_root_dma_tag kludge. Together with the previous two items
  this changes also allows to completely get rid of the nexus(4)
  IVAR interface. It also includes:
  - pushing the constraints previously specified by the nexus_dmatag
    down into the DMA tags of psycho(4) and sbus(4) as it's their
    IOMMUs which induce these restrictions (and nothing at the
    nexus(4) or anything that would warrant specifying them there),
  - fixing some obviously wrong constraints of the psycho(4) and
    sbus(4) DMA tags, which happened to not actually be used with
    the sparc64_root_dma_tag kludge in place and therefore didn't
    cause problems so far,
  - replacing magic constants for constraints with macros as far
    as it is obvious as to where they come from.
  This doesn't include taking advantage of the newbus way to get
  the parent DMA tags implemented by this change in order to divorce
  the IOTSBs of the PCI and SBus IOMMUs or for implementing the
  workaround for the DMA sync bug in Sabre (and Tomatillo) bridges,
  yet, though.
o Get rid of the notion that nexus(4) (mostly) reflects an UPA bus
  by replacing ofw_upa.h and with ofw_nexus.h (which was repo-copied
  from ofw_upa.h) and renaming its content, which actually applies to
  all of Fireplane/Safari, JBus and UPA (in the host bus case), as
  appropriate.
o Just use M_DEVBUF instead of a separate M_NEXUS malloc type for
  allocating the device info for the children of nexus(4). This is
  done in order to not need to export M_NEXUS when deriving drivers
  for subordinate busses from the nexus(4) class.
o Use the DEFINE_CLASS_0() macro to declare the nexus(4) driver so
  we can derive subclasses from it.
o Const'ify the nexus_excl_name and nexus_excl_type arrays as well
  as add 'associations' and 'rsc', which are pseudo-devices without
  resources and therefore of no real interest for nexus(4), to the
  former.
o Let the nexus(4) device memory rman manage the entire 64-bit address
  space instead of just the UPA_MEMSTART to UPA_MEMEND subregion as
  Fireplane/Safari- and JBus-based machines use multiple ranges,
  which can't be as easily divided as in the case of UPA (limiting
  the address space only served for sanity checking anyway).
o Use M_WAITOK instead of M_NOWAIT when allocating the device info
  for children of nexus(4) in order to give one less opportunity
  for adding devices to nexus(4) to fail.
o While adapting the drivers affected by the above nexus(4) changes,
  change them to take advantage of rman_get_rid() instead of caching
  the RIDs assigned to allocated resources, now that the RIDs of
  resources are correctly set.
o In iommu(4) and nexus(4) replace hard-coded functions names, which
  actually became outdated in several places, in panic strings and
  status massages with __func__. [1]
o Use driver_filter_t in prototypes where appropriate.
o Add my copyright to creator(4), fhc(4), nexus(4), psycho(4) and
  sbus(4) as I changed considerable amounts of these drivers as well
  as added a bunch of new features, workarounds for silicon bugs etc.
o Fix some white space nits.

Due to lack of access to Exx00 hardware, these changes, i.e. central(4)
and fhc(4), couldn't be runtime tested on such a machine. Exx00 are
currently reported to panic before trying to attach nexus(4) anyway
though.

PR:		76052 [1]
Approved by:	re (kensmith)

4 files changed, 126 insertions, 354 deletions

diff --git a/sys/sparc64/fhc/fhc.c b/sys/sparc64/fhc/fhc.c
index a7972c8..d3c0e28 100644
--- a/sys/sparc64/fhc/fhc.c
+++ b/sys/sparc64/fhc/fhc.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2003 Jake Burkholder.
+ * Copyright (c) 2005 Marius Strobl <marius@FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,6 +33,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/bus.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
+#include <sys/module.h>
 #include <sys/pcpu.h>
 
 #include <dev/led/led.h>
@@ -46,7 +48,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/rman.h>
 
 #include <sparc64/fhc/fhcreg.h>
-#include <sparc64/fhc/fhcvar.h>
 #include <sparc64/sbus/ofw_sbus.h>
 
 struct fhc_clr {
@@ -62,18 +63,87 @@ struct fhc_devinfo {
 	struct resource_list	fdi_rl;
 };
 
-static int fhc_intr_stub(void *);
+struct fhc_softc {
+	struct resource *	sc_memres[FHC_NREG];
+	bus_space_handle_t	sc_bh[FHC_NREG];
+	bus_space_tag_t		sc_bt[FHC_NREG];
+	int			sc_nrange;
+	struct sbus_ranges	*sc_ranges;
+	uint32_t		sc_board;
+	int			sc_ign;
+	struct cdev		*sc_led_dev;
+	int			sc_flags;
+#define	FHC_CENTRAL		(1 << 0)
+};
+
+static device_probe_t fhc_probe;
+static device_attach_t fhc_attach;
+static bus_print_child_t fhc_print_child;
+static bus_probe_nomatch_t fhc_probe_nomatch;
+static bus_setup_intr_t fhc_setup_intr;
+static bus_teardown_intr_t fhc_teardown_intr;
+static bus_alloc_resource_t fhc_alloc_resource;
+static bus_get_resource_list_t fhc_get_resource_list;
+static ofw_bus_get_devinfo_t fhc_get_devinfo;
+
+static driver_filter_t fhc_intr_stub;
 static void fhc_led_func(void *, int);
 static int fhc_print_res(struct fhc_devinfo *);
 
-int
+static device_method_t fhc_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		fhc_probe),
+	DEVMETHOD(device_attach,	fhc_attach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child,	fhc_print_child),
+	DEVMETHOD(bus_probe_nomatch,	fhc_probe_nomatch),
+	DEVMETHOD(bus_setup_intr,	fhc_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	fhc_teardown_intr),
+	DEVMETHOD(bus_alloc_resource,	fhc_alloc_resource),
+	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
+	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_get_resource_list, fhc_get_resource_list),
+	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
+
+	/* ofw_bus interface */
+	DEVMETHOD(ofw_bus_get_devinfo,	fhc_get_devinfo),
+	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
+	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
+	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
+	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
+	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
+
+	{ NULL, NULL }
+};
+
+static driver_t fhc_driver = {
+	"fhc",
+	fhc_methods,
+	sizeof(struct fhc_softc),
+};
+
+static devclass_t fhc_devclass;
+
+DRIVER_MODULE(fhc, central, fhc_driver, fhc_devclass, 0, 0);
+DRIVER_MODULE(fhc, nexus, fhc_driver, fhc_devclass, 0, 0);
+
+static int
 fhc_probe(device_t dev)
 {
 
-	return (0);
+	if (strcmp(ofw_bus_get_name(dev), "fhc") == 0) {
+		device_set_desc(dev, "fhc");
+		return (0);
+	}
+	return (ENXIO);
 }
 
-int
+static int
 fhc_attach(device_t dev)
 {
 	char ledname[sizeof("boardXX")];
@@ -83,16 +153,48 @@ fhc_attach(device_t dev)
 	phandle_t child;
 	phandle_t node;
 	device_t cdev;
+	uint32_t board;
 	uint32_t ctrl;
 	uint32_t *intr;
 	uint32_t iv;
 	char *name;
+	int error;
+	int i;
 	int nintr;
 	int nreg;
-	int i;
+	int rid;
 
 	sc = device_get_softc(dev);
-	node = sc->sc_node;
+	node = ofw_bus_get_node(dev);
+
+	if (strcmp(device_get_name(device_get_parent(dev)), "central") == 0)
+		sc->sc_flags |= FHC_CENTRAL;
+
+	for (i = 0; i < FHC_NREG; i++) {
+		rid = i;
+		sc->sc_memres[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
+		    &rid, RF_ACTIVE);
+		if (sc->sc_memres[i] == NULL) {
+			device_printf(dev, "cannot allocate resource %d\n", i);
+			error = ENXIO;
+			goto fail_memres;
+		}
+		sc->sc_bt[i] = rman_get_bustag(sc->sc_memres[i]);
+		sc->sc_bh[i] = rman_get_bushandle(sc->sc_memres[i]);
+	}
+
+	if ((sc->sc_flags & FHC_CENTRAL) != 0) {
+		board = bus_space_read_4(sc->sc_bt[FHC_INTERNAL],
+		    sc->sc_bh[FHC_INTERNAL], FHC_BSR);
+		sc->sc_board = ((board >> 16) & 0x1) | ((board >> 12) & 0xe);
+	} else {
+		if (OF_getprop(node, "board#", &sc->sc_board,
+		    sizeof(sc->sc_board)) == -1) {
+			device_printf(dev, "cannot get board number\n");
+			error = ENXIO;
+			goto fail_memres;
+		}
+	}
 
 	device_printf(dev, "board %d, ", sc->sc_board);
 	if (OF_getprop_alloc(node, "board-model", 1, (void **)&name) != -1) {
@@ -125,8 +227,9 @@ fhc_attach(device_t dev)
 	sc->sc_nrange = OF_getprop_alloc(node, "ranges",
 	    sizeof(*sc->sc_ranges), (void **)&sc->sc_ranges);
 	if (sc->sc_nrange == -1) {
-		device_printf(dev, "can't get ranges\n");
-		return (ENXIO);
+		device_printf(dev, "cannot get ranges\n");
+		error = ENXIO;
+		goto fail_memres;
 	}
 
 	if ((sc->sc_flags & FHC_CENTRAL) == 0) {
@@ -179,9 +282,16 @@ fhc_attach(device_t dev)
 	}
 
 	return (bus_generic_attach(dev));
+
+ fail_memres:
+	for (i = 0; i < FHC_NREG; i++)
+		if (sc->sc_memres[i] != NULL)
+			bus_release_resource(dev, SYS_RES_MEMORY,
+			    rman_get_rid(sc->sc_memres[i]), sc->sc_memres[i]);
+ 	return (error);
 }
 
-int
+static int
 fhc_print_child(device_t dev, device_t child)
 {
 	int rv;
@@ -192,7 +302,7 @@ fhc_print_child(device_t dev, device_t child)
 	return (rv);
 }
 
-void
+static void
 fhc_probe_nomatch(device_t dev, device_t child)
 {
 	const char *type;
@@ -204,7 +314,7 @@ fhc_probe_nomatch(device_t dev, device_t child)
 	    type != NULL ? type : "unknown");
 }
 
-int
+static int
 fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags,
     driver_filter_t *filt, driver_intr_t *func, void *arg, void **cookiep)
 {
@@ -269,7 +379,7 @@ fhc_setup_intr(device_t bus, device_t child, struct resource *r, int flags,
 	return (error);
 }
 
-int
+static int
 fhc_teardown_intr(device_t bus, device_t child, struct resource *r,
     void *cookie)
 {
@@ -295,7 +405,7 @@ fhc_intr_stub(void *arg)
 	return (FILTER_HANDLED);
 }
 
-struct resource *
+static struct resource *
 fhc_alloc_resource(device_t bus, device_t child, int type, int *rid,
     u_long start, u_long end, u_long count, u_int flags)
 {
@@ -354,7 +464,7 @@ fhc_alloc_resource(device_t bus, device_t child, int type, int *rid,
 	return (res);
 }
 
-struct resource_list *
+static struct resource_list *
 fhc_get_resource_list(device_t bus, device_t child)
 {
 	struct fhc_devinfo *fdi;
@@ -363,7 +473,7 @@ fhc_get_resource_list(device_t bus, device_t child)
 	return (&fdi->fdi_rl);
 }
 
-const struct ofw_bus_devinfo *
+static const struct ofw_bus_devinfo *
 fhc_get_devinfo(device_t bus, device_t child)
 {
 	struct fhc_devinfo *fdi;
diff --git a/sys/sparc64/fhc/fhc_central.c b/sys/sparc64/fhc/fhc_central.c
deleted file mode 100644
index dfde113..0000000
--- a/sys/sparc64/fhc/fhc_central.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- */
-
-#include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-
-#include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <sys/rman.h>
-
-#include <sparc64/fhc/fhcreg.h>
-#include <sparc64/fhc/fhcvar.h>
-
-static device_probe_t fhc_central_probe;
-static device_attach_t fhc_central_attach;
-
-static device_method_t fhc_central_methods[] = {
-	/* Device interface. */
-	DEVMETHOD(device_probe,		fhc_central_probe),
-	DEVMETHOD(device_attach,	fhc_central_attach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
-	/* Bus interface. */
-	DEVMETHOD(bus_print_child,	fhc_print_child),
-	DEVMETHOD(bus_probe_nomatch,	fhc_probe_nomatch),
-	DEVMETHOD(bus_setup_intr,	fhc_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	fhc_teardown_intr),
-	DEVMETHOD(bus_alloc_resource,	fhc_alloc_resource),
-	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	DEVMETHOD(bus_get_resource_list, fhc_get_resource_list),
-	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
-
-	/* ofw_bus interface */
-	DEVMETHOD(ofw_bus_get_devinfo,	fhc_get_devinfo),
-	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
-	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
-	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
-	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
-	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
-
-	{ NULL, NULL }
-};
-
-static driver_t fhc_central_driver = {
-	"fhc",
-	fhc_central_methods,
-	sizeof(struct fhc_softc),
-};
-
-static devclass_t fhc_central_devclass;
-
-DRIVER_MODULE(fhc, central, fhc_central_driver, fhc_central_devclass, 0, 0);
-
-static int
-fhc_central_probe(device_t dev)
-{
-
-	if (strcmp(ofw_bus_get_name(dev), "fhc") == 0) {
-		device_set_desc(dev, "fhc");
-		return (fhc_probe(dev));
-	}
-	return (ENXIO);
-}
-
-static int
-fhc_central_attach(device_t dev)
-{
-	struct fhc_softc *sc;
-	phandle_t node;
-	int board;
-	int rid;
-	int i;
-
-	sc = device_get_softc(dev);
-	node = ofw_bus_get_node(dev);
-	sc->sc_node = node;
-	sc->sc_flags |= FHC_CENTRAL;
-
-	for (i = 0; i < FHC_NREG; i++) {
-		rid = i;
-		sc->sc_memres[i] = bus_alloc_resource_any(dev, SYS_RES_MEMORY,
-		    &rid, RF_ACTIVE);
-		if (sc->sc_memres[i] == NULL)
-			panic("%s: can't allocate registers", __func__);
-		sc->sc_bt[i] = rman_get_bustag(sc->sc_memres[i]);
-		sc->sc_bh[i] = rman_get_bushandle(sc->sc_memres[i]);
-	}
-
-	board = bus_space_read_4(sc->sc_bt[FHC_INTERNAL],
-	    sc->sc_bh[FHC_INTERNAL], FHC_BSR);
-	sc->sc_board = ((board >> 16) & 0x1) | ((board >> 12) & 0xe);
-
-	return (fhc_attach(dev));
-}
diff --git a/sys/sparc64/fhc/fhc_nexus.c b/sys/sparc64/fhc/fhc_nexus.c
deleted file mode 100644
index 0a04065..0000000
--- a/sys/sparc64/fhc/fhc_nexus.c
+++ /dev/null
@@ -1,147 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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.
- */
-
-#include <sys/cdefs.h>                                                         
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/ofw_bus_subr.h>
-#include <dev/ofw/openfirm.h>
-
-#include <machine/bus.h>
-#include <machine/ofw_upa.h>
-#include <machine/nexusvar.h>
-#include <machine/resource.h>
-
-#include <sys/rman.h>
-
-#include <sparc64/fhc/fhcreg.h>
-#include <sparc64/fhc/fhcvar.h>
-
-static device_probe_t fhc_nexus_probe;
-static device_attach_t fhc_nexus_attach;
-
-static device_method_t fhc_nexus_methods[] = {
-	/* Device interface. */
-	DEVMETHOD(device_probe,		fhc_nexus_probe),
-	DEVMETHOD(device_attach,	fhc_nexus_attach),
-	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
-	DEVMETHOD(device_suspend,	bus_generic_suspend),
-	DEVMETHOD(device_resume,	bus_generic_resume),
-
-	/* Bus interface. */
-	DEVMETHOD(bus_print_child,	fhc_print_child),
-	DEVMETHOD(bus_probe_nomatch,	fhc_probe_nomatch),
-	DEVMETHOD(bus_setup_intr,	fhc_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	fhc_teardown_intr),
-	DEVMETHOD(bus_alloc_resource,	fhc_alloc_resource),
-	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
-	DEVMETHOD(bus_get_resource_list, fhc_get_resource_list),
-	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
-
-        /* ofw_bus interface */
-	DEVMETHOD(ofw_bus_get_devinfo,	fhc_get_devinfo),
-	DEVMETHOD(ofw_bus_get_compat,	ofw_bus_gen_get_compat),
-	DEVMETHOD(ofw_bus_get_model,	ofw_bus_gen_get_model),
-	DEVMETHOD(ofw_bus_get_name,	ofw_bus_gen_get_name),
-	DEVMETHOD(ofw_bus_get_node,	ofw_bus_gen_get_node),
-	DEVMETHOD(ofw_bus_get_type,	ofw_bus_gen_get_type),
-
-	{ NULL, NULL }
-};
-
-static driver_t fhc_nexus_driver = {
-	"fhc",
-	fhc_nexus_methods,
-	sizeof(struct fhc_softc),
-};
-
-static devclass_t fhc_nexus_devclass;
-
-DRIVER_MODULE(fhc, nexus, fhc_nexus_driver, fhc_nexus_devclass, 0, 0);
-
-static int
-fhc_nexus_probe(device_t dev)
-{
-
-	if (strcmp(nexus_get_name(dev), "fhc") == 0) {
-		device_set_desc(dev, "fhc");
-		return (fhc_probe(dev));
-	}
-	return (ENXIO);
-}
-
-static int
-fhc_nexus_attach(device_t dev)
-{
-	struct fhc_softc *sc;
-	struct upa_regs *reg;
-	bus_addr_t phys;
-	bus_addr_t size;
-	phandle_t node;
-	int nreg;
-	int rid;
-	int i;
-
-	sc = device_get_softc(dev);
-	node = nexus_get_node(dev);
-	sc->sc_node = node;
-
-	reg = nexus_get_reg(dev);
-	nreg = nexus_get_nreg(dev);
-	if (nreg != FHC_NREG) {
-		device_printf(dev, "wrong number of regs\n");
-		return (ENXIO);
-	}
-	for (i = 0; i < nreg; i++) {
-		phys = UPA_REG_PHYS(reg + i);
-		size = UPA_REG_SIZE(reg + i);
-		rid = 0;
-		sc->sc_memres[i] = bus_alloc_resource(dev, SYS_RES_MEMORY,
-		    &rid, phys, phys + size - 1, size, RF_ACTIVE);
-		if (sc->sc_memres[i] == NULL)
-			panic("%s: can't allocate registers", __func__);
-		sc->sc_bt[i] = rman_get_bustag(sc->sc_memres[i]);
-		sc->sc_bh[i] = rman_get_bushandle(sc->sc_memres[i]);
-	}
-
-	if (OF_getprop(node, "board#", &sc->sc_board,
-	    sizeof(sc->sc_board)) == -1) {
-		device_printf(dev, "could not get board number\n");
-		return (ENXIO);
-	}
-
-	return (fhc_attach(dev));
-}
diff --git a/sys/sparc64/fhc/fhcvar.h b/sys/sparc64/fhc/fhcvar.h
deleted file mode 100644
index a79b847..0000000
--- a/sys/sparc64/fhc/fhcvar.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * Copyright (c) 2003 Jake Burkholder.
- * 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 _SPARC64_FHC_FHCVAR_H_
-#define	_SPARC64_FHC_FHCVAR_H_
-
-#define	FHC_CENTRAL		(1<<0)
-
-struct fhc_softc {
-	phandle_t		sc_node;
-	struct resource *	sc_memres[FHC_NREG];
-	bus_space_handle_t	sc_bh[FHC_NREG];
-	bus_space_tag_t		sc_bt[FHC_NREG];
-	int			sc_nrange;
-	struct sbus_ranges	*sc_ranges;
-	int			sc_board;
-	int			sc_ign;
-	int			sc_flags;
-	struct cdev		*sc_led_dev;
-};
-
-device_probe_t fhc_probe;
-device_attach_t fhc_attach;
-
-bus_print_child_t fhc_print_child;
-bus_probe_nomatch_t fhc_probe_nomatch;
-bus_setup_intr_t fhc_setup_intr;
-bus_teardown_intr_t fhc_teardown_intr;
-bus_alloc_resource_t fhc_alloc_resource;
-bus_get_resource_list_t fhc_get_resource_list;
-
-ofw_bus_get_devinfo_t fhc_get_devinfo;
-
-#endif /* !_SPARC64_FHC_FHCVAR_H_ */