Add the new sparc64 OFW PCI framework, conditional on options OFW_NEWPCI

for now. It introduces a OFW PCI bus driver and a generic OFW PCI-PCI
bridge driver. By utilizing these, the PCI handling is much more elegant
now.

The advantages of the new approach are:
- Device enumeration should hopefully be more like on Solaris now,
  so unit numbers should match what's printed on the box more
  closely.
- Real interrupt routing is implemented now, so cardbus bridges
  etc. have at least a chance to work.
- The quirk tables are gone and have been replaced by (hopefully
  sufficient) heuristics.
- Much cleaner code.

There was also a report that previously bogus interrupt assignments
are fixed now, which can be attributed to the new heuristics.

A pitfall, and the reason why this is not the default yet, is that
it changes device enumeration, as mentioned above, which can make
it necessary to change the system configuration if more than one
unit of a device type is present (on a system with two hme cars,
for example, it is possible that hme0 becomes hme1 and vice versa
after enabling the option). Systems with multiple disk controllers
may need to be booted into single user (and require manual specification
of the root file system on boot) to adjust the fstab.
Nevertheless, I would like to encourage users to use this option,
so that it can be made the default soon.

In detail, the changes are:
- Introduce an OFW PCI bus driver; it inherits most methods from the
  generic PCI bus driver, but uses the firmware for enumeration,
  performs additional initialization for devices and firmware-specific
  interrupt routing. It also implements an OFW-specific method to allow
  child devices to get their firmware nodes.
- Introduce an OFW PCI-PCI bridge driver; again, it inherits most
  of the generic PCI-PCI bridge driver; it has it's own method for
  interrupt routing, as well as some sparc64-specific methods (one to
  get the node again, and one to adjust the bridge bus range, since
  we need to reenumerate all PCI buses).
- Convert the apb driver to the new way of handling things.
- Provide a common framework for OFW bridge drivers, used be the two
  drivers above.
- Provide a small common framework for interrupt routing (for all
  bridge types).
- Convert the psycho driver to the new framework; this gets rid of a
  bunch of old kludges in pci_read_config(), and the whole
  preinitialization  (ofw_pci_init()).
- Convert the ISA MD part and the EBus driver to the new way
  interrupts and nodes are handled.
- Introduce types for firmware interrupt properties.
- Rename the old sparcbus_if to ofw_pci_if by repo copy (it is only
  required for PCI), and move it to a more correct location (new
  support methodsx were also added, and an old one was deprecated).
- Fix a bunch of minor bugs, perform some cleanups.

In some cases, I introduced some minor code duplication to keep the
new code clean, in hopes that the old code will be unifdef'ed soon.

Reviewed in part by:	imp
Tested by:	jake, Marius Strobl <marius@alchemy.franken.de>,
		Sergey Mokryshev <mokr@mokr.net>,
		Chris Jackman <cjackNOSPAM@klatsch.org>
Info on u30 firmware provided by:	kris

1 files changed, 27 insertions, 10 deletions

diff --git a/sys/sparc64/ebus/ebus.c b/sys/sparc64/ebus/ebus.c
index 6c71e02..575ba0a 100644
--- a/sys/sparc64/ebus/ebus.c
+++ b/sys/sparc64/ebus/ebus.c
@@ -48,6 +48,8 @@
  * there are machines with both ISA and EBus.
  */
 
+#include "opt_ofw_pci.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -101,6 +103,10 @@ struct ebus_softc {
 
 	int			sc_nrange;
 	int			sc_nimap;
+
+#ifdef OFW_NEWPCI
+	struct ofw_bus_iinfo	sc_iinfo;
+#endif
 };
 
 static int ebus_probe(device_t);
@@ -159,12 +165,12 @@ ebus_probe(device_t dev)
 	phandle_t node;
 	char *cname;
 
-	/*
-	 * XXX: PCI specific! There should be a common cookie IVAR value for all
-	 * buses! Does not really matter much here though...
-	 */
+#ifdef OFW_NEWPCI
+	node = ofw_pci_get_node(dev);
+#else
 	node = ofw_pci_find_node(pci_get_bus(dev), pci_get_slot(dev),
 	    pci_get_function(dev));
+#endif
 	if (node == 0)
 		return (ENXIO);
 
@@ -192,8 +198,12 @@ ebus_probe(device_t dev)
 	if (sc->sc_nrange == -1)
 		panic("ebus_attach: could not get ranges property");
 
+#ifdef OFW_NEWPCI
+	ofw_bus_setup_iinfo(node, &sc->sc_iinfo, sizeof(ofw_isa_intr_t));
+#endif
+
 	/*
-	 * now attach all our children
+	 * Now attach our children.
 	 */
 	DPRINTF(EDB_CHILD, ("ebus node %08x, searching children...\n", node));
 	for (node = OF_child(node); node > 0; node = OF_peer(node)) {
@@ -368,7 +378,8 @@ ebus_setup_dinfo(device_t dev, struct ebus_softc *sc, phandle_t node,
 {
 	struct ebus_devinfo *edi;
 	struct isa_regs *reg;
-	u_int32_t *intrs, intr;
+	ofw_isa_intr_t *intrs;
+	ofw_pci_intr_t rintr;
 	u_int64_t start;
 	int nreg, nintr, i;
 
@@ -395,20 +406,26 @@ ebus_setup_dinfo(device_t dev, struct ebus_softc *sc, phandle_t node,
 		resource_list_add(&edi->edi_rl, SYS_RES_IOPORT, i,
 		    start, start + reg[i].size - 1, reg[i].size);
 	}
+	free(reg, M_OFWPROP);
 
 	nintr = OF_getprop_alloc(node, "interrupts",  sizeof(*intrs),
 	    (void **)&intrs);
 	for (i = 0; i < nintr; i++) {
-		intr = ofw_bus_route_intr(node, intrs[i], ofw_pci_orb_callback,
+#ifdef OFW_NEWPCI
+		rintr = ofw_isa_route_intr(dev, node, &sc->sc_iinfo, intrs[i]);
+		if (rintr == PCI_INVALID_IRQ) {
+#else
+		rintr = ofw_bus_route_intr(node, intrs[i], ofw_pci_orb_callback,
 		    dev);
-		if (intr == ORIR_NOTFOUND) {
+		if (rintr == ORIR_NOTFOUND) {
+#endif
 			panic("ebus_setup_dinfo: could not map ebus "
 			    "interrupt %d", intrs[i]);
 		}
 		resource_list_add(&edi->edi_rl, SYS_RES_IRQ, i,
-		    intr, intr, 1);
+		    rintr, rintr, 1);
 	}
-	free(reg, M_OFWPROP);
+	free(intrs, M_OFWPROP);
 
 	return (edi);
 }