Partially re-write T2 chipset support based on Tru64 platform support

files which Compaq open-sourced (with a BSD license).

This commit adds support for proper PCI interrupt mapping and much
better support for swizzling between "standard" isa IRQs and the stdio
irqs used by the t2.  This also adds enabling/disabling/eoi support
for AlphaServer 2100A machines.  The 2100A (or lynx) interrupt
hardware is is very different (and much nicer) than the 2100.
Previously, only AS2100 and AS2000 machines worked.

This commits also lays the groundwork for supporting ExtIO modules.
These modules are essentially a second hose.  This work is left
unfinished pending testing on real hardware.  Wilko tells me that
ExtIO modules are quite rare, and may not actually exist in the wild.

Obtained from: Tru64
Tested by: wilko

4 files changed, 450 insertions, 86 deletions

diff --git a/sys/alpha/pci/t2.c b/sys/alpha/pci/t2.c
index 48e0d94..461376e 100644
--- a/sys/alpha/pci/t2.c
+++ b/sys/alpha/pci/t2.c
@@ -23,6 +23,28 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * Portions of this file were obtained from Compaq intellectual
+ * property which was made available under the following copyright:
+ *
+ * *****************************************************************
+ * *                                                               *
+ * *    Copyright Compaq Computer Corporation, 2000                *
+ * *                                                               *
+ * *   Permission to use, copy, modify, distribute, and sell       *
+ * *   this software and its documentation for any purpose is      *
+ * *   hereby granted without fee, provided that the above         *
+ * *   copyright notice appear in all copies and that both         *
+ * *   that copyright notice and this permission notice appear     *
+ * *   in supporting documentation, and that the name of           *
+ * *   Compaq Computer Corporation not be used in advertising      *
+ * *   or publicity pertaining to distribution of the software     *
+ * *   without specific, written prior permission.  Compaq         *
+ * *   makes no representations about the suitability of this      *
+ * *   software for any purpose.  It is provided "AS IS"           *
+ * *   without express or implied warranty.                        *
+ * *                                                               *
+ * *****************************************************************
+ *
  * $FreeBSD$
  */
 
@@ -51,13 +73,17 @@
 #include <machine/cpuconf.h>
 #include <machine/swiz.h>
 #include <machine/sgmap.h>
+#include <pci/pcivar.h>
 
 #include <vm/vm.h>
 #include <vm/vm_page.h>
 
-#define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa + t2_csr_base)
+#define KV(pa)			ALPHA_PHYS_TO_K0SEG(pa + sable_lynx_base)
+
+vm_offset_t	sable_lynx_base = 0UL;
 
-vm_offset_t	t2_csr_base = 0UL;
+volatile t2_csr_t *t2_csr[2];
+static int pci_int_type[2];
 
 static devclass_t	t2_devclass;
 static device_t		t2_0;		/* XXX only one for now */
@@ -76,7 +102,7 @@ static alpha_chipset_t t2_chipset = {
 	t2_write_hae,
 };
 
-static u_int32_t	t2_hae_mem;
+static u_int32_t	t2_hae_mem[2];
 
 #define REG1 (1UL << 24)
 
@@ -85,17 +111,20 @@ t2_set_hae_mem(void *arg, u_int32_t pa)
 {
 	int s; 
 	u_int32_t msb;
+	int hose;
+
+	hose = (long)arg;
 
 	if(pa >= REG1){
 		msb = pa & 0xf8000000;
 		pa -= msb;
 		msb >>= 27;	/* t2 puts high bits in the bottom of the register */
 		s = splhigh();
-		if (msb != t2_hae_mem) {
-			t2_hae_mem = msb;
-			REGVAL(T2_HAE0_1) = t2_hae_mem;
+		if (msb != t2_hae_mem[hose]) {
+			t2_hae_mem[hose] = msb;
+			t2_csr[hose]->hae0_1 = t2_hae_mem[hose];
 			alpha_mb();
-			t2_hae_mem = REGVAL(T2_HAE0_1);
+			t2_hae_mem[hose] = t2_csr[hose]->hae0_1;
 		}
 		splx(s);
 	}
@@ -105,7 +134,7 @@ t2_set_hae_mem(void *arg, u_int32_t pa)
 static u_int64_t
 t2_read_hae(void)
 {
-	return t2_hae_mem << 27;
+	return t2_hae_mem[0] << 27;
 }
 
 static void
@@ -192,7 +221,7 @@ t2_sgmap_map(void *arg, bus_addr_t ba, vm_offset_t pa)
 
 
 static void
-t2_init_sgmap(void)
+t2_init_sgmap(int h)
 {
 	void *sgtable;
 
@@ -204,10 +233,10 @@ t2_init_sgmap(void)
 	 *  (in units of 1Mb), and bits 11..0 represent the pci
 	 *  end address
 	 */
-	REGVAL(T2_WBASE2) = T2_WSIZE_8M|T2_WINDOW_ENABLE|T2_WINDOW_SG
+	t2_csr[h]->wbase2 = T2_WSIZE_8M|T2_WINDOW_ENABLE|T2_WINDOW_SG
 	                     | ((T2_SGMAP_BASE >> 20) << 20)
 	                     | ((T2_SGMAP_BASE + T2_SGMAP_SIZE) >> 20);
-	REGVAL(T2_WMASK2) = T2_WMASK_8M;
+	t2_csr[h]->wmask2 = T2_WMASK_8M;
 	alpha_mb();
 
 	sgtable = contigmalloc(8192, M_DEVBUF, M_NOWAIT,
@@ -216,7 +245,7 @@ t2_init_sgmap(void)
 	if (!sgtable)
 		panic("t2_init_sgmap: can't allocate page table");
 
-	REGVAL(T2_TBASE2) =  
+	t2_csr[h]->tbase2 =
 	    (pmap_kextract((vm_offset_t) sgtable) >> T2_TBASE_SHIFT);
 
 	chipset.sgmap = sgmap_map_create(T2_SGMAP_BASE,
@@ -224,6 +253,35 @@ t2_init_sgmap(void)
 					 t2_sgmap_map, sgtable);
 }
 
+static void
+t2_csr_init(int h)
+{
+	/* 
+	 * initialize the DMA windows
+	 */
+	t2_csr[h]->wbase1 = T2_WSIZE_1G|T2_WINDOW_ENABLE|T2_WINDOW_DIRECT|0x7ff;
+	t2_csr[h]->wmask1 = T2_WMASK_1G;
+	t2_csr[h]->tbase1 = 0x0;
+
+	t2_csr[h]->wbase2 = 0x0;
+
+	/* 
+	 *  enable the PCI "Hole" for ISA devices which use memory in
+	 *  the 512k - 1MB range
+	 */
+	t2_csr[h]->hbase = 1 << 13;
+	t2_init_sgmap(0);
+
+	/* initialize the HAEs */
+	t2_csr[h]->hae0_1 = 0x0;
+	alpha_mb();
+	t2_csr[h]->hae0_2 = 0x0;
+	alpha_mb();
+	t2_csr[h]->hae0_3 = 0x0;
+	alpha_mb();
+
+}
+
 /*
  * Perform basic chipset init/fixup.  Called by various early
  * consumers to ensure that the system will work before the 
@@ -248,46 +306,54 @@ t2_init()
 	busspace_isa_mem = (kobj_t) &mem_space;
 
 	chipset = t2_chipset;
+
 }
 
 static int
 t2_probe(device_t dev)
 {
+	int h, t2_num_hoses = 1;
 	device_t child;
 
 	if (t2_0)
 		return ENXIO;
+
 	t2_0 = dev;
 	device_set_desc(dev, "T2 Core Logic chipset"); 
+	t2_csr[0] = (t2_csr_t *)
+	    ALPHA_PHYS_TO_K0SEG(sable_lynx_base + PCI0_BASE);
+	t2_csr[1] = (t2_csr_t *)
+	    ALPHA_PHYS_TO_K0SEG(sable_lynx_base + PCI1_BASE);
 
-	pci_init_resources();
-
-	/* 
-	 * initialize the DMA windows
-	 */
+	/* Look at the rev of the chip.  If the high bit is set in the
+	 * rev field then we have either a T3 or a T4 chip, so use the
+	 * new interrupt structure.  If it is clear, then we have a T2
+	 * so use the old way */
 
-	REGVAL(T2_WBASE1) = T2_WSIZE_1G|T2_WINDOW_ENABLE|T2_WINDOW_DIRECT|0x7ff;
-	REGVAL(T2_WMASK1) = T2_WMASK_1G;
-	REGVAL(T2_TBASE1) = 0;
-
-	REGVAL(T2_WBASE2) = 0x0;
+	platform.mcheck_handler = t2_machine_check;
 
+	if (((t2_csr[0]->iocsr) >> 35) & 1)
+		pci_int_type[0] = 1;
+	 else 
+		pci_int_type[0] = 0;
+
+	device_printf(dev, "using interrupt type %d on pci bus 0\n", 
+	    pci_int_type[0]);
+
+	if (!badaddr((void *)&t2_csr[1]->tlbbr, sizeof(long))) {
+		pci_int_type[1] = 1; /* PCI1 always uses the new scheme */
+		/* Clear any errors that the BADADDR probe may have caused */
+		t2_csr[1]->cerr1 |= t2_csr[1]->cerr1;
+		t2_csr[1]->pcierr1 |= t2_csr[1]->pcierr1;
+		device_printf(dev, "found EXT_IO!!!!!\n");
+		/* t2_num_hoses = 2; XXX not ready for this yet */
+	}
 
-	/* 
-	 *  enable the PCI "Hole" for ISA devices which use memory in
-	 *  the 512k - 1MB range
-	 */
-	REGVAL(T2_HBASE) = 1 << 13;
-	t2_init_sgmap();
+	pci_init_resources();
 
+	for (h = 0; h < t2_num_hoses; h++)
+		t2_csr_init(h);
 
-	/* initialize the HAEs */
-	REGVAL(T2_HAE0_1) = 0x0; 
-	alpha_mb();
-	REGVAL(T2_HAE0_2) = 0x0; 
-	alpha_mb();
-	REGVAL(T2_HAE0_3) = 0x0; 
-	alpha_mb();
 	
 	child = device_add_child(dev, "pcib", 0);
 	device_set_ivars(child, 0);
@@ -300,7 +366,6 @@ t2_attach(device_t dev)
 {
 	t2_init();
 
-	platform.mcheck_handler = t2_machine_check;
 	set_iointr(t2_dispatch_intr);
 	platform.isa_setup_intr = t2_setup_intr;
 	platform.isa_teardown_intr = t2_teardown_intr;
@@ -313,6 +378,111 @@ t2_attach(device_t dev)
 }
 
 /*
+ * Map pci slot & INTx pin to the ICIC interrupt value for our PCIs.
+ */
+
+static int 
+t2_ICIC_slot_to_STDIO_irq(pcicfgregs *cfg)
+{
+
+	int ret_irq = 0;
+
+	/*
+	 * Return the interrupt pin number for the PCI slots.  
+	 */
+
+	if ((cfg->intpin < 1) || (cfg->intpin > 4))
+		return(-1);
+
+	/*  Generate the proper interrupt conversion for the physical
+	 * PCI slots (for both the primary PCI slots and those behind
+	 * a PPB).  */
+
+	if ((cfg->slot >= 6) && (cfg->slot <= 9)) {
+		ret_irq = (32 + (4 * (cfg->slot - 6))) +
+		    (cfg->intpin - 1) + (16 * cfg->secondarybus);
+		return (ret_irq);
+	}
+
+	/* Convert the NCR810A chip behind the PPB */
+	if (cfg->slot == 1) {
+		ret_irq = 28;
+		return (ret_irq);
+	}
+
+	/* Convert the NCR810A chip on the primary PCI bus or the
+	 * TULIP chip behind the PPB.  There is no system that has
+	 * both, so there really is no sharing going on although it
+	 * looks like it.  */
+	if ( (cfg->slot == 4) || (cfg->slot == 0) ) {
+		ret_irq = 24;
+		return (ret_irq);
+	}
+
+	printf("ICIC invalid pci slot: 0x%x intpin: 0x%x bus num:0x%x\n", 
+	    cfg->slot, cfg->intpin, cfg->bus);
+	return(-1);
+}
+
+/*
+ * Map pci slot & INTx pin to STDIO's 8259 irq input value for PCI0.
+ */
+
+static int 
+t2_pci0_slot_to_STDIO_irq(pcicfgregs *cfg)
+{
+
+	switch(cfg->slot) {
+	case 0:	/* ethernet (tulip) port */
+		return(0x2);
+	case 1:	/* scsi 810 */
+		return(0x1);
+	case 6:	/* optional slot 0 */
+		switch (cfg->intpin) {
+		case 1: return(0x0);
+		case 2: return(0x18);
+		case 3: return(0x1a);
+		case 4: return(0x1d);
+		}
+	case 7:	/* optional slot 1 */
+		switch (cfg->intpin) {
+		case 1: return(0x4);
+		case 2: return(0x19);
+		case 3: return(0x1b);
+		case 4: return(0x1e);
+		}
+	case 8:	/* optional slot 2 */
+		switch (cfg->intpin) {
+		case 1: return(0x5);
+		case 2: return(0x14);
+		case 3: return(0x1c);
+		case 4: return(0x1f);
+		}
+	default:	/* invalid slot */
+		printf("PCI slot %d unknown\n", cfg->slot);
+		return(-1);
+	}
+	printf("invalid pci0 intpin slot: 0x%x intpin: 0x%x\n", 
+	    cfg->slot, cfg->intpin);
+	return (-1);
+}
+
+
+void
+t2_intr_map(void *arg)
+{
+	pcicfgregs *cfg;
+
+	cfg = (pcicfgregs *)arg;
+	if (pci_int_type[0]) {
+		t2_ICIC_slot_to_STDIO_irq(cfg);
+	} else {
+		t2_pci0_slot_to_STDIO_irq(cfg);
+	}
+}
+
+
+/*
  * magical mystery table partly obtained from Linux
  * at least some of their values for PCI masks
  * were incorrect, and I've filled in my own extrapolations
@@ -328,11 +498,10 @@ static const char irq_to_mask[40] = {
 	 0,  1,  2,  3,  4,  5,  6,  7		/* PCI 0-7 XXX */
 };
 
+
 static void
-t2_disable_intr(int vector)
+t2_8259_disable_mask(int mask)
 {
-	int mask = (vector - 0x900) >> 4;
-
 	t2_shadow_mask |= (1UL << mask);
 
 	if (mask <= 7)
@@ -344,10 +513,8 @@ t2_disable_intr(int vector)
 }
 
 static void
-t2_enable_intr(int vector)
+t2_8259_enable_mask(int mask)
 {
-	int mask = (vector - 0x900) >> 4;
-
 	t2_shadow_mask &= ~(1UL << mask);
 
 	if (mask <= 7)
@@ -358,16 +525,141 @@ t2_enable_intr(int vector)
 		outb(SLAVE2_ICU, t2_shadow_mask >> 16);
 }
 
+
+static void 
+t2_eoi( int vector)
+{
+	int irq, hose;
+
+	hose = (vector >= 0xC00);
+	irq = (vector - 0x800) >> 4;
+
+	if (pci_int_type[hose]) {
+
+		/* New interrupt scheme.  Both PCI0 and PCI1 can use
+		 * the same handler.  Dispatching interrupts with the
+		 * IC IC chip is easy.  We simply write the vector
+		 * address  register (var) on the T3/T4 (offset
+		 * 0x480) with the IRQ  level (0 - 63) of what came in.  */
+		t2_csr[hose]->var = (u_long) irq;
+		alpha_mb();
+		alpha_mb();
+	} else {
+		switch (irq) {
+		case 0 ... 7:
+			outb(SLAVE0_ICU-1, (0xe0 | (irq)));
+			outb(MASTER_ICU-1, (0xe0 | 1));
+			break;
+		case 8 ... 15:
+			outb(SLAVE1_ICU-1, (0xe0 | (irq - 8)));
+			outb(MASTER_ICU-1, (0xe0 | 3));
+			break;
+		case 16 ... 24:
+			outb(SLAVE2_ICU-1, (0xe0 | (irq - 16)));
+			outb(MASTER_ICU-1, (0xe0 | 4));
+			break;
+		}	
+	}
+}
+
+static void
+t2_enable_vec(int vector)
+{
+	int irq, hose;
+	u_long IC_mask, scratch;
+
+	hose = (vector >= 0xC00);
+	irq = (vector - 0x800) >> 4;
+
+	if (pci_int_type[hose]) {
+
+		/* Write the air register on the T3/T4 with the
+		 * address of the IC IC masks register (offset 0x40) */
+		t2_csr[hose]->air = 0x40;
+		alpha_mb();
+		scratch = t2_csr[hose]->air;	
+		alpha_mb();
+		IC_mask = t2_csr[hose]->dir;
+		IC_mask &= ~(1L << ( (u_long) irq));
+		t2_csr[hose]->dir = IC_mask;	
+		alpha_mb();
+		alpha_mb();
+		/*
+		 * EOI the interrupt we just enabled.
+		 */
+		t2_eoi(vector);
+	} else {
+		/* Old style 8259 (Gack!!!) interrupts */
+		t2_8259_enable_mask(irq);
+	}
+}
+
+static void
+t2_disable_vec(int vector)
+{
+	int hose, irq;
+	u_long scratch, IC_mask;
+
+	hose = (vector >= 0xC00);
+	irq =  (vector - 0x800) >> 4;
+
+	if (pci_int_type[hose]) {
+
+		/* Write the air register on the T3/T4 wioth the
+		 * address of the IC IC masks register (offset 0x40) */
+
+		t2_csr[hose]->air = 0x40;
+		alpha_mb();
+		scratch = t2_csr[hose]->air;	
+		alpha_mb();
+		/*
+		 * Read the dir register to fetch the mask data, 'or' in the
+		 * new disable bit, and write the data back.
+		 */
+		IC_mask = t2_csr[hose]->dir;
+		IC_mask |= (1L << ( (u_long) irq));
+		/* Set the disable bit */
+		t2_csr[hose]->dir = IC_mask;	
+		alpha_mb();
+		alpha_mb();
+	} else {
+		/* Old style 8259 (Gack!!!) interrupts */
+		t2_8259_disable_mask(irq);
+	}
+}
+
+
 static int
 t2_setup_intr(device_t dev, device_t child,
 	       struct resource *irq, int flags,
 	       void *intr, void *arg, void **cookiep)
 {
-	int error, mask, vector;
+	int error, vector, stdio_irq;
+	const char *name;
+	device_t bus, parent;
+
+	name = device_get_nameunit(dev);
+	stdio_irq = irq->r_start;
+	if (strncmp(name, "eisa", 4) == 0) {
+		if ((stdio_irq != 6 ) && (stdio_irq != 3 )) {
+			stdio_irq = 
+			    T2_EISA_IRQ_TO_STDIO_IRQ(stdio_irq);
+		}
+	} else if ((strncmp(name, "isa", 3)) == 0) {
+		stdio_irq = irq_to_mask[stdio_irq];
+	}
+
+	parent = dev;
+	do {
+		bus = parent;
+		parent = device_get_parent(bus);
+	} while (parent && strncmp("t2", device_get_nameunit(parent), 2));
+
+	if (parent && (device_get_unit(bus) != 0))
+		vector = STDIO_PCI1_IRQ_TO_SCB_VECTOR(stdio_irq);
+	else	
+		vector = STDIO_PCI0_IRQ_TO_SCB_VECTOR(stdio_irq);
 
-	mask = irq_to_mask[irq->r_start];
-	vector = 0x800 + (mask << 4);
-	
 	error = rman_activate_resource(irq);
 	if (error)
 		return error;
@@ -375,24 +667,18 @@ t2_setup_intr(device_t dev, device_t child,
 	error = alpha_setup_intr(device_get_nameunit(child ? child : dev),
 			vector, intr, arg, ithread_priority(flags), flags,
 			cookiep, &intrcnt[irq->r_start],
-			t2_disable_intr, t2_enable_intr);
+	                t2_disable_vec, t2_enable_vec);
+	    
 	if (error)
 		return error;
 
 	/* Enable interrupt */
-
-	t2_shadow_mask &= ~(1UL << mask);
-
-	if (mask <= 7)
-		outb(SLAVE0_ICU, t2_shadow_mask);
-	else if (mask <= 15)
-		outb(SLAVE1_ICU, t2_shadow_mask >> 8);
-	else 
-		outb(SLAVE2_ICU, t2_shadow_mask >> 16);
-
-	device_printf(child, "interrupting at T2 irq %d\n",
-		      (int) irq->r_start);
-
+	t2_enable_vec(vector);
+	
+	if (bootverbose != 0) 
+		device_printf(child, 
+		    "interrupting at T2 irq %d (stdio irq %d)\n",
+		      (int) irq->r_start, stdio_irq);
 	return 0;
 }
 
@@ -401,10 +687,18 @@ t2_teardown_intr(device_t dev, device_t child,
 	       struct resource *irq, void *cookie)
 {
 	int mask;
-
+	
 	mask = irq_to_mask[irq->r_start];
 
 	/* Disable interrupt */
+	
+	/* 
+	 *  XXX this is totally broken! 
+	 *  we don't have enough info to figure out where the interrupt 
+	 *  came from if hose != 0 and pci_int_type[hose] != 0
+	 *  We should probably carry around the vector someplace --
+	 *  that would be enough to figure out the hose and the stdio irq
+	 */
 
 	t2_shadow_mask |= (1UL << mask);
 
@@ -419,33 +713,13 @@ t2_teardown_intr(device_t dev, device_t child,
 	return rman_deactivate_resource(irq);
 }
 
-static void
-t2_ack_intr(unsigned long vector)
-{
-	int mask = (vector - 0x800) >> 4;
-	
-	switch (mask) {
-		case 0 ... 7:
-			outb(SLAVE0_ICU-1, (0xe0 | (mask)));
-			outb(MASTER_ICU-1, (0xe0 | 1));
-			break;
-		case 8 ... 15:
-			outb(SLAVE1_ICU-1, (0xe0 | (mask - 8)));
-			outb(MASTER_ICU-1, (0xe0 | 3));
-			break;
-		case 16 ... 24:
-			outb(SLAVE2_ICU-1, (0xe0 | (mask - 16)));
-			outb(MASTER_ICU-1, (0xe0 | 4));
-			break;
-	}
-}
 
 
 static void
 t2_dispatch_intr(void *frame, unsigned long vector)
 {
 	alpha_dispatch_intr(frame, vector);
-	t2_ack_intr(vector);
+	t2_eoi(vector);
 }
 
 static void
diff --git a/sys/alpha/pci/t2_pci.c b/sys/alpha/pci/t2_pci.c
index 4424ed9..73a754a 100644
--- a/sys/alpha/pci/t2_pci.c
+++ b/sys/alpha/pci/t2_pci.c
@@ -79,7 +79,7 @@ t2_pcib_cvt_dense(device_t dev, vm_offset_t addr)
 static int
 t2_pcib_maxslots(device_t dev)
 {
-	return 31;
+	return 9;
 }
 
 #define T2_CFGOFF(b, s, f, r)					\
diff --git a/sys/alpha/pci/t2reg.h b/sys/alpha/pci/t2reg.h
index 339c4e1..86f04e9 100644
--- a/sys/alpha/pci/t2reg.h
+++ b/sys/alpha/pci/t2reg.h
@@ -23,6 +23,28 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
+ * Portions of this file were obtained from Compaq intellectual
+ * property which was made available under the following copyright:
+ *
+ * *****************************************************************
+ * *                                                               *
+ * *    Copyright Compaq Computer Corporation, 2000                *
+ * *                                                               *
+ * *   Permission to use, copy, modify, distribute, and sell       *
+ * *   this software and its documentation for any purpose is      *
+ * *   hereby granted without fee, provided that the above         *
+ * *   copyright notice appear in all copies and that both         *
+ * *   that copyright notice and this permission notice appear     *
+ * *   in supporting documentation, and that the name of           *
+ * *   Compaq Computer Corporation not be used in advertising      *
+ * *   or publicity pertaining to distribution of the software     *
+ * *   without specific, written prior permission.  Compaq         *
+ * *   makes no representations about the suitability of this      *
+ * *   software for any purpose.  It is provided "AS IS"           *
+ * *   without express or implied warranty.                        *
+ * *                                                               *
+ * *****************************************************************
+ *
  * $FreeBSD$
  */
 
@@ -34,12 +56,14 @@
  */
 
 #define REGVAL(r)	(*(volatile int32_t *)				\
-				ALPHA_PHYS_TO_K0SEG(r + t2_csr_base)) 
+				ALPHA_PHYS_TO_K0SEG(r + sable_lynx_base)) 
 #define REGVAL64(r)	(*(volatile int64_t *)				\
-				ALPHA_PHYS_TO_K0SEG(r + t2_csr_base))
+				ALPHA_PHYS_TO_K0SEG(r + sable_lynx_base))
 
 #define SABLE_BASE	0x0UL		/* offset of SABLE CSRs */
 #define LYNX_BASE	0x8000000000UL	/* offset of LYNX CSRs */
+#define PCI0_BASE	0x38e000000UL
+#define PCI1_BASE	0x38f000000UL
 
 #define CBUS_BASE	0x380000000	/* CBUS CSRs */
 #define T2_PCI_SIO	0x3a0000000	/* PCI sparse I/O space */
@@ -170,3 +194,68 @@
 #define	SLAVE1_ICU	0x53b
 #define	SLAVE2_ICU	0x53d
 #define	SLAVE3_ICU	0x53f
+
+
+#define T2_EISA_IRQ_TO_STDIO_IRQ( x )	((x) + 7)
+#define T2_STDIO_IRQ_TO_EISA_IRQ( x )	((x) - 7)
+#define STDIO_PCI0_IRQ_TO_SCB_VECTOR( x )	(( ( x ) * 0x10) + 0x800)
+#define STDIO_PCI1_IRQ_TO_SCB_VECTOR( x )	(( ( x ) * 0x10) + 0xC00)
+
+/*
+ * T4  Control and Status Registers
+ *
+ * All CBUS CSRs in the Cbus2 IO subsystems are in the T4 gate array.  The
+ * CBUS CSRs in the T4 are all aligned on hexaword boundaries and have 
+ * quadword length.  Note, this structure also works for T2 as the T2
+ * registers are a proper subset of the T3/T4's.  Just make sure
+ * that T2 code does not reference T3/T4-only registers.
+ *
+ */
+
+typedef struct {
+	u_long iocsr;	u_long fill_00[3]; /* I/O Control/Status */
+	u_long cerr1;	u_long fill_01[3]; /* Cbus Error Register 1 */
+	u_long cerr2;	u_long fill_02[3]; /* Cbus Error Register 2 */
+	u_long cerr3;	u_long fill_03[3]; /* Cbus Error Register 3 */
+	u_long pcierr1;	u_long fill_04[3]; /* PCI Error Register 1 */
+	u_long pcierr2;	u_long fill_05[3]; /* PCI Error Register 2 */
+	u_long pciscr;	u_long fill_06[3]; /* PCI Special Cycle  */
+	u_long hae0_1;	u_long fill_07[3]; /* High Address Extension 1 */
+	u_long hae0_2;	u_long fill_08[3]; /* High Address Extension 2 */
+	u_long hbase;	u_long fill_09[3]; /* PCI Hole Base */
+	u_long wbase1;	u_long fill_0a[3]; /* Window Base 1 */
+	u_long wmask1;	u_long fill_0b[3]; /* Window Mask 1 */
+	u_long tbase1;	u_long fill_0c[3]; /* Translated Base 1 */
+	u_long wbase2;	u_long fill_0d[3]; /* Window Base 2 */
+	u_long wmask2;	u_long fill_0e[3]; /* Window Mask 2 */
+	u_long tbase2;	u_long fill_0f[3]; /* Translated Base 2 */
+	u_long tlbbr;	u_long fill_10[3]; /* TLB by-pass */
+	u_long ivr;	u_long fill_11[3]; /* IVR Passive Rels/Intr Addr  (reserved on T3/T4) */
+	u_long hae0_3;	u_long fill_12[3]; /* High Address Extension 3 */
+	u_long hae0_4;	u_long fill_13[3]; /* High Address Extension 4 */
+	u_long wbase3;	u_long fill_14[3]; /* Window Base 3 */
+	u_long wmask3;	u_long fill_15[3]; /* Window Mask 3 */
+	u_long tbase3;	u_long fill_16[3]; /* Translated Base 3 */
+
+	u_long rsvd1;	u_long fill_16a[3]; /* unused location */
+
+	u_long tdr0;	u_long fill_17[3]; /* tlb data register 0 */
+	u_long tdr1;	u_long fill_18[3]; /* tlb data register 1 */
+	u_long tdr2;	u_long fill_19[3]; /* tlb data register 2 */
+	u_long tdr3;	u_long fill_1a[3]; /* tlb data register 3 */
+	u_long tdr4;	u_long fill_1b[3]; /* tlb data register 4 */
+	u_long tdr5;	u_long fill_1c[3]; /* tlb data register 5 */
+	u_long tdr6;	u_long fill_1d[3]; /* tlb data register 6 */
+	u_long tdr7;	u_long fill_1e[3]; /* tlb data register 7 */
+	u_long wbase4;	u_long fill_1f[3]; /* Window Base 4 */
+	u_long wmask4;	u_long fill_20[3]; /* Window Mask 4 */
+	u_long tbase4;	u_long fill_21[3]; /* Translated Base 4 */
+/*
+ * The following 4 registers are used to get to the ICIC chip
+ */
+	u_long air;	u_long fill_22[3]; /* Address Indirection register */
+	u_long var;	u_long fill_23[3]; /* Vector access register */
+	u_long dir;	u_long fill_24[3]; /* Data Indirection register */
+	u_long ice;	u_long fill_25[3]; /* IC enable register Indirection register */
+
+} t2_csr_t;
diff --git a/sys/alpha/pci/t2var.h b/sys/alpha/pci/t2var.h
index cadfa48..a328633 100644
--- a/sys/alpha/pci/t2var.h
+++ b/sys/alpha/pci/t2var.h
@@ -26,6 +26,7 @@
  * $FreeBSD$
  */
 
-extern vm_offset_t	t2_csr_base;
+extern vm_offset_t	sable_lynx_base;
 
 extern void t2_init(void);
+void t2_intr_map(void *);