* Completely rewrite the alpha busspace to hide the implementation from

  the drivers.
* Remove legacy inx/outx support from chipset and replace with macros
  which call busspace.
* Rework pci config accesses to route through the pcib device instead of
  calling a MD function directly.

With these changes it is possible to cleanly support machines which have
more than one independantly numbered PCI busses. As a bonus, the new
busspace implementation should be measurably faster than the old one.

1 files changed, 122 insertions, 5 deletions

diff --git a/sys/alpha/pci/irongate_pci.c b/sys/alpha/pci/irongate_pci.c
index e8cf291..3b62716 100644
--- a/sys/alpha/pci/irongate_pci.c
+++ b/sys/alpha/pci/irongate_pci.c
@@ -34,14 +34,19 @@
 #include <sys/bus.h>
 #include <machine/bus.h>
 #include <machine/md_var.h>
+#include <machine/bwx.h>
 #include <sys/rman.h>
 #include <pci/pcivar.h>
+#include <pci/pcireg.h>
 #include <alpha/pci/irongatereg.h>
 #include <alpha/pci/irongatevar.h>
 
+#include "alphapci_if.h"
+#include "pcib_if.h"
 
-static devclass_t	pcib_devclass;
+#define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa)
 
+static devclass_t	pcib_devclass;
 
 static int
 irongate_pcib_probe(device_t dev)
@@ -49,7 +54,19 @@ irongate_pcib_probe(device_t dev)
 
 	device_set_desc(dev, "AMD 751 PCI host bus adapter");
 
-	device_add_child(dev, "pci", -1);
+	device_add_child(dev, "pci", 0);
+
+	/*  
+	 * XXX  -- The SRM console doesn't properly initialize
+	 * the AcerLabs M1533C southbridge.  We must turn off 32-bit 
+	 * DMA support.
+	 */
+	if ((0x153310b9 == PCIB_READ_CONFIG(dev, 0, 7, 0,
+					    PCIR_DEVVENDOR, 4))) {
+		u_int8_t value = PCIB_READ_CONFIG(dev, 0, 7, 0, 0x42, 1);
+		value &= ~0x40;
+		PCIB_WRITE_CONFIG(dev, 0, 7, 0, 0x42, 0, 1);
+	}
 
 	return 0;
 }
@@ -57,13 +74,107 @@ irongate_pcib_probe(device_t dev)
 static int
 irongate_pcib_read_ivar(device_t dev, device_t child, int which, u_long *result)
 {
-	if (which == PCIB_IVAR_HOSE) {
+	switch (which) {
+	case  PCIB_IVAR_BUS:
 		*result = 0;
 		return 0;
 	}
 	return ENOENT;
 }
 
+static void *
+irongate_pcib_cvt_dense(device_t dev, vm_offset_t addr)
+{
+	addr &= 0xffffffffUL;
+	return (void *) KV(addr | IRONGATE_MEM);
+}
+
+static void *
+irongate_pcib_cvt_bwx(device_t dev, vm_offset_t addr)
+{
+	addr &= 0xffffffffUL;
+	return (void *) KV(addr | IRONGATE_MEM);
+}
+
+static int
+irongate_pcib_maxslots(device_t dev)
+{
+	return 31;
+}
+
+static void
+irongate_clear_abort(void)
+{
+	alpha_mb();
+	alpha_pal_draina();	
+}
+
+static int
+irongate_check_abort(void)
+{
+	alpha_pal_draina();	
+	alpha_mb();
+
+	return 0;
+}
+
+#define IRONGATE_CFGADDR(b, s, f, r)				\
+	KV(IRONGATE_CONF | ((b) << 16) | ((s) << 11) | ((f) << 8) | (r))
+
+#define CFGREAD(b, s, f, r, width, type, op) do {	\
+        vm_offset_t va;					\
+	type data;					\
+	va = IRONGATE_CFGADDR(b, s, f, r);		\
+	irongate_clear_abort();				\
+	if (badaddr((caddr_t)va, width)) {		\
+		irongate_check_abort();			\
+		return ~0;				\
+	}						\
+	data = ##op##(va);				\
+	if (irongate_check_abort())			\
+		return ~0;				\
+	return data;					\
+} while (0)
+
+#define CFGWRITE(b, s, f, r, data, width, op) do {	\
+        vm_offset_t va;					\
+	va = IRONGATE_CFGADDR(b, s, f, r);		\
+	irongate_clear_abort();				\
+	if (badaddr((caddr_t)va, width))		\
+		return;					\
+	##op##(va, data);				\
+	irongate_check_abort();				\
+} while (0)
+
+static u_int32_t
+irongate_pcib_read_config(device_t dev, int b, int s, int f,
+			  int reg, int width)
+{
+	switch (width) {
+	case 1:
+		CFGREAD(b, s, f, reg, 1, u_int8_t, ldbu);
+	case 2:
+		CFGREAD(b, s, f, reg, 2, u_int16_t, ldwu);
+	case 4:
+		CFGREAD(b, s, f, reg, 4, u_int32_t, ldl);
+	}
+	return ~0;
+}
+
+static void
+irongate_pcib_write_config(device_t dev, int b, int s, int f,
+			   int reg, u_int32_t val, int width)
+{
+	switch (width) {
+	case 1:
+		CFGWRITE(b, s, f, reg, val, 1, stb);
+	case 2:
+		CFGWRITE(b, s, f, reg, val, 2, stw);
+	case 4:
+		CFGWRITE(b, s, f, reg, val, 4, stl);
+	}
+}
+
 static device_method_t irongate_pcib_methods[] = {
 	/* Device interface */
 	DEVMETHOD(device_probe,		irongate_pcib_probe),
@@ -79,17 +190,23 @@ static device_method_t irongate_pcib_methods[] = {
 	DEVMETHOD(bus_setup_intr, 	bus_generic_setup_intr),
 	DEVMETHOD(bus_teardown_intr,	bus_generic_teardown_intr),
 
+	/* alphapci interface */
+	DEVMETHOD(alphapci_cvt_dense,	irongate_pcib_cvt_dense),
+	DEVMETHOD(alphapci_cvt_bwx,	irongate_pcib_cvt_bwx),
+
+	/* pcib interface */
+	DEVMETHOD(pcib_maxslots,	irongate_pcib_maxslots),
+	DEVMETHOD(pcib_read_config,	irongate_pcib_read_config),
+	DEVMETHOD(pcib_write_config,	irongate_pcib_write_config),
 	{ 0, 0 }
 };
 
-
 static driver_t irongate_pcib_driver = {
 	"pcib",
 	irongate_pcib_methods,
 	1,
 };
 
-
 DRIVER_MODULE(pcib, irongate, irongate_pcib_driver, pcib_devclass, 0, 0);