8 files changed, 238 insertions, 700 deletions

diff --git a/sys/dev/bhnd/bcma/bcma.c b/sys/dev/bhnd/bcma/bcma.c
index 4e7837676576..b9bfbad5e411 100644
--- a/sys/dev/bhnd/bcma/bcma.c
+++ b/sys/dev/bhnd/bcma/bcma.c
@@ -98,8 +98,9 @@ bcma_attach(device_t dev)
 		r_end = r_start + r_count - 1;
 
 		dinfo->rid_agent = i + 1;
-		dinfo->res_agent = bhnd_alloc_resource(dev, SYS_RES_MEMORY,
-		    &dinfo->rid_agent, r_start, r_end, r_count, RF_ACTIVE);
+		dinfo->res_agent = BHND_BUS_ALLOC_RESOURCE(dev, dev,
+		    SYS_RES_MEMORY, &dinfo->rid_agent, r_start, r_end, r_count,
+		    RF_ACTIVE);
 		if (dinfo->res_agent == NULL) {
 			device_printf(dev, "failed allocating agent register "
 			    "block for core %d\n", i);
diff --git a/sys/dev/bhnd/bcma/bcma_nexus.c b/sys/dev/bhnd/bcma/bcma_nexus.c
index 241e5d1a4f5d..7cc8c2659757 100644
--- a/sys/dev/bhnd/bcma/bcma_nexus.c
+++ b/sys/dev/bhnd/bcma/bcma_nexus.c
@@ -1,5 +1,6 @@
 /*-
  * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
+ * Copyright (c) 2015-2016 Landon Fuller <landon@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +26,8 @@
  * 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 DAMAGES.
+ * 
+ * $FreeBSD$
  */
 
 #include <sys/cdefs.h>
@@ -34,78 +37,102 @@ __FBSDID("$FreeBSD$");
 #include <sys/kernel.h>
 #include <sys/bus.h>
 #include <sys/module.h>
-#include <sys/errno.h>
 
 #include <machine/bus.h>
+#include <sys/rman.h>
 #include <machine/resource.h>
 
-#include <dev/bhnd/bhnd.h>
+#include <dev/bhnd/bhnd_ids.h>
+#include <dev/bhnd/bhnd_nexusvar.h>
+#include <dev/bhnd/cores/chipc/chipcreg.h>
 
-#include "bhnd_bus_if.h"
 #include "bcmavar.h"
 #include "bcma_eromreg.h"
 
-#define	BCMA_NEXUS_EROM_RID	10
+/*
+ * Supports bcma(4) attachment to a nexus bus.
+ */
+
+static int	bcma_nexus_attach(device_t);
+static int	bcma_nexus_probe(device_t);
+
+struct bcma_nexus_softc {
+	struct bcma_softc		parent_sc;
+	struct bhnd_chipid		bcma_cid;
+};
 
 static int
 bcma_nexus_probe(device_t dev)
 {
-	const struct bhnd_chipid *cid = BHND_BUS_GET_CHIPID(device_get_parent(dev), dev);
+	struct bcma_nexus_softc	*sc;
+	int			 error;
+
+	sc = device_get_softc(dev);
+
+	/* Read the ChipCommon info using the hints the kernel
+	 * was compiled with. */
+	if ((error = bhnd_nexus_read_chipid(dev, &sc->bcma_cid)))
+		return (error);
 
-	/* Check bus type */
-	if (cid->chip_type != BHND_CHIPTYPE_BCMA)
+	if (sc->bcma_cid.chip_type != BHND_CHIPTYPE_BCMA)
 		return (ENXIO);
 
-	/* Delegate to default probe implementation */
-	return (bcma_probe(dev));
+	if ((error = bcma_probe(dev)) > 0) {
+		device_printf(dev, "error %d in probe\n", error);
+		return (error);
+	}
+
+	return (0);
 }
 
 static int
 bcma_nexus_attach(device_t dev)
 {
-	int 		 erom_rid;
-	int 		 error;
-	struct resource	*erom_res;
-	const struct bhnd_chipid *cid = BHND_BUS_GET_CHIPID(device_get_parent(dev), dev);
+	struct bcma_nexus_softc	*sc;
+	struct resource		*erom_res;
+	int			 error;
+	int			 rid;
+
+	sc = device_get_softc(dev);
 
-  	erom_rid = BCMA_NEXUS_EROM_RID;
- 	error = bus_set_resource(dev, SYS_RES_MEMORY, erom_rid, cid->enum_addr, BCMA_EROM_TABLE_SIZE);
- 	if (error != 0) {
- 		BHND_ERROR_DEV(dev, "failed to set EROM resource");
- 		return (error);
- 	}
+	/* Map the EROM resource and enumerate the bus. */
+	rid = 0;
+	erom_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
+	    sc->bcma_cid.enum_addr, 
+	    sc->bcma_cid.enum_addr + BCMA_EROM_TABLE_SIZE,
+	    BCMA_EROM_TABLE_SIZE, RF_ACTIVE);
+	if (erom_res == NULL) {
+		device_printf(dev, "failed to allocate EROM resource\n");
+		return (ENXIO);
+	}
 
- 	/* Map the EROM resource and enumerate our children. */
- 	BHND_DEBUG_DEV(dev, "erom enum address: %jx", cid->enum_addr);
- 	erom_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &erom_rid, RF_ACTIVE);
- 	if (erom_res == NULL) {
- 		BHND_ERROR_DEV(dev, "failed to allocate EROM resource");
- 		return (ENXIO);
- 	}
+	error = bcma_add_children(dev, erom_res, BCMA_EROM_TABLE_START);
+	bus_release_resource(dev, SYS_RES_MEMORY, rid, erom_res);
 
- 	BHND_DEBUG_DEV(dev, "erom scanning start address: %p", rman_get_virtual(erom_res));
- 	error = bcma_add_children(dev, erom_res, BCMA_EROM_TABLE_START);
+	if (error)
+		return (error);
 
- 	/* Clean up */
- 	bus_release_resource(dev, SYS_RES_MEMORY, erom_rid, erom_res);
- 	if (error)
- 		return (error);
+	return (bcma_attach(dev));
+}
 
- 	/* Call our superclass' implementation */
- 	return (bcma_attach(dev));
+static const struct bhnd_chipid *
+bcma_nexus_get_chipid(device_t dev, device_t child) {
+	struct bcma_nexus_softc	*sc = device_get_softc(dev);
+	return (&sc->bcma_cid);
 }
 
 static device_method_t bcma_nexus_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,			bcma_nexus_probe),
 	DEVMETHOD(device_attach,		bcma_nexus_attach),
+
+	/* bhnd interface */
+	DEVMETHOD(bhnd_bus_get_chipid,		bcma_nexus_get_chipid),
+
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_1(bhnd, bcma_nexus_driver, bcma_nexus_methods, sizeof(struct bcma_softc), bcma_driver);
-EARLY_DRIVER_MODULE(bcma_nexus, bhnd_soc, bcma_nexus_driver, bhnd_devclass,
-    NULL, NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);
+DEFINE_CLASS_2(bhnd, bcma_nexus_driver, bcma_nexus_methods,
+    sizeof(struct bcma_nexus_softc), bhnd_nexus_driver, bcma_driver);
 
-MODULE_VERSION(bcma_nexus, 1);
-MODULE_DEPEND(bcma_nexus, bcma, 1, 1, 1);
-MODULE_DEPEND(bcma_nexus, bhnd_soc, 1, 1, 1);
+DRIVER_MODULE(bcma_nexus, nexus, bcma_nexus_driver, bhnd_devclass, 0, 0);
diff --git a/sys/dev/bhnd/bhnd_nexus.c b/sys/dev/bhnd/bhnd_nexus.c
new file mode 100644
index 000000000000..a7bb36e8c25a
--- /dev/null
+++ b/sys/dev/bhnd/bhnd_nexus.c
@@ -0,0 +1,120 @@
+/*-
+ * Copyright (c) 2015-2016 Landon Fuller <landon@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,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
+ *    redistribution must be conditioned upon including a substantially
+ *    similar Disclaimer requirement for further binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+ * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
+ * 
+ * $FreeBSD$
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+
+/*
+ * bhnd(4) driver mix-in providing shared common methods for
+ * bhnd bus devices attached via a root nexus.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/rman.h>
+#include <sys/malloc.h>
+
+#include <machine/bus.h>
+
+#include <dev/bhnd/bhnd_ids.h>
+#include <dev/bhnd/cores/chipc/chipcreg.h>
+
+#include "bhnd_nexusvar.h"
+
+static const struct resource_spec bhnd_nexus_res_spec[] = {
+	{ SYS_RES_MEMORY,	0,	RF_ACTIVE },	/* chipc registers */
+	{ -1,			0,	0 }
+};
+
+/**
+ * Map ChipCommon's register block and read the chip identifier data.
+ * 
+ * @param dev A bhnd_nexus device.
+ * @param chipid On success, will be populated with the chip identifier.
+ * @retval 0 success
+ * @retval non-zero An error occurred reading the chip identifier..
+ */
+int
+bhnd_nexus_read_chipid(device_t dev, struct bhnd_chipid *chipid)
+{
+	struct resource_spec	rspec[nitems(bhnd_nexus_res_spec)];
+	int			error;
+
+	memcpy(rspec, bhnd_nexus_res_spec, sizeof(rspec));
+	error = bhnd_read_chipid(dev, rspec, 0, chipid);
+	if (error)
+		device_printf(dev, "error %d reading chip ID\n", error);
+
+	return (error);
+}
+
+static bool
+bhnd_nexus_is_hw_disabled(device_t dev, device_t child)
+{
+	return false;
+}
+
+static bhnd_attach_type
+bhnd_nexus_get_attach_type(device_t dev, device_t child)
+{
+	return (BHND_ATTACH_NATIVE);
+}
+
+static int
+bhnd_nexus_activate_resource(device_t dev, device_t child, int type, int rid,
+    struct bhnd_resource *r)
+{
+	int error;
+
+	/* Always direct */
+	if ((error = bus_activate_resource(child, type, rid, r->res)))
+		return (error);
+
+	r->direct = true;
+	return (0);
+}
+
+
+static device_method_t bhnd_nexus_methods[] = {
+	/* bhnd interface */
+	DEVMETHOD(bhnd_bus_activate_resource,	bhnd_nexus_activate_resource),
+	DEVMETHOD(bhnd_bus_is_hw_disabled,	bhnd_nexus_is_hw_disabled),
+	DEVMETHOD(bhnd_bus_get_attach_type,	bhnd_nexus_get_attach_type),
+
+	DEVMETHOD_END
+};
+
+DEFINE_CLASS_0(bhnd, bhnd_nexus_driver, bhnd_nexus_methods,
+    sizeof(struct bhnd_softc));
diff --git a/sys/dev/bhnd/soc/bhnd_soc.h b/sys/dev/bhnd/bhnd_nexusvar.h
index 12b9d0e4eee3..e52595b1bad7 100644
--- a/sys/dev/bhnd/soc/bhnd_soc.h
+++ b/sys/dev/bhnd/bhnd_nexusvar.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
+ * Copyright (c) 2016 Landon Fuller <landon@freebsd.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,27 +25,22 @@
  * 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 DAMAGES.
- */
-
-/*
+ * 
  * $FreeBSD$
  */
-#ifndef _BHND_SOC_BHND_SOC_H_
-#define _BHND_SOC_BHND_SOC_H_
 
-#define	BHND_SOC_MAXNUM_CORES	0x20
-#define	BHND_SOC_RAM_OFFSET	0x0
-#define	BHND_SOC_RAM_SIZE	0x20000000
+#ifndef _BHND_BHND_NEXUSVAR_H_
+#define _BHND_BHND_NEXUSVAR_H_
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/module.h>
+
+#include "bhndvar.h"
 
-struct bhnd_soc_softc {
-	device_t dev;
-	device_t bridge;
-	device_t bus;
-	struct bhnd_chipid	chipid;	/* chip identification */
-};
+DECLARE_CLASS(bhnd_nexus_driver);
 
-struct bhnd_soc_devinfo {
-	struct resource_list resources;
-};
+int	bhnd_nexus_read_chipid(device_t dev, struct bhnd_chipid *chipid);
 
-#endif /* _BHND_SOC_BHND_SOC_H_ */
+#endif /* _BHND_BHND_NEXUSVAR_H_ */
diff --git a/sys/dev/bhnd/siba/siba.c b/sys/dev/bhnd/siba/siba.c
index a508d3b39ae9..bd3af182f760 100644
--- a/sys/dev/bhnd/siba/siba.c
+++ b/sys/dev/bhnd/siba/siba.c
@@ -114,7 +114,7 @@ siba_attach(device_t dev)
 
 			/* Allocate the config resource */
 			dinfo->cfg_rid[cfgidx] = 0;
-			dinfo->cfg[cfgidx] = bhnd_alloc_resource(dev,
+			dinfo->cfg[cfgidx] = BHND_BUS_ALLOC_RESOURCE(dev, dev,
 			    SYS_RES_MEMORY, &dinfo->cfg_rid[cfgidx], r_start,
 			    r_end, r_count, RF_ACTIVE);
 	
@@ -458,10 +458,6 @@ siba_register_addrspaces(device_t dev, struct siba_devinfo *di,
 		/* Fetch the address match register value */
 		adm = bus_read_4(r, adm_offset);
 
-		/* Skip disabled entries */
-		if (adm & SIBA_AM_ADEN)
-			continue;
-			
 		/* Parse the value */
 		if ((error = siba_parse_admatch(adm, &addr, &size))) {
 			device_printf(dev, "failed to decode address "
@@ -551,7 +547,7 @@ siba_add_children(device_t dev, const struct bhnd_chipid *chipid)
 		ccid = bhnd_parse_chipid(ccreg, SIBA_ENUM_ADDR);
 
 		if (!CHIPC_NCORES_MIN_HWREV(ccrev)) {
-			switch (device) {
+			switch (ccid.chip_id) {
 			case BHND_CHIPID_BCM4306:
 				ccid.ncores = 6;
 				break;
diff --git a/sys/dev/bhnd/siba/siba_nexus.c b/sys/dev/bhnd/siba/siba_nexus.c
index d951b172b0e6..9b5e87ebdeae 100644
--- a/sys/dev/bhnd/siba/siba_nexus.c
+++ b/sys/dev/bhnd/siba/siba_nexus.c
@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2015-2016 Landon Fuller <landon@freebsd.org>
  * Copyright (c) 2007 Bruce M. Simpson.
  * All rights reserved.
  *
@@ -28,217 +29,50 @@
 __FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/bus.h>
 #include <sys/kernel.h>
+#include <sys/bus.h>
 #include <sys/module.h>
-#include <sys/rman.h>
-#include <sys/malloc.h>
 
 #include <machine/bus.h>
+#include <sys/rman.h>
+#include <machine/resource.h>
 
 #include <dev/bhnd/bhnd_ids.h>
-#include <dev/bhnd/cores/bhnd_chipcreg.h>
+#include <dev/bhnd/bhnd_nexusvar.h>
+#include <dev/bhnd/cores/chipc/chipcreg.h>
 
-#include "sibareg.h"
 #include "sibavar.h"
 
 /*
  * Supports siba(4) attachment to a MIPS nexus bus.
  * 
- * This driver is a direct port of Bruce M. Simpson' original siba(4) to the
- * bhnd(4) bus infrastructure.
+ * Derived from Bruce M. Simpson' original siba(4) driver.
  */
 
-/*
- * TODO: De-mipsify this code.
- * TODO: cpu clock calculation. -> move to siba_cc instance
- * TODO: Hardwire IRQs for attached cores on siba at probe time.
- * TODO: Support detach.
- * TODO: Power management.
- * TODO: code cleanup.
- * TODO: Support deployments of siba other than as a system bus.
- */
-
-#ifndef MIPS_MEM_RID
-#define MIPS_MEM_RID 0x20
-#endif
-
-extern int rman_debug;
-
-static struct rman mem_rman; 	/* XXX move to softc */
-
-static int siba_debug = 1;
-static const char descfmt[] = "Sonics SiliconBackplane rev %s";
-#define SIBA_DEVDESCLEN sizeof(descfmt) + 8
-
-static int	siba_nexus_activate_resource(device_t, device_t, int, int,
-		    struct resource *);
-static struct resource *
-		siba_nexus_alloc_resource(device_t, device_t, int, int *,
-		    rman_res_t, rman_res_t, rman_res_t, u_int);
-static int	siba_nexus_attach(device_t);
-#ifdef notyet
-static uint8_t	siba_nexus_getirq(uint16_t);
-#endif
-static int	siba_nexus_probe(device_t);
-
 struct siba_nexus_softc {
 	struct siba_softc		parent_sc;
-
-	device_t			siba_dev;	/* Device ID */
 	struct bhnd_chipid		siba_cid;
-	struct resource			*siba_mem_res;
-	bus_space_tag_t			siba_mem_bt;
-	bus_space_handle_t		siba_mem_bh;
-	bus_addr_t			siba_maddr;
-	bus_size_t			siba_msize;
 };
 
-// TODO - depends on bhnd(4) IRQ support
-#ifdef notyet
-/*
- * On the Sentry5, the system bus IRQs are the same as the
- * MIPS IRQs. Particular cores are hardwired to certain IRQ lines.
- */
-static uint8_t
-siba_nexus_getirq(uint16_t devid)
-{
-	uint8_t irq;
-
-	switch (devid) {
-	case BHND_COREID_CC:
-		irq = 0;
-		break;
-	case BHND_COREID_ENET:
-		irq = 1;
-		break;
-	case BHND_COREID_IPSEC:
-		irq = 2;
-		break;
-	case BHND_COREID_USB:
-		irq = 3;
-		break;
-	case BHND_COREID_PCI:
-		irq = 4;
-		break;
-#if 0
-	/*
-	 * 5 is reserved for the MIPS on-chip timer interrupt;
-	 * it is hard-wired by the tick driver.
-	 */
-	case BHND_COREID_MIPS:
-	case BHND_COREID_MIPS33:
-		irq = 5;
-		break;
-#endif
-	default:
-		irq = 0xFF;	/* this core does not need an irq */
-		break;
-	}
-
-	return (irq);
-}
-#endif
-
 static int
 siba_nexus_probe(device_t dev)
 {
-	struct siba_nexus_softc *sc = device_get_softc(dev);
-	struct bhnd_core_info cc;
-	uint32_t idhi, idlo;
-	int error, rid;
+	struct siba_nexus_softc	*sc;
+	int			 error;
 
-	sc->siba_dev = dev;
+	sc = device_get_softc(dev);
 
-	//rman_debug = 1;	/* XXX */
-
-	/*
-	 * Read the ChipCommon info using the hints the kernel
-	 * was compiled with.
-	 */
-	rid = MIPS_MEM_RID;
-	sc->siba_mem_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid,
-	    RF_ACTIVE);
-	if (sc->siba_mem_res == NULL) {
-		device_printf(dev, "unable to allocate probe aperture\n");
-		return (ENXIO);
-	}
-	sc->siba_mem_bt = rman_get_bustag(sc->siba_mem_res);
-	sc->siba_mem_bh = rman_get_bushandle(sc->siba_mem_res);
-	sc->siba_maddr = rman_get_start(sc->siba_mem_res);
-	sc->siba_msize = rman_get_size(sc->siba_mem_res);
-
-	if (siba_debug) {
-		device_printf(dev, "start %08x len %08x\n",
-		    sc->siba_maddr, sc->siba_msize);
-	}
-
-	idlo = bus_read_4(sc->siba_mem_res, SIBA_IDLOW);
-	idhi = bus_read_4(sc->siba_mem_res, SIBA_IDHIGH);
-	cc = siba_parse_core_info(idhi, 0, 0);
-
-	if (siba_debug) {
-		device_printf(dev, "idhi = %08x\n", idhi);
-		device_printf(dev, " chipcore id = %08x\n", cc.device);
-	}
+	/* Read the ChipCommon info using the hints the kernel
+	 * was compiled with. */
+	if ((error = bhnd_nexus_read_chipid(dev, &sc->siba_cid)))
+		return (error);
 
-	/*
-	 * For now, check that the first core is the ChipCommon core.
-	 */
-	if (bhnd_core_class(&cc) != BHND_DEVCLASS_CC) {
-		if (siba_debug)
-			device_printf(dev, "first core is not ChipCommon\n");
+	if (sc->siba_cid.chip_type != BHND_CHIPTYPE_SIBA)
 		return (ENXIO);
-	}
 
-	/*
-	 * Determine backplane revision and set description string.
-	 */
-	uint32_t rev;
-	char *revp;
-	char descbuf[SIBA_DEVDESCLEN];
-
-	rev = SIBA_REG_GET(idlo, IDL_SBREV);
-	revp = "unknown";
-	if (rev == SIBA_IDL_SBREV_2_2)
-		revp = "2.2";
-	else if (rev == SIBA_IDL_SBREV_2_3)
-		revp = "2.3";
-
-	(void)snprintf(descbuf, sizeof(descbuf), descfmt, revp);
-	device_set_desc_copy(dev, descbuf);
-
-	/*
-	 * Determine how many cores are present on this siba bus, so
-	 * that we may map them all.
-	 */
-	uint32_t ccidreg;
-
-	ccidreg = bus_read_4(sc->siba_mem_res, CHIPC_ID);
-	sc->siba_cid = bhnd_parse_chipid(ccidreg, sc->siba_maddr);
-	if (siba_debug) {
-		device_printf(dev, "ccid = %08x, cc_id = %04x, cc_rev = %04x\n",
-		     ccidreg, sc->siba_cid.chip_id, sc->siba_cid.chip_rev);
-	}
-
-	if (sc->siba_cid.ncores == 0)
-		sc->siba_cid.ncores = siba_get_ncores(&sc->siba_cid);
-
-	if (siba_debug) {
-		device_printf(dev, "%d cores detected.\n", sc->siba_cid.ncores);
-	}
-
-	/*
-	 * Now we know how many cores are on this siba, release the
-	 * mapping and allocate a new mapping spanning all cores on the bus.
-	 */
-	rid = MIPS_MEM_RID;
-	error = bus_release_resource(dev, SYS_RES_MEMORY, rid,
-	    sc->siba_mem_res);
-	if (error != 0) {
-		device_printf(dev, "error %d releasing resource\n", error);
-		return (ENXIO);
+	if ((error = siba_probe(dev)) > 0) {
+		device_printf(dev, "error %d in probe\n", error);
+		return (error);
 	}
 
 	return (0);
@@ -247,52 +81,15 @@ siba_nexus_probe(device_t dev)
 static int
 siba_nexus_attach(device_t dev)
 {
-	struct siba_nexus_softc	*sc = device_get_softc(dev);
-	uint32_t total;
-	int error, rid;
+	struct siba_nexus_softc	*sc;
+	int error;
 
-	if (siba_debug)
-		printf("%s: entry\n", __func__);
+	sc = device_get_softc(dev);
 
 	/* Enumerate the bus. */
-	if ((error = siba_add_children(dev, &sc->siba_cid)))
+	if ((error = siba_add_children(dev, NULL))) {
+		device_printf(dev, "error %d enumerating children\n", error);
 		return (error);
-
-	/* Allocate full core aperture */
-	total = sc->siba_cid.ncores;
-	sc->siba_mem_res = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid,
-	    sc->siba_maddr, sc->siba_maddr + total - 1, total, RF_ACTIVE);
-	if (sc->siba_mem_res == NULL) {
-		device_printf(dev, "unable to allocate entire aperture\n");
-		return (ENXIO);
-	}
-	sc->siba_mem_bt = rman_get_bustag(sc->siba_mem_res);
-	sc->siba_mem_bh = rman_get_bushandle(sc->siba_mem_res);
-	sc->siba_maddr = rman_get_start(sc->siba_mem_res);
-	sc->siba_msize = rman_get_size(sc->siba_mem_res);
-
-	if (siba_debug) {
-		device_printf(dev, "after remapping: start %08x len %08x\n",
-		    sc->siba_maddr, sc->siba_msize);
-	}
-	bus_set_resource(dev, SYS_RES_MEMORY, rid, sc->siba_maddr,
-	    sc->siba_msize);
-
-	/*
-	 * We need a manager for the space we claim on nexus to
-	 * satisfy requests from children.
-	 * We need to keep the source reservation we took because
-	 * otherwise it may be claimed elsewhere.
-	 * XXX move to softc
-	 */
-	mem_rman.rm_start = sc->siba_maddr;
-	mem_rman.rm_end = sc->siba_maddr + sc->siba_msize - 1;
-	mem_rman.rm_type = RMAN_ARRAY;
-	mem_rman.rm_descr = "SiBa I/O memory addresses";
-	if (rman_init(&mem_rman) != 0 ||
-	    rman_manage_region(&mem_rman, mem_rman.rm_start,
-		mem_rman.rm_end) != 0) {
-		panic("%s: mem_rman", __func__);
 	}
 
 	return (siba_attach(dev));
@@ -304,150 +101,18 @@ siba_nexus_get_chipid(device_t dev, device_t child) {
 	return (&sc->siba_cid);
 }
 
-static struct resource *
-siba_nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
-    rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
-{
-	struct resource			*rv;
-	struct resource_list		*rl;
-	struct resource_list_entry	*rle;
-	int				 isdefault, needactivate;
-
-#if 0
-	if (siba_debug)
-		printf("%s: entry\n", __func__);
-#endif
-
-	isdefault = (start == 0UL && end == ~0UL && count == 1);
-	needactivate = flags & RF_ACTIVE;
-	rl = BUS_GET_RESOURCE_LIST(bus, child);
-	rle = NULL;
-
-	if (isdefault) {
-		rle = resource_list_find(rl, type, *rid);
-		if (rle == NULL)
-			return (NULL);
-		if (rle->res != NULL)
-			panic("%s: resource entry is busy", __func__);
-		start = rle->start;
-		end = rle->end;
-		count = rle->count;
-	}
-
-	/*
-	 * If the request is for a resource which we manage,
-	 * attempt to satisfy the allocation ourselves.
-	 */
-	if (type == SYS_RES_MEMORY &&
-	    start >= mem_rman.rm_start && end <= mem_rman.rm_end) {
-
-		rv = rman_reserve_resource(&mem_rman, start, end, count,
-		    flags, child);
-		if (rv == 0) {
-			printf("%s: could not reserve resource\n", __func__);
-			return (0);
-		}
-
-		rman_set_rid(rv, *rid);
-
-		if (needactivate) {
-			if (bus_activate_resource(child, type, *rid, rv)) {
-				printf("%s: could not activate resource\n",
-				    __func__);
-				rman_release_resource(rv);
-				return (0);
-			}
-		}
-
-		return (rv);
-	}
-
-	/*
-	 * Pass the request to the parent, usually MIPS nexus.
-	 */
-	if (siba_debug)
-		printf("%s: proxying request to parent\n", __func__);
-	return (resource_list_alloc(rl, bus, child, type, rid,
-	    start, end, count, flags));
-}
-
-/*
- * The parent bus is responsible for resource activation; in the
- * case of MIPS, this boils down to setting the virtual address and
- * bus handle by mapping the physical address into KSEG1.
- */
-static int
-siba_nexus_activate_resource(device_t bus, device_t child, int type, int rid,
-    struct resource *r)
-{
-	return (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), child, type,
-	    rid, r));
-}
-
-// TODO - depends on bhnd(4) IRQ support
-#ifdef notyet
-static struct siba_devinfo *
-siba_nexus_setup_devinfo(device_t dev, uint8_t idx)
-{
-	struct siba_nexus_softc *sc = device_get_softc(dev);
-	struct siba_devinfo *sdi;
-	uint32_t idlo, idhi, rev;
-	uint16_t vendorid, devid;
-	bus_addr_t baseaddr;
-
-	sdi = malloc(sizeof(*sdi), M_DEVBUF, M_WAITOK | M_ZERO);
-	resource_list_init(&sdi->sdi_rl);
-
-	idlo = siba_mips_read_4(sc, idx, SIBA_IDLOW);
-	idhi = siba_mips_read_4(sc, idx, SIBA_IDHIGH);
-
-	vendorid = (idhi & SIBA_IDHIGH_VENDORMASK) >>
-	    SIBA_IDHIGH_VENDOR_SHIFT;
-	devid = ((idhi & 0x8ff0) >> 4);
-	rev = (idhi & SIBA_IDHIGH_REVLO);
-	rev |= (idhi & SIBA_IDHIGH_REVHI) >> SIBA_IDHIGH_REVHI_SHIFT;
-
-	sdi->sdi_vid = vendorid;
-	sdi->sdi_devid = devid;
-	sdi->sdi_rev = rev;
-	sdi->sdi_idx = idx;
-	sdi->sdi_irq = siba_getirq(devid);
-
-	/*
-	 * Determine memory window on bus and irq if one is needed.
-	 */
-	baseaddr = sc->siba_maddr + (idx * SIBA_CORE_SIZE);
-	resource_list_add(&sdi->sdi_rl, SYS_RES_MEMORY,
-	    MIPS_MEM_RID, /* XXX */
-	    baseaddr, baseaddr + SIBA_CORE_LEN - 1, SIBA_CORE_LEN);
-
-	if (sdi->sdi_irq != 0xff) {
-		resource_list_add(&sdi->sdi_rl, SYS_RES_IRQ,
-		    0, sdi->sdi_irq, sdi->sdi_irq, 1);
-	}
-
-	return (sdi);
-}
-#endif
-
 static device_method_t siba_nexus_methods[] = {
 	/* Device interface */
-	DEVMETHOD(device_attach,	siba_nexus_attach),
-	DEVMETHOD(device_probe,		siba_nexus_probe),
-
-	/* Bus interface */
-	DEVMETHOD(bus_activate_resource,siba_nexus_activate_resource),
-	DEVMETHOD(bus_alloc_resource,	siba_nexus_alloc_resource),
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
+	DEVMETHOD(device_probe,			siba_nexus_probe),
+	DEVMETHOD(device_attach,		siba_nexus_attach),
 
 	/* bhnd interface */
-	DEVMETHOD(bhnd_get_chipid,	siba_nexus_get_chipid),
+	DEVMETHOD(bhnd_bus_get_chipid,		siba_nexus_get_chipid),
 
 	DEVMETHOD_END
 };
 
-DEFINE_CLASS_1(bhnd, siba_nexus_driver, siba_nexus_methods,
-    sizeof(struct siba_nexus_softc), siba_driver);
+DEFINE_CLASS_2(bhnd, siba_nexus_driver, siba_nexus_methods,
+    sizeof(struct siba_nexus_softc), bhnd_nexus_driver, siba_driver);
 
-DRIVER_MODULE(siba_nexus, nexus, siba_driver, bhnd_devclass, 0, 0);
+DRIVER_MODULE(siba_nexus, nexus, siba_nexus_driver, bhnd_devclass, 0, 0);
diff --git a/sys/dev/bhnd/siba/siba_subr.c b/sys/dev/bhnd/siba/siba_subr.c
index 5d9fc72b1dcd..27b3f0de3063 100644
--- a/sys/dev/bhnd/siba/siba_subr.c
+++ b/sys/dev/bhnd/siba/siba_subr.c
@@ -244,9 +244,9 @@ siba_append_dinfo_region(struct siba_devinfo *dinfo, bhnd_port_type port_type,
 	struct siba_addrspace	*sa;
 	struct siba_port	*port;
 	rman_res_t		 r_size;
-	
+
 	/* Verify that base + size will not overflow */
-	if (UINT32_MAX - size < base)
+	if (size > 0 && UINT32_MAX - (size - 1) < base)
 		return (ERANGE);
 
 	/* Verify that size - bus_reserved will not underflow */
@@ -276,7 +276,7 @@ siba_append_dinfo_region(struct siba_devinfo *dinfo, bhnd_port_type port_type,
 	/* Populate the resource list */
 	r_size = size - bus_reserved;
 	sa->sa_rid = resource_list_add_next(&dinfo->resources, SYS_RES_MEMORY,
-	    base, base + r_size - 1, r_size);
+	    base, base + (r_size - 1), r_size);
 
 	/* Append to target port */
 	STAILQ_INSERT_TAIL(&port->sp_addrs, sa, sa_link);
diff --git a/sys/dev/bhnd/soc/bhnd_soc.c b/sys/dev/bhnd/soc/bhnd_soc.c
deleted file mode 100644
index 32c44fc8b321..000000000000
--- a/sys/dev/bhnd/soc/bhnd_soc.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/*-
- * Copyright (c) 2016 Michael Zhilin <mizhka@gmail.com>
- * 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,
- *    without modification.
- * 2. Redistributions in binary form must reproduce at minimum a disclaimer
- *    similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
- *    redistribution must be conditioned upon including a substantially
- *    similar Disclaimer requirement for further binary redistribution.
- *
- * NO WARRANTY
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR 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 DAMAGES.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include <sys/param.h>
-#include <sys/kernel.h>
-#include <sys/bus.h>
-#include <sys/errno.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-#include <sys/rman.h>
-
-#include <machine/resource.h>
-
-#include <dev/bhnd/bhnd_debug.h>
-#include <dev/bhnd/bhndvar.h>
-#include <dev/bhnd/bhndreg.h>
-#include <dev/bhnd/bhndb/bhndb.h>
-#include <dev/bhnd/soc/bhnd_soc.h>
-
-#include "bhndb_if.h"
-
-/*
- * **************************** VARIABLES *************************************
- */
-
-struct resource_spec bhnd_soc_default_rspec = {SYS_RES_MEMORY, 0, RF_ACTIVE};
-
-/*
- * **************************** PROTOTYPES ************************************
- */
-
-static int	bhnd_soc_attach_bus(device_t dev, struct bhnd_soc_softc* sc);
-static int	bhnd_soc_probe(device_t dev);
-static int	bhnd_soc_attach(device_t dev);
-int		bhnd_soc_attach_by_class(device_t parent, device_t *child,
-		    int unit, devclass_t child_devclass);
-
-/*
- * **************************** IMPLEMENTATION ********************************
- */
-
-int
-bhnd_soc_attach_by_class(device_t parent, device_t *child, int unit,
-		devclass_t child_devclass)
-{
-	int error;
-	struct bhnd_soc_devinfo* devinfo;
-
-	*child = device_add_child(parent, devclass_get_name(child_devclass),
-		unit);
-	if (*child == NULL)
-		return (ENXIO);
-
-	devinfo = malloc(sizeof(struct bhnd_soc_devinfo*), M_BHND, M_NOWAIT);
-	resource_list_init(&devinfo->resources);
-
-	for (int i = 0; i < BHND_SOC_MAXNUM_CORES; i++)
-		resource_list_add(&devinfo->resources, SYS_RES_MEMORY, i,
-				BHND_SOC_RAM_OFFSET, BHND_SOC_RAM_SIZE, 1);
-
-	device_set_ivars(*child, devinfo);
-
-	error = device_probe_and_attach(*child);
-	if (error && device_delete_child(parent, *child))
-		BHND_ERROR_DEV(parent, "failed to detach bhndb child");
-
-	return (error);
-}
-
-static int
-bhnd_soc_attach_bus(device_t dev, struct bhnd_soc_softc* sc)
-{
-	int error;
-
-	error = bhnd_read_chipid(dev, &bhnd_soc_default_rspec,
-			BHND_DEFAULT_CHIPC_ADDR, &sc->chipid);
-
-	if (error) {
-		return (error);
-	}
-
-	return (bhnd_soc_attach_by_class(dev, &(sc->bus), -1, bhnd_devclass));
-}
-
-static int
-bhnd_soc_probe(device_t dev)
-{
-	return (BUS_PROBE_GENERIC);
-}
-
-static int
-bhnd_soc_attach(device_t dev)
-{
-	struct bhnd_soc_softc* sc;
-	sc = device_get_softc(dev);
-	sc->dev = dev;
-	return (bhnd_soc_attach_bus(dev,sc));
-}
-
-static const struct bhnd_chipid *
-bhnd_soc_get_chipid (device_t dev, device_t child)
-{
-	struct bhnd_soc_softc* sc;
-	sc = device_get_softc(dev);
-	return (&sc->chipid);
-}
-
-static struct resource_list *
-bhnd_soc_get_rl(device_t dev, device_t child)
-{
-	struct bhnd_soc_devinfo *dinfo;
-	dinfo = device_get_ivars(child);
-	return (&dinfo->resources);
-}
-
-static struct bhnd_resource *
-bhnd_soc_alloc_resource(device_t dev, device_t child, int type, int *rid,
-		rman_res_t start, rman_res_t end, rman_res_t count, u_int flags)
-{
-	struct bhnd_soc_softc	*sc;
-	struct bhnd_resource	*br;
-	int error;
-
-	sc = device_get_softc(dev);
-
-	/* Allocate resource wrapper */
-	br = malloc(sizeof(struct bhnd_resource), M_BHND, M_NOWAIT|M_ZERO);
-	if (br == NULL)
-		return (NULL);
-
-	BHND_TRACE_DEV(child,"trying to allocate resource %d: %jx-%jx (%ju)",
-			*rid, start, end, count);
-
-	/* Configure */
-	br->direct = true;
-	br->res = bus_alloc_resource(child, type, rid, start, end, count,
-	    flags & ~RF_ACTIVE);
-	if (br->res == NULL) {
-		BHND_ERROR_DEV(child, "can't allocate resource %d: %jx-%jx (%ju)",
-				*rid, start, end, count);
-		goto failed;
-	}
-
-	if (flags & RF_ACTIVE) {
-		BHND_TRACE_DEV(child, "trying to activate resource: %d", *rid);
-		error = bhnd_activate_resource(child, type, *rid, br);
-		if (error) {
-			BHND_ERROR_DEV(child, "can't activate BHND resource %d:"
-					"%jx-%jx (%ju) with error: %d",
-					*rid, start, end, count, error);
-			goto failed;
-		}
-	}
-
-	return (br);
-
-failed:
-	if (br->res != NULL)
-		bus_release_resource(child, type, *rid, br->res);
-
-	free(br, M_BHND);
-	return (NULL);
-}
-
-static int
-bhnd_soc_activate_resource(device_t dev, device_t child, int type, int rid,
-		struct bhnd_resource *r)
-{
-	int error;
-
-	/*
-	 * Fallback to direct
-	 */
-	error = bus_activate_resource(child, type, rid, r->res);
-	if (error) {
-		BHND_ERROR_DEV(child, "can't activate resource %d, error: %d",
-				rman_get_rid(r->res), error);
-		return (error);
-	}
-	r->direct = true;
-	return (0);
-}
-
-static bool
-bhnd_soc_is_hw_disabled(device_t dev, device_t child)
-{
-	return false;
-}
-
-static bhnd_attach_type
-bhnd_soc_get_attach_type(device_t dev, device_t child)
-{
-	return (BHND_ATTACH_NATIVE);
-}
-
-/*
- * **************************** DRIVER METADATA ****************************
- */
-
-static device_method_t bhnd_soc_methods[] = {
-		//device interface
-	DEVMETHOD(device_probe,		bhnd_soc_probe),
-	DEVMETHOD(device_attach,	bhnd_soc_attach),
-	//resources
-	DEVMETHOD(bus_alloc_resource,	bus_generic_rl_alloc_resource),
-	DEVMETHOD(bus_delete_resource,	bus_generic_rl_delete_resource),
-	DEVMETHOD(bus_set_resource,	bus_generic_rl_set_resource),
-	DEVMETHOD(bus_get_resource,	bus_generic_rl_get_resource),
-	DEVMETHOD(bus_release_resource,	bus_generic_rl_release_resource),
-	//intr
-	DEVMETHOD(bus_setup_intr,	bus_generic_setup_intr),
-	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
-	DEVMETHOD(bus_config_intr,	bus_generic_config_intr),
-	DEVMETHOD(bus_bind_intr,	bus_generic_bind_intr),
-	DEVMETHOD(bus_describe_intr,	bus_generic_describe_intr),
-
-	DEVMETHOD(bus_activate_resource,	bus_generic_activate_resource),
-	DEVMETHOD(bus_deactivate_resource,	bus_generic_deactivate_resource),
-	//resource list
-	DEVMETHOD(bus_get_resource_list,	bhnd_soc_get_rl),
-
-	//bhnd - BCMA allocates agent resources
-	DEVMETHOD(bhnd_bus_alloc_resource,	bhnd_soc_alloc_resource),
-	DEVMETHOD(bhnd_bus_activate_resource,	bhnd_soc_activate_resource),
-	DEVMETHOD(bhnd_bus_is_hw_disabled,	bhnd_soc_is_hw_disabled),
-	DEVMETHOD(bhnd_bus_get_chipid,		bhnd_soc_get_chipid),
-	DEVMETHOD(bhnd_bus_get_attach_type,	bhnd_soc_get_attach_type),
-
-	DEVMETHOD_END
-};
-
-devclass_t bhnd_soc_devclass;
-
-DEFINE_CLASS_0(bhnd_soc, bhnd_soc_driver, bhnd_soc_methods,
-		sizeof(struct bhnd_soc_softc));
-EARLY_DRIVER_MODULE(bhnd_soc, nexus, bhnd_soc_driver, bhnd_soc_devclass, NULL,
-    NULL, BUS_PASS_BUS + BUS_PASS_ORDER_MIDDLE);