pci portion of eb164 support. from NetBSD

1 files changed, 158 insertions, 113 deletions

diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 6913840c9da..f151856d887 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,5 +1,42 @@
-/*	$OpenBSD: pci_eb164.c,v 1.3 1999/01/11 05:11:03 millert Exp $	*/
-/*	$NetBSD: pci_eb164.c,v 1.4 1996/11/25 03:47:05 cgd Exp $	*/
+/* $OpenBSD: pci_eb164.c,v 1.4 2000/11/11 19:36:34 ericj Exp $ */
+/* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
+ * NASA Ames Research Center.
+ *
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the NetBSD
+ *	Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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 FOUNDATION OR CONTRIBUTORS
+ * 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.
+ */
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -38,25 +75,21 @@
 #include <sys/syslog.h>
 
 #include <vm/vm.h>
+#include <uvm/uvm.h>
 
 #include <machine/autoconf.h>
 #include <machine/rpb.h>
 
 #include <dev/pci/pcireg.h>
 #include <dev/pci/pcivar.h>
+#include <dev/pci/pciidereg.h>
+#include <dev/pci/pciidevar.h>
 
 #include <alpha/pci/ciareg.h>
 #include <alpha/pci/ciavar.h>
 
 #include <alpha/pci/pci_eb164.h>
 
-#include <dev/pci/pciidereg.h>
-#include <dev/pci/pciidevar.h>
-
-#ifndef EVCNT_COUNTERS
-#include <machine/intrcnt.h>
-#endif
-
 #include "sio.h"
 #if NSIO
 #include <alpha/pci/siovar.h>
@@ -65,21 +98,19 @@
 int	dec_eb164_intr_map __P((void *, pcitag_t, int, int,
 	    pci_intr_handle_t *));
 const char *dec_eb164_intr_string __P((void *, pci_intr_handle_t));
+const struct evcnt *dec_eb164_intr_evcnt __P((void *, pci_intr_handle_t));
 void	*dec_eb164_intr_establish __P((void *, pci_intr_handle_t,
-	    int, int (*)(void *), void *, char *));
+	    int, int (*func)(void *), void *, char *));
 void	dec_eb164_intr_disestablish __P((void *, void *));
 
-void    *dec_eb164_pciide_compat_intr_establish __P((void *, struct device *,
-            struct pci_attach_args *, int, int (*)(void *), void *));
- 
+void	*dec_eb164_pciide_compat_intr_establish __P((void *, struct device *,
+	    struct pci_attach_args *, int, int (*)(void *), void *));
+
 #define	EB164_SIO_IRQ	4  
 #define	EB164_MAX_IRQ	24
 #define	PCI_STRAY_MAX	5
 
 struct alpha_shared_intr *eb164_pci_intr;
-#ifdef EVCNT_COUNTERS
-struct evcnt eb164_intr_evcnt;
-#endif
 
 bus_space_tag_t eb164_intrgate_iot;
 bus_space_handle_t eb164_intrgate_ioh;
@@ -102,8 +133,8 @@ pci_eb164_pickintr(ccp)
         pc->pc_intr_establish = dec_eb164_intr_establish;
         pc->pc_intr_disestablish = dec_eb164_intr_disestablish;
 
-        pc->pc_pciide_compat_intr_establish =
-            dec_eb164_pciide_compat_intr_establish;
+	pc->pc_pciide_compat_intr_establish =
+	    dec_eb164_pciide_compat_intr_establish;
 
 	eb164_intrgate_iot = iot;
 	if (bus_space_map(eb164_intrgate_iot, 0x804, 3, 0,
@@ -113,9 +144,15 @@ pci_eb164_pickintr(ccp)
 		eb164_intr_disable(i);	
 
 	eb164_pci_intr = alpha_shared_intr_alloc(EB164_MAX_IRQ);
-	for (i = 0; i < EB164_MAX_IRQ; i++)
+	for (i = 0; i < EB164_MAX_IRQ; i++) {
+		/*
+		 * Systems with a Pyxis seem to have problems with
+		 * stray interrupts, so just ignore them.  Sigh,
+		 * I hate buggy hardware.
+		 */
 		alpha_shared_intr_set_maxstrays(eb164_pci_intr, i,
-			PCI_STRAY_MAX);
+			(ccp->cc_flags & CCF_ISPYXIS) ? 0 : PCI_STRAY_MAX);
+	}
 
 #if NSIO
 	sio_intr_setup(pc, iot);
@@ -137,63 +174,63 @@ dec_eb164_intr_map(ccv, bustag, buspin, line, ihp)
 	int bus, device, function;
 	u_int64_t variation;
 
-        if (buspin == 0) {
-                /* No IRQ used. */
-                return 1;
-        }
-        if (buspin > 4) {
-                printf("dec_eb164_intr_map: bad interrupt pin %d\n", buspin);
-                return 1;
-        }
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_eb164_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
 
 	alpha_pci_decompose_tag(pc, bustag, &bus, &device, &function);
 
 	variation = hwrpb->rpb_variation & SV_ST_MASK;
 
-        /*
-         *
-         * The AlphaPC 164 and AlphaPC 164LX have a CMD PCI IDE controller
-         * at bus 0 device 11.  These are wired to compatibility mode,
-         * so do not map their interrupts.
-         * 
-         * The AlphaPC 164SX has PCI IDE on functions 1 and 2 of the
-         * Cypress PCI-ISA bridge at bus 0 device 8.  These, too, are
-         * wired to compatibility mode.
-         * 
-         * Real EB164s have ISA IDE on the Super I/O chip.
-         */
-        if (bus == 0) {
-                if (variation >= SV_ST_ALPHAPC164_366 &&
-                    variation <= SV_ST_ALPHAPC164LX_600) {
-                        if (device == 8)
-                                panic("dec_eb164_intr_map: SIO device");
-                        if (device == 11)
-                                return (1);
-                } else if (variation >= SV_ST_ALPHAPC164SX_400 &&
-                           variation <= SV_ST_ALPHAPC164SX_600) {
-                        if (device == 8) {
-                                if (function == 0)
-                                        panic("dec_eb164_intr_map: SIO device");
-                                return (1);
-                        }
-                } else { 
-                        if (device == 8)
-                                panic("dec_eb164_intr_map: SIO device");
-                }
-        }
-
-        /*
-         * The console places the interrupt mapping in the "line" value.
-         * A value of (char)-1 indicates there is no mapping.
-         */
-        if (line == 0xff) {
-                printf("dec_eb164_intr_map: no mapping for %d/%d/%d\n",
-                    bus, device, function);
-                return (1);
-        }
-         
+	/*
+	 *
+	 * The AlphaPC 164 and AlphaPC 164LX have a CMD PCI IDE controller
+	 * at bus 0 device 11.  These are wired to compatibility mode,
+	 * so do not map their interrupts.
+	 *
+	 * The AlphaPC 164SX has PCI IDE on functions 1 and 2 of the
+	 * Cypress PCI-ISA bridge at bus 0 device 8.  These, too, are
+	 * wired to compatibility mode.
+	 *
+	 * Real EB164s have ISA IDE on the Super I/O chip.
+	 */
+	if (bus == 0) {
+		if (variation >= SV_ST_ALPHAPC164_366 &&
+		    variation <= SV_ST_ALPHAPC164LX_600) {
+			if (device == 8)
+				panic("dec_eb164_intr_map: SIO device");
+			if (device == 11)
+				return (1);
+		} else if (variation >= SV_ST_ALPHAPC164SX_400 &&
+			   variation <= SV_ST_ALPHAPC164SX_600) {
+			if (device == 8) {
+				if (function == 0)
+					panic("dec_eb164_intr_map: SIO device");
+				return (1);
+			}
+		} else {
+			if (device == 8)
+				panic("dec_eb164_intr_map: SIO device");
+		}
+	}
+
+	/*
+	 * The console places the interrupt mapping in the "line" value.
+	 * A value of (char)-1 indicates there is no mapping.
+	 */
+	if (line == 0xff) {
+		printf("dec_eb164_intr_map: no mapping for %d/%d/%d\n",
+		    bus, device, function);
+		return (1);
+	}
+
 	if (line > EB164_MAX_IRQ)
-		panic("dec_eb164_map_int: eb164_irq too large (%d)",
+		panic("dec_eb164_intr_map: eb164 irq too large (%d)",
 		    line);
 
 	*ihp = line;
@@ -211,8 +248,8 @@ dec_eb164_intr_string(ccv, ih)
         static char irqstr[15];          /* 11 + 2 + NULL + sanity */
 
         if (ih > EB164_MAX_IRQ)
-                panic("dec_eb164_intr_string: bogus eb164 IRQ 0x%x", ih);
-        sprintf(irqstr, "eb164 irq %d", ih);
+                panic("dec_eb164_intr_string: bogus eb164 IRQ 0x%lx", ih);
+        sprintf(irqstr, "eb164 irq %ld", ih);
         return (irqstr);
 }
 
@@ -224,10 +261,13 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg, name)
         int (*func) __P((void *));
 	char *name;
 {
+#if 0
+	struct cia_config *ccp = ccv;
+#endif
 	void *cookie;
 
 	if (ih > EB164_MAX_IRQ)
-		panic("dec_eb164_intr_establish: bogus eb164 IRQ 0x%x", ih);
+		panic("dec_eb164_intr_establish: bogus eb164 IRQ 0x%lx", ih);
 
 	cookie = alpha_shared_intr_establish(eb164_pci_intr, ih, IST_LEVEL,
 	    level, func, arg, name);
@@ -244,37 +284,52 @@ dec_eb164_intr_disestablish(ccv, cookie)
 #if 0
 	struct cia_config *ccp = ccv;
 #endif
-
-	panic("dec_eb164_intr_disestablish not implemented"); /* XXX */
+	struct alpha_shared_intrhand *ih = cookie;
+	unsigned int irq = ih->ih_num;
+	int s;
+ 
+	s = splhigh();
+
+	alpha_shared_intr_disestablish(eb164_pci_intr, cookie,
+	    "eb164 irq");
+	if (alpha_shared_intr_isactive(eb164_pci_intr, irq) == 0) {
+		eb164_intr_disable(irq);
+		alpha_shared_intr_set_dfltsharetype(eb164_pci_intr, irq,
+		    IST_NONE);
+	}
+ 
+	splx(s);
 }
 
-void *      
+void *
 dec_eb164_pciide_compat_intr_establish(v, dev, pa, chan, func, arg)
-        void *v;
-        struct device *dev;
-        struct pci_attach_args *pa;
-        int chan;
-        int (*func) __P((void *));
-        void *arg;
-{       
-        pci_chipset_tag_t pc = pa->pa_pc;
-        void *cookie = NULL;
-        int bus, irq;
-            
-        alpha_pci_decompose_tag(pc, pa->pa_tag, &bus, NULL, NULL);
-        
-        /*
-         * If this isn't PCI bus #0, all bets are off.
-         */
-        if (bus != 0)
-                return (NULL);
-                
-        irq = PCIIDE_COMPAT_IRQ(chan);
+	void *v;
+	struct device *dev;
+	struct pci_attach_args *pa;
+	int chan;
+	int (*func) __P((void *));
+	void *arg;
+{
+	pci_chipset_tag_t pc = pa->pa_pc;
+	void *cookie = NULL;
+	int bus, irq;
+
+	alpha_pci_decompose_tag(pc, pa->pa_tag, &bus, NULL, NULL);
+
+	/*
+	 * If this isn't PCI bus #0, all bets are off.
+	 */
+	if (bus != 0)
+		return (NULL);
+
+	irq = PCIIDE_COMPAT_IRQ(chan);
 #if NSIO
-        cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO,
-            func, arg, "eb164 irq");
+	cookie = sio_intr_establish(NULL /*XXX*/, irq, IST_EDGE, IPL_BIO,
+	    func, arg, "eb164 irq");
+	if (cookie == NULL)
+		return (NULL);
 #endif
-        return (cookie);
+	return (cookie);
 }
 
 void
@@ -286,23 +341,13 @@ eb164_iointr(framep, vec)
 
 	if (vec >= 0x900) {
 		if (vec >= 0x900 + (EB164_MAX_IRQ << 4))
-			panic("eb164_iointr: vec 0x%x out of range", vec);
+			panic("eb164_iointr: vec 0x%lx out of range", vec);
 		irq = (vec - 0x900) >> 4;
 
-#ifdef EVCNT_COUNTERS
-		eb164_intr_evcnt.ev_count++;
-#else
-		if (EB164_MAX_IRQ != INTRCNT_EB164_IRQ_LEN)
-			panic("eb164 interrupt counter sizes inconsistent");
-		intrcnt[INTRCNT_EB164_IRQ + irq]++;
-#endif
-
 		if (!alpha_shared_intr_dispatch(eb164_pci_intr, irq)) {
 			alpha_shared_intr_stray(eb164_pci_intr, irq,
 			    "eb164 irq");
-			if (eb164_pci_intr[irq].intr_nstrays ==
-			    eb164_pci_intr[irq].intr_maxstrays
-			    && TAILQ_FIRST(&eb164_pci_intr[irq].intr_q) == NULL)
+			if (ALPHA_SHARED_INTR_DISABLE(eb164_pci_intr, irq))
 				eb164_intr_disable(irq);
 		}
 		return;
@@ -313,7 +358,7 @@ eb164_iointr(framep, vec)
 		return;
 	}
 #endif
-	panic("eb164_iointr: weird vec 0x%x", vec);
+	panic("eb164_iointr: weird vec 0x%lx", vec);
 }
 
 #if 0		/* THIS DOES NOT WORK!  see pci_eb164_intr.S. */