Standards-conformance and code deduplication:

- Use bus reference phandles in place of FDT offsets as IRQ domain keys
- Unify the identical macio/fdt/mambo OpenPIC drivers into one
- Be more forgiving (following ePAPR) about what we need from the device
  tree to identify an OpenPIC
- Correctly map all IRQs into an interrupt domain
- Set IRQ_*_CONFORM for interrupts on an unknown PIC type instead of
  failing attachment for that device.

1 files changed, 0 insertions, 179 deletions

diff --git a/sys/powerpc/mambo/mambo_openpic.c b/sys/powerpc/mambo/mambo_openpic.c
deleted file mode 100644
index 883c9d7..0000000
--- a/sys/powerpc/mambo/mambo_openpic.c
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * Copyright 2008 by Nathan Whitehorn. 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 ``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 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/module.h>
-#include <sys/bus.h>
-#include <sys/conf.h>
-#include <sys/kernel.h>
-
-#include <dev/ofw/ofw_bus.h>
-#include <dev/ofw/openfirm.h>
-
-#include <machine/bus.h>
-#include <machine/intr_machdep.h>
-#include <machine/md_var.h>
-#include <machine/pio.h>
-#include <machine/resource.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <sys/rman.h>
-
-#include <machine/openpicvar.h>
-
-#include "pic_if.h"
-
-/*
- * Mambo interface
- */
-static int	openpic_mambo_probe(device_t);
-static int	openpic_mambo_attach(device_t);
-static int	openpicbus_mambo_probe(device_t dev);
-static int	openpicbus_mambo_attach(device_t dev);
-static struct resource *openpicbus_alloc_resource(device_t bus, device_t dev,
-    int type, int *rid, u_long start, u_long end, u_long count, u_int flags);
-
-static device_method_t  openpicbus_mambo_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		openpicbus_mambo_probe),
-	DEVMETHOD(device_attach,	openpicbus_mambo_attach),
-
-	/* Bus interface */
-	DEVMETHOD(bus_alloc_resource,	openpicbus_alloc_resource),
-
-	{0,0}
-};
-
-struct openpicbus_softc {
-	vm_offset_t picaddr;
-};
-
-static driver_t openpicbus_mambo_driver = {
-	"openpicbus",
-	openpicbus_mambo_methods,
-	sizeof(struct openpicbus_softc),
-};
-
-static device_method_t  openpic_mambo_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		openpic_mambo_probe),
-	DEVMETHOD(device_attach,	openpic_mambo_attach),
-
-	/* PIC interface */
-	DEVMETHOD(pic_config,		openpic_config),
-	DEVMETHOD(pic_dispatch,		openpic_dispatch),
-	DEVMETHOD(pic_enable,		openpic_enable),
-	DEVMETHOD(pic_eoi,		openpic_eoi),
-	DEVMETHOD(pic_ipi,		openpic_ipi),
-	DEVMETHOD(pic_mask,		openpic_mask),
-	DEVMETHOD(pic_unmask,		openpic_unmask),
-
-	{ 0, 0 },
-};
-
-static driver_t openpic_mambo_driver = {
-	"openpic",
-	openpic_mambo_methods,
-	sizeof(struct openpic_softc),
-};
-
-static devclass_t openpicbus_devclass;
-
-DRIVER_MODULE(openpicbus, nexus, openpicbus_mambo_driver, 
-    openpicbus_devclass, 0, 0);
-DRIVER_MODULE(openpic, openpicbus, openpic_mambo_driver, 
-    openpic_devclass, 0, 0);
-
-static int
-openpicbus_mambo_probe(device_t dev)
-{
-	const char *type = ofw_bus_get_type(dev);
-
-	if (type == NULL || strcmp(type, "open-pic") != 0)
-                return (ENXIO);
-
-	device_set_desc(dev, "Mambo OpenPIC Container");
-
-	return (0);
-}
-
-static int
-openpicbus_mambo_attach(device_t dev)
-{
-	uint64_t picaddr;
-	phandle_t nexus;
-	struct openpicbus_softc *sc;
-
-	sc = device_get_softc(dev);
-
-	nexus = OF_parent(ofw_bus_get_node(dev));
-
-	OF_getprop(nexus,"platform-open-pic",
-	    &picaddr,sizeof(picaddr));
-
-	sc->picaddr = picaddr;
-
-	device_add_child(dev,"openpic",-1);
-
-	return (bus_generic_attach(dev));
-}
-
-static struct resource *
-openpicbus_alloc_resource(device_t bus, device_t dev, int type, int *rid,
-		   u_long start, u_long end, u_long count, u_int flags)
-{
-	struct openpicbus_softc *sc;
-
-	sc = device_get_softc(bus);
-
-	count = 0x40000;
-	start = sc->picaddr;
-	end = start + count;
-
-	return (bus_alloc_resource(bus, type, rid, start, end, count, flags));
-}
-
-static int
-openpic_mambo_probe(device_t dev)
-{
-
-	device_set_desc(dev, OPENPIC_DEVSTR);
-	return (0);
-}
-
-static int
-openpic_mambo_attach(device_t dev)
-{
- 
-	return (openpic_common_attach(dev,
-	    ofw_bus_get_node(device_get_parent(dev))));
-}