add support for AlphaPC 64.

from NetBSD.

7 files changed, 701 insertions, 13 deletions

diff --git a/sys/arch/alpha/alpha/cpuconf.c b/sys/arch/alpha/alpha/cpuconf.c
index 6b2815500f7..bf35ed8a466 100644
--- a/sys/arch/alpha/alpha/cpuconf.c
+++ b/sys/arch/alpha/alpha/cpuconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpuconf.c,v 1.4 2002/01/22 21:48:43 ericj Exp $ */
+/* $OpenBSD: cpuconf.c,v 1.5 2002/01/23 03:20:41 ericj Exp $ */
 /* $NetBSD: cpuconf.c,v 1.27 2000/06/26 02:42:04 enami Exp $ */
 
 /*-
@@ -109,6 +109,12 @@ extern void dec_eb164_init __P((void));
 #define	dec_eb164_init		platform_not_configured
 #endif
 
+#ifdef DEC_EB64PLUS
+extern void dec_eb64plus_init __P((void));
+#else
+#define dec_eb64plus_init __P((void));
+#endif
+
 #ifdef	DEC_KN300
 extern void dec_kn300_init __P((void));
 #else
@@ -150,7 +156,7 @@ static const struct cpuinit cpuinit[] = {
 	cpu_init(ST_DEC_KN20AA, dec_kn20aa_init, "DEC_KN20AA"),
 	cpu_notsupp(ST_DEC_1000, "DEC_1000"),
 	cpu_notsupp(ST_EB66, "DEC_EB66"),
-	cpu_notsupp(ST_EB64P, "DEC_EB64PLUS"),
+	cpu_init(ST_EB64P, dec_eb64plus_init, "DEC_EB64PLUS"),
 	cpu_notsupp(ST_ALPHABOOK1, "DEC_ALPHABOOK1"),
 	cpu_notsupp(ST_DEC_4100, "DEC_KN300"),
 	cpu_notsupp(ST_DEC_EV45_PBP, "EV45 Passive Backplane Board"),
diff --git a/sys/arch/alpha/alpha/dec_eb64plus.c b/sys/arch/alpha/alpha/dec_eb64plus.c
new file mode 100644
index 00000000000..74597673351
--- /dev/null
+++ b/sys/arch/alpha/alpha/dec_eb64plus.c
@@ -0,0 +1,275 @@
+/* $OpenBSD: dec_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */
+/* $NetBSD: dec_eb64plus.c,v 1.25 2001/06/05 04:53:11 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1995, 1996, 1997 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ * 
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+/*
+ * Additional Copyright (c) 1997 by Matthew Jacob for NASA/Ames Research Center
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/termios.h>
+#include <dev/cons.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/rpb.h>
+#include <machine/autoconf.h>
+#include <machine/cpuconf.h>
+#include <machine/conf.h>
+
+#include <dev/ic/comreg.h>
+#include <dev/ic/comvar.h>
+
+#include <dev/isa/isareg.h>
+#include <dev/isa/isavar.h>
+#include <dev/ic/i8042reg.h>
+#include <dev/ic/pckbcvar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include <alpha/pci/apecsreg.h>
+#include <alpha/pci/apecsvar.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsiconf.h>
+#include <dev/ata/atavar.h>
+
+#include "pckbd.h"
+
+#ifndef CONSPEED
+#define CONSPEED TTYDEF_SPEED
+#endif
+static int comcnrate = CONSPEED;
+
+void dec_eb64plus_init __P((void));
+static void dec_eb64plus_cons_init __P((void));
+static void dec_eb64plus_device_register __P((struct device *, void *));
+
+const struct alpha_variation_table dec_eb64plus_variations[] = {
+	{ 0, "DEC EB64+" },
+	{ 0, NULL },
+};
+
+void
+dec_eb64plus_init()
+{
+	u_int64_t variation;
+
+	platform.family = "EB64+";
+
+	if ((platform.model = alpha_dsr_sysname()) == NULL) {
+		variation = hwrpb->rpb_variation & SV_ST_MASK;
+		if ((platform.model = alpha_variation_name(variation,
+		    dec_eb64plus_variations)) == NULL)
+			platform.model = alpha_unknown_sysname();
+	}
+
+	platform.iobus = "apecs";
+	platform.cons_init = dec_eb64plus_cons_init;
+	platform.device_register = dec_eb64plus_device_register;
+}
+
+static void
+dec_eb64plus_cons_init()
+{
+	struct ctb *ctb;
+	struct apecs_config *acp;
+	extern struct apecs_config apecs_configuration;
+
+	acp = &apecs_configuration;
+	apecs_init(acp, 0);
+
+	ctb = (struct ctb *)(((caddr_t)hwrpb) + hwrpb->rpb_ctb_off);
+
+	switch (ctb->ctb_term_type) {
+	case CTB_PRINTERPORT: 
+		/* serial console ... */
+		/* XXX */
+		{
+			/*
+			 * Delay to allow PROM putchars to complete.
+			 * FIFO depth * character time,
+			 * character time = (1000000 / (defaultrate / 10))
+			 */
+			DELAY(160000000 / comcnrate);
+
+			if(comcnattach(&acp->ac_iot, 0x3f8, comcnrate,
+			    COM_FREQ,
+			    (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8))
+				panic("can't init serial console");
+
+			break;
+		}
+
+	case CTB_GRAPHICS:
+#if NPCKBD > 0
+		/* display console ... */
+		/* XXX */
+		(void) pckbc_cnattach(&acp->ac_iot, IO_KBD, KBCMDP,
+		    PCKBC_KBD_SLOT);
+
+		if (CTB_TURBOSLOT_TYPE(ctb->ctb_turboslot) ==
+		    CTB_TURBOSLOT_TYPE_ISA)
+			isa_display_console(&acp->ac_iot, &acp->ac_memt);
+		else
+			pci_display_console(&acp->ac_iot, &acp->ac_memt,
+			    &acp->ac_pc, CTB_TURBOSLOT_BUS(ctb->ctb_turboslot),
+			    CTB_TURBOSLOT_SLOT(ctb->ctb_turboslot), 0);
+#else
+		panic("not configured to use display && keyboard console");
+#endif
+		break;
+
+	default:
+		printf("ctb->ctb_term_type = 0x%lx\n", ctb->ctb_term_type);
+		printf("ctb->ctb_turboslot = 0x%lx\n", ctb->ctb_turboslot);
+
+		panic("consinit: unknown console type %ld\n",
+		    ctb->ctb_term_type);
+	}
+}
+
+static void
+dec_eb64plus_device_register(dev, aux)
+	struct device *dev;
+	void *aux;
+{
+	static int found, initted, scsiboot, netboot;
+	static struct device *pcidev, *scsidev;
+	struct bootdev_data *b = bootdev_data;
+	struct device *parent = dev->dv_parent;
+	struct cfdata *cf = dev->dv_cfdata;
+	struct cfdriver *cd = cf->cf_driver;
+
+	if (found)
+		return;
+
+	if (!initted) {
+		scsiboot = (strcmp(b->protocol, "SCSI") == 0);
+		netboot = (strcmp(b->protocol, "BOOTP") == 0) ||
+		    (strcmp(b->protocol, "MOP") == 0);
+#if 0
+		printf("scsiboot = %d, netboot = %d\n", scsiboot, netboot);
+#endif
+		initted =1;
+	}
+
+	if (pcidev == NULL) {
+		if (strcmp(cd->cd_name, "pci"))
+			return;
+		else {
+			struct pcibus_attach_args *pba = aux;
+
+			if ((b->slot / 1000) != pba->pba_bus)
+				return;
+	
+			pcidev = dev;
+#if 0
+			printf("\npcidev = %s\n", pcidev->dv_xname);
+#endif
+			return;
+		}
+	}
+
+	if (scsiboot && (scsidev == NULL)) {
+		if (parent != pcidev)
+			return;
+		else {
+			struct pci_attach_args *pa = aux;
+
+			if ((b->slot % 1000) != pa->pa_device)
+				return;
+
+			/* XXX function? */
+	
+			scsidev = dev;
+#if 0
+			printf("\nscsidev = %s\n", scsidev->dv_xname);
+#endif
+			return;
+		}
+	}
+
+	if (scsiboot &&
+	    (!strcmp(cd->cd_name, "sd") ||
+	     !strcmp(cd->cd_name, "st") ||
+	     !strcmp(cd->cd_name, "cd"))) {
+		struct scsibus_attach_args *sa = aux;
+
+		if (parent->dv_parent != scsidev)
+			return;
+
+		if (b->unit / 100 != sa->sa_sc_link->target)
+			return;
+
+		/* XXX LUN! */
+
+		switch (b->boot_dev_type) {
+		case 0:
+			if (strcmp(cd->cd_name, "sd") &&
+			    strcmp(cd->cd_name, "cd"))
+				return;
+			break;
+		case 1:
+			if (strcmp(cd->cd_name, "st"))
+				return;
+			break;
+		default:
+			return;
+		}
+
+		/* we've found it! */
+		booted_device = dev;
+#if 0
+		printf("\nbooted_device = %s\n", booted_device->dv_xname);
+#endif
+		found = 1;
+	}
+
+	if (netboot) {
+		if (parent != pcidev)
+			return;
+		else {
+			struct pci_attach_args *pa = aux;
+
+			if ((b->slot % 1000) != pa->pa_device)
+				return;
+
+			/* XXX function? */
+	
+			booted_device = dev;
+#if 0
+			printf("\nbooted_device = %s\n", booted_device->dv_xname);
+#endif
+			found = 1;
+			return;
+		}
+	}
+}
diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC
index 6d613287d8f..d9881baefbf 100644
--- a/sys/arch/alpha/conf/GENERIC
+++ b/sys/arch/alpha/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.93 2001/11/30 01:41:53 nate Exp $
+#	$OpenBSD: GENERIC,v 1.94 2002/01/23 03:20:41 ericj Exp $
 #	$NetBSD: GENERIC,v 1.31 1996/12/03 17:25:29 cgd Exp $
 
 machine	alpha
@@ -13,6 +13,7 @@ option		DEC_2100_A50	# Avanti etc:	AlphaStation 400, 200, etc.
 option		DEC_KN20AA	# KN20AA:	AlphaStation 600
 option		DEC_AXPPCI_33	# NoName:	AXPpci33, etc.
 option		DEC_EB164	# EB164:	AlphaPC 164
+option		DEC_EB64PLUS	# EB64+:	AlphaPC 64, etc.
 option		DEC_2000_300	# "Jensen":	2000/300 (DECpc AXP 150)
 option		DEC_550		# Miata:	Digital Personal Workstation
 option		DEC_6600	# EV6:		XP1000, 264DP OEM Board
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index fcf8d1abf92..af468fd3aa4 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.53 2001/11/05 02:41:01 art Exp $
+#	$OpenBSD: files.alpha,v 1.54 2002/01/23 03:20:41 ericj Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -11,7 +11,8 @@ maxusers 2 8 64
 # this loses, but there's no way to define attributes which have attributes
 define	alpha_shared_intr
 file	arch/alpha/dev/shared_intr.c	alpha_shared_intr | dec_eb164 |
-					dec_kn20aa | dec_6600 | dec_550
+					dec_kn20aa | dec_6600 | dec_550 |
+					dec_eb64plus
 
 define	alpha_sgmap
 file	arch/alpha/dev/sgmap_common.c alpha_sgmap | dec_3000_500
@@ -224,14 +225,16 @@ file    arch/alpha/pci/tsp_pci.c        tsp
 file    arch/alpha/pci/tsp_bus_io.c     tsp
 file    arch/alpha/pci/tsp_bus_mem.c    tsp
 
-file	arch/alpha/pci/pci_2100_a50.c	dec_2100_a50
-file	arch/alpha/pci/pci_axppci_33.c	dec_axppci_33
-file	arch/alpha/pci/pci_eb164.c	dec_eb164
-file	arch/alpha/pci/pci_eb164_intr.s	dec_eb164
-file	arch/alpha/pci/pci_kn20aa.c	dec_kn20aa
-file	arch/alpha/pci/pci_550.c	dec_550
-file	arch/alpha/pci/pci_6600.c	dec_6600
-file	arch/alpha/pci/pci_up1000.c	api_up1000
+file	arch/alpha/pci/pci_2100_a50.c		dec_2100_a50
+file	arch/alpha/pci/pci_axppci_33.c		dec_axppci_33
+file	arch/alpha/pci/pci_eb164.c		dec_eb164
+file	arch/alpha/pci/pci_eb164_intr.s		dec_eb164
+file	arch/alpha/pci/pci_eb64plus.c		dec_eb64plus
+file	arch/alpha/pci/pci_eb64plus_intr.s	dec_eb64plus
+file	arch/alpha/pci/pci_kn20aa.c		dec_kn20aa
+file	arch/alpha/pci/pci_550.c		dec_550
+file	arch/alpha/pci/pci_6600.c		dec_6600
+file	arch/alpha/pci/pci_up1000.c		api_up1000
 
 #
 # PCI Bus devices
@@ -312,6 +315,7 @@ file	arch/alpha/alpha/dec_3000_300.c		dec_3000_300	needs-flag
 file	arch/alpha/alpha/dec_3000_500.c		dec_3000_500	needs-flag
 file	arch/alpha/alpha/dec_axppci_33.c	dec_axppci_33	needs-flag
 file	arch/alpha/alpha/dec_eb164.c		dec_eb164	needs-flag
+file	arch/alpha/alpha/dec_eb64plus.c		dec_eb64plus	needs-flag
 file	arch/alpha/alpha/dec_kn20aa.c		dec_kn20aa	needs-flag
 file	arch/alpha/alpha/dec_550.c		dec_550		needs-flag
 file    arch/alpha/alpha/dec_6600.c             dec_6600	needs-flag
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
new file mode 100644
index 00000000000..54bac7181fa
--- /dev/null
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -0,0 +1,309 @@
+/* $OpenBSD: pci_eb64plus.c,v 1.1 2002/01/23 03:20:41 ericj Exp $ */
+/* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 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.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ * 
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/systm.h>
+#include <sys/errno.h>
+#include <sys/malloc.h>
+#include <sys/device.h>
+#include <sys/syslog.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <machine/autoconf.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+
+#include <alpha/pci/apecsreg.h>
+#include <alpha/pci/apecsvar.h>
+
+#include <alpha/pci/pci_eb64plus.h>
+
+#include "sio.h"
+#if NSIO
+#include <alpha/pci/siovar.h>
+#endif
+
+int	dec_eb64plus_intr_map __P((void *, pcitag_t, int, int,
+	    pci_intr_handle_t *));
+const char *dec_eb64plus_intr_string __P((void *, pci_intr_handle_t));
+const struct evcnt *dec_eb64plus_intr_evcnt __P((void *, pci_intr_handle_t));
+void	*dec_eb64plus_intr_establish __P((void *, pci_intr_handle_t,
+	    int, int (*func)(void *), void *, char *));
+void	dec_eb64plus_intr_disestablish __P((void *, void *));
+
+#define	EB64PLUS_MAX_IRQ	32
+#define	PCI_STRAY_MAX		5
+
+struct alpha_shared_intr *eb64plus_pci_intr;
+
+bus_space_tag_t eb64plus_intrgate_iot;
+bus_space_handle_t eb64plus_intrgate_ioh;
+
+void	eb64plus_iointr __P((void *arg, unsigned long vec));
+extern void	eb64plus_intr_enable __P((int irq));  /* pci_eb64plus_intr.S */
+extern void	eb64plus_intr_disable __P((int irq)); /* pci_eb64plus_intr.S */
+
+void
+pci_eb64plus_pickintr(acp)
+	struct apecs_config *acp;
+{
+	bus_space_tag_t iot = &acp->ac_iot;
+	pci_chipset_tag_t pc = &acp->ac_pc;
+	int i;
+
+        pc->pc_intr_v = acp;
+        pc->pc_intr_map = dec_eb64plus_intr_map;
+        pc->pc_intr_string = dec_eb64plus_intr_string;
+        pc->pc_intr_establish = dec_eb64plus_intr_establish;
+        pc->pc_intr_disestablish = dec_eb64plus_intr_disestablish;
+
+	/* Not supported on the EB64+. */
+	pc->pc_pciide_compat_intr_establish = NULL;
+
+	eb64plus_intrgate_iot = iot;
+	if (bus_space_map(eb64plus_intrgate_iot, 0x804, 3, 0,
+	    &eb64plus_intrgate_ioh) != 0)
+		panic("pci_eb64plus_pickintr: couldn't map interrupt PLD");
+	for (i = 0; i < EB64PLUS_MAX_IRQ; i++)
+		eb64plus_intr_disable(i);	
+
+	eb64plus_pci_intr = alpha_shared_intr_alloc(EB64PLUS_MAX_IRQ);
+	for (i = 0; i < EB64PLUS_MAX_IRQ; i++) {
+		alpha_shared_intr_set_maxstrays(eb64plus_pci_intr, i,
+			PCI_STRAY_MAX);
+	}
+
+#if NSIO
+	sio_intr_setup(pc, iot);
+#endif
+	set_iointr(eb64plus_iointr);
+}
+
+int     
+dec_eb64plus_intr_map(acv, bustag, buspin, line, ihp)
+	void *acv;
+	pcitag_t bustag;
+	int buspin, line;
+        pci_intr_handle_t *ihp;
+{
+	struct apecs_config *acp = acv;
+	pci_chipset_tag_t pc = &acp->ac_pc;
+	int bus, device, function;
+
+	if (buspin == 0) {
+		/* No IRQ used. */
+		return 1;
+	}
+	if (buspin > 4) {
+		printf("dec_eb64plus_intr_map: bad interrupt pin %d\n", buspin);
+		return 1;
+	}
+
+	alpha_pci_decompose_tag(pc, bustag, &bus, &device, &function);
+
+	/*
+	 * 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_eb64plus_intr_map: no mapping for %d/%d/%d\n",
+		    bus, device, function);
+		return (1);
+	}
+
+	if (line >= EB64PLUS_MAX_IRQ)
+		panic("dec_eb64plus_intr_map: eb64+ irq too large (%d)\n",
+		    line);
+
+	*ihp = line;
+	return (0);
+}
+
+const char *
+dec_eb64plus_intr_string(acv, ih)
+	void *acv;
+	pci_intr_handle_t ih;
+{
+        static char irqstr[15];          /* 11 + 2 + NULL + sanity */
+
+        if (ih > EB64PLUS_MAX_IRQ)
+                panic("dec_eb64plus_intr_string: bogus eb64+ IRQ 0x%lx\n", ih);
+        sprintf(irqstr, "eb64+ irq %ld", ih);
+        return (irqstr);
+}
+
+void *
+dec_eb64plus_intr_establish(acv, ih, level, func, arg, name)
+        void *acv;
+        pci_intr_handle_t ih;
+        int level;
+        int (*func) __P((void *));
+	void *arg;
+	char *name;
+{
+	void *cookie;
+
+	if (ih > EB64PLUS_MAX_IRQ)
+		panic("dec_eb64plus_intr_establish: bogus eb64+ IRQ 0x%lx\n",
+		    ih);
+
+	cookie = alpha_shared_intr_establish(eb64plus_pci_intr, ih, IST_LEVEL,
+	    level, func, arg, name);
+
+	if (cookie != NULL && alpha_shared_intr_isactive(eb64plus_pci_intr, ih))
+		eb64plus_intr_enable(ih);
+
+	return (cookie);
+}
+
+void
+dec_eb64plus_intr_disestablish(acv, cookie)
+        void *acv, *cookie;
+{
+	struct alpha_shared_intrhand *ih = cookie;
+	unsigned int irq = ih->ih_num;
+	int s;
+ 
+	s = splhigh();
+
+	alpha_shared_intr_disestablish(eb64plus_pci_intr, cookie,
+	    "eb64+ irq");
+	if (alpha_shared_intr_isactive(eb64plus_pci_intr, irq) == 0) {
+		eb64plus_intr_disable(irq);
+		alpha_shared_intr_set_dfltsharetype(eb64plus_pci_intr, irq,
+		    IST_NONE);
+	}
+ 
+	splx(s);
+}
+
+void
+eb64plus_iointr(framep, vec)
+	void *framep;
+	unsigned long vec;
+{
+	int irq; 
+
+	if (vec >= 0x900) {
+		if (vec >= 0x900 + (EB64PLUS_MAX_IRQ << 4))
+			panic("eb64plus_iointr: vec 0x%lx out of range\n", vec);
+		irq = (vec - 0x900) >> 4;
+
+		if (!alpha_shared_intr_dispatch(eb64plus_pci_intr, irq)) {
+		    alpha_shared_intr_stray(eb64plus_pci_intr, irq,
+			"eb64+ irq");
+			if (ALPHA_SHARED_INTR_DISABLE(eb64plus_pci_intr, irq))
+				eb64plus_intr_disable(irq);
+		}
+		return;
+	}
+#if NSIO
+	if (vec >= 0x800) {
+		sio_iointr(framep, vec);
+		return;
+	}
+#endif
+	panic("eb64plus_iointr: weird vec 0x%lx\n", vec);
+}
+
+#if 0		/* THIS DOES NOT WORK!  see pci_eb64plus_intr.S. */
+u_int8_t eb64plus_intr_mask[3] = { 0xff, 0xff, 0xff };
+
+void
+eb64plus_intr_enable(irq)
+	int irq;
+{
+	int byte = (irq / 8), bit = (irq % 8);
+
+#if 1
+	printf("eb64plus_intr_enable: enabling %d (%d:%d)\n", irq, byte, bit);
+#endif
+	eb64plus_intr_mask[byte] &= ~(1 << bit);
+
+	bus_space_write_1(eb64plus_intrgate_iot, eb64plus_intrgate_ioh, byte,
+	    eb64plus_intr_mask[byte]);
+}
+
+void
+eb64plus_intr_disable(irq)
+	int irq;
+{
+	int byte = (irq / 8), bit = (irq % 8);
+
+#if 1
+	printf("eb64plus_intr_disable: disabling %d (%d:%d)\n", irq, byte, bit);
+#endif
+	eb64plus_intr_mask[byte] |= (1 << bit);
+
+	bus_space_write_1(eb64plus_intrgate_iot, eb64plus_intrgate_ioh, byte,
+	    eb64plus_intr_mask[byte]);
+}
+#endif
diff --git a/sys/arch/alpha/pci/pci_eb64plus.h b/sys/arch/alpha/pci/pci_eb64plus.h
new file mode 100644
index 00000000000..d720089b8c2
--- /dev/null
+++ b/sys/arch/alpha/pci/pci_eb64plus.h
@@ -0,0 +1,31 @@
+/* $OpenBSD */
+/* $NetBSD: pci_eb64plus.h,v 1.2 2000/06/05 21:47:26 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1995, 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ *
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ *
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ *
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+void	pci_eb64plus_pickintr __P((struct apecs_config *));
diff --git a/sys/arch/alpha/pci/pci_eb64plus_intr.s b/sys/arch/alpha/pci/pci_eb64plus_intr.s
new file mode 100644
index 00000000000..f2489da474d
--- /dev/null
+++ b/sys/arch/alpha/pci/pci_eb64plus_intr.s
@@ -0,0 +1,62 @@
+/* $OpenBSD: pci_eb64plus_intr.s,v 1.1 2002/01/23 03:20:41 ericj Exp $ */
+/* $NetBSD: pci_eb64plus_intr.s,v 1.2 1997/09/02 13:19:43 thorpej Exp $ */
+
+/*
+ * Copyright (c) 1996 Carnegie-Mellon University.
+ * All rights reserved.
+ *
+ * Author: Chris G. Demetriou
+ * 
+ * Permission to use, copy, modify and distribute this software and
+ * its documentation is hereby granted, provided that both the copyright
+ * notice and this permission notice appear in all copies of the
+ * software, derivative works or modified versions, and any portions
+ * thereof, and that both notices appear in supporting documentation.
+ * 
+ * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
+ * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
+ * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
+ * 
+ * Carnegie Mellon requests users of this software to return to
+ *
+ *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
+ *  School of Computer Science
+ *  Carnegie Mellon University
+ *  Pittsburgh PA 15213-3890
+ *
+ * any improvements or extensions that they make and grant Carnegie the
+ * rights to redistribute these changes.
+ */
+
+/*
+ * This file hacked from pci_eb164_intr.s
+ *
+ * These functions were written by disassembling a Digital UNIX kernel's
+ * eb64p_intrdsabl and eb64p_intrenabl functions (because they had
+ * interesting names, and looked like the eb164 versions which were
+ * known to already work), and then playing with them to see how to call
+ * them correctly.
+ *
+ * It looks like the right thing to do is to call them with the interrupt
+ * request that you want to enable or disable (presumably in the range
+ * 0 -> 23, since there are 3 8-bit interrupt-enable bits in the
+ * interrupt mask PLD).
+ */
+
+#include <machine/asm.h>
+
+	.text
+LEAF(eb64plus_intr_enable,1)
+	mov	a0, a1
+	ldiq	a0, 0x34
+	call_pal PAL_cserve
+	RET
+	END(eb64plus_intr_enable)
+
+	.text
+LEAF(eb64plus_intr_disable,1)
+	mov	a0, a1
+	ldiq	a0, 0x35
+	call_pal PAL_cserve
+	RET
+	END(eb64plus_intr_enable)