Preliminary port of NetBSD oosiop driver, for NCR53C700 chips, as commonly

encountered on the oldest hppa machines.

Currently compiled in, but disabled, in the kernel, until it is stable
enough - right now read access are fine, but writes eventually time out
and do not complete.

ok deraadt@

5 files changed, 190 insertions, 22 deletions

diff --git a/sys/arch/hppa/conf/GENERIC b/sys/arch/hppa/conf/GENERIC
index c9e80bb2ee2..69f9c4be934 100644
--- a/sys/arch/hppa/conf/GENERIC
+++ b/sys/arch/hppa/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.47 2004/02/26 02:29:56 mickey Exp $
+#	$OpenBSD: GENERIC,v 1.48 2004/03/12 00:04:56 miod Exp $
 
 # Machine architecture; required by config(8)
 machine		hppa
@@ -97,9 +97,11 @@ ie0	at gsc0 irq 8			# 82C596DX/CA ether
 #ie*	at isa? port 0x300 irq 10
 #ie*	at pci? dev ? function ?
 #tms*	at gsc? irq 10			# TMS380C26 Network Controller
-osiop*	at gsc? irq 9			# NCR 53C700/710 (Narrow SE)
+osiop*	at gsc? irq 9			# NCR 53C710 (Narrow SE)
 #osiop* at eisa? slot ?
 scsibus* at osiop?
+oosiop*	at gsc? disable irq 9			# NCR 53C700 (Narrow SE)
+scsibus* at oosiop?
 harmony* at gsc? irq 13			# Audio Type 2 (CS4215/AD1849)
 audio*	at harmony?
 gsckbc*	at gsc? irq 26
diff --git a/sys/arch/hppa/conf/RAMDISK b/sys/arch/hppa/conf/RAMDISK
index d04a4e8a6de..130806ac265 100644
--- a/sys/arch/hppa/conf/RAMDISK
+++ b/sys/arch/hppa/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.26 2003/12/29 23:27:04 mickey Exp $
+#	$OpenBSD: RAMDISK,v 1.27 2004/03/12 00:04:57 miod Exp $
 #
 # Diskless kernel config
 #
@@ -112,9 +112,11 @@ ie0	at gsc0 irq 8			# 82C596DX/CA ether
 #ie*	at isa? port 0x300 irq 10
 #ie*	at pci? dev ? function ?
 #tms*	at gsc? irq 10			# TMS380C26 Network Controller
-osiop*	at gsc? irq 9			# NCR 53C700/710 (Narrow SE)
+osiop*	at gsc? irq 9			# NCR 53C710 (Narrow SE)
 #osiop* at eisa? slot ?
 scsibus* at osiop?
+oosiop*	at gsc? disable irq 9			# NCR 53C700 (Narrow SE)
+scsibus* at oosiop?
 #harmony* at gsc? irq 13		# Audio Type 2 (CS4215/AD1849)
 #audio*	at harmony?
 gsckbc*	at gsc? irq 26
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index 23f3a60e089..4021d88bdec 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.50 2004/02/13 20:39:31 mickey Exp $
+#	$OpenBSD: files.hppa,v 1.51 2004/03/12 00:04:57 miod Exp $
 #
 # hppa-specific configuration info
 
@@ -191,6 +191,9 @@ file	arch/hppa/gsc/if_ie_gsc.c	ie_gsc
 attach	osiop at gsc with osiop_gsc
 file	arch/hppa/gsc/osiop_gsc.c	osiop_gsc
 
+attach	oosiop at gsc with oosiop_gsc
+file	arch/hppa/gsc/oosiop_gsc.c	oosiop_gsc
+
 attach	hil at gsc with hil_gsc
 file	arch/hppa/gsc/hil_gsc.c		hil_gsc
 
diff --git a/sys/arch/hppa/gsc/oosiop_gsc.c b/sys/arch/hppa/gsc/oosiop_gsc.c
new file mode 100644
index 00000000000..80cec2b516e
--- /dev/null
+++ b/sys/arch/hppa/gsc/oosiop_gsc.c
@@ -0,0 +1,169 @@
+/*	$OpenBSD: oosiop_gsc.c,v 1.1 2004/03/12 00:04:57 miod Exp $	*/
+/*	$NetBSD: oosiop_gsc.c,v 1.2 2003/07/15 02:29:25 lukem Exp $	*/
+
+/*
+ * Copyright (c) 2001 Matt Fredette.  All rights reserved.
+ * Copyright (c) 2001,2002 Izumi Tsutsui.  All rights reserved.
+ *
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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) 1998 Michael Shalayeff
+ * All rights reserved.
+ *
+ * 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 Michael Shalayeff.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/buf.h>
+#include <sys/malloc.h>
+
+#include <scsi/scsi_all.h>
+#include <scsi/scsiconf.h>
+
+#include <machine/cpu.h>
+#include <machine/intr.h>
+#include <machine/iomod.h>
+#include <machine/autoconf.h>
+#include <machine/bus.h>
+
+#include <dev/ic/oosiopreg.h>
+#include <dev/ic/oosiopvar.h>
+
+#include <hppa/dev/cpudevs.h>
+#include <hppa/gsc/gscbusvar.h>
+
+#define	OOSIOP_GSC_RESET	0x0000
+#define	OOSIOP_GSC_OFFSET	0x0100
+
+int oosiop_gsc_match(struct device *, void *, void *);
+void oosiop_gsc_attach(struct device *, struct device *, void *);
+int oosiop_gsc_intr(void *);
+
+struct cfattach oosiop_gsc_ca = {
+	sizeof(struct oosiop_softc), oosiop_gsc_match, oosiop_gsc_attach
+};
+
+int
+oosiop_gsc_match(parent, match, aux)
+	struct device *parent;
+	void *match, *aux;
+{
+	struct gsc_attach_args *ga = aux;
+
+	if (ga->ga_type.iodc_type != HPPA_TYPE_FIO ||
+	     ga->ga_type.iodc_sv_model != HPPA_FIO_SCSI)
+		return 0;
+
+	return 1;
+}
+
+void
+oosiop_gsc_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct oosiop_softc *sc = (void *)self;
+	struct gsc_attach_args *ga = aux;
+	bus_space_handle_t ioh;
+
+	sc->sc_bst = ga->ga_iot;
+	sc->sc_dmat = ga->ga_dmatag;
+	if (bus_space_map(sc->sc_bst, ga->ga_hpa,
+	    OOSIOP_GSC_OFFSET + OOSIOP_NREGS, 0, &ioh))
+		panic("oosiop_gsc_attach: couldn't map I/O ports");
+	if (bus_space_subregion(sc->sc_bst, ioh, 
+	    OOSIOP_GSC_OFFSET, OOSIOP_NREGS, &sc->sc_bsh))
+		panic("oosiop_gsc_attach: couldn't get chip ports");
+
+	sc->sc_freq = ga->ga_ca.ca_pdc_iodc_read->filler2[14];
+	if (!sc->sc_freq)
+		sc->sc_freq = 50 * 1000000;
+
+	sc->sc_chip = OOSIOP_700;
+	sc->sc_id = 7;	/* XXX */
+
+	/*
+	 * Reset the SCSI subsystem.
+	 */
+	bus_space_write_1(sc->sc_bst, ioh, OOSIOP_GSC_RESET, 0);
+	DELAY(1000);
+
+	/*
+	 * Call common attachment
+	 */
+#ifdef OOSIOP_DEBUG
+	{
+		extern int oosiop_debug;
+		oosiop_debug = -1;
+	}
+#endif /* OOSIOP_DEBUG */
+	oosiop_attach(sc);
+
+	(void)gsc_intr_establish((struct gsc_softc *)parent,
+	    ga->ga_irq, IPL_BIO, oosiop_gsc_intr, sc, sc->sc_dev.dv_xname);
+}
+
+/*
+ * interrupt handler
+ */
+int
+oosiop_gsc_intr(arg)
+	void *arg;
+{
+	struct oosiop_softc *sc = arg;
+	int rv;
+
+	rv = oosiop_intr(sc);
+
+#ifdef USELEDS
+	ledctl(PALED_DISK, 0, 0);
+#endif
+
+	return (rv);
+}
diff --git a/sys/arch/hppa/gsc/osiop_gsc.c b/sys/arch/hppa/gsc/osiop_gsc.c
index f9b879148a0..c928bdd5dd0 100644
--- a/sys/arch/hppa/gsc/osiop_gsc.c
+++ b/sys/arch/hppa/gsc/osiop_gsc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: osiop_gsc.c,v 1.10 2004/02/13 21:28:19 mickey Exp $	*/
+/*	$OpenBSD: osiop_gsc.c,v 1.11 2004/03/12 00:04:57 miod Exp $	*/
 /*	$NetBSD: osiop_gsc.c,v 1.6 2002/10/02 05:17:50 thorpej Exp $	*/
 
 /*
@@ -79,7 +79,7 @@
 #include <hppa/gsc/gscbusvar.h>
 /* #include <hppa/hppa/machdep.h> */
 
-#define OSIOP_GSC_RESET         0x0000
+#define	OSIOP_GSC_RESET		0x0000
 #define	OSIOP_GSC_OFFSET	0x0100
 
 int osiop_gsc_match(struct device *, void *, void *);
@@ -98,8 +98,7 @@ osiop_gsc_match(parent, match, aux)
 	struct gsc_attach_args *ga = aux;
 
 	if (ga->ga_type.iodc_type != HPPA_TYPE_FIO ||
-	    (ga->ga_type.iodc_sv_model != HPPA_FIO_GSCSI /* &&
-	     ga->ga_type.iodc_sv_model != HPPA_FIO_SCSI   */))
+	    ga->ga_type.iodc_sv_model != HPPA_FIO_GSCSI)
 		return 0;
 
 	return 1;
@@ -117,27 +116,20 @@ osiop_gsc_attach(parent, self, aux)
 	sc->sc_bst = ga->ga_iot;
 	sc->sc_dmat = ga->ga_dmatag;
 	if (bus_space_map(sc->sc_bst, ga->ga_hpa,
-			  OSIOP_GSC_OFFSET + OSIOP_NREGS, 0, &ioh))
+	    OSIOP_GSC_OFFSET + OSIOP_NREGS, 0, &ioh))
 		panic("osiop_gsc_attach: couldn't map I/O ports");
 	if (bus_space_subregion(sc->sc_bst, ioh, 
-				OSIOP_GSC_OFFSET, OSIOP_NREGS, &sc->sc_reg))
+	    OSIOP_GSC_OFFSET, OSIOP_NREGS, &sc->sc_reg))
 		panic("osiop_gsc_attach: couldn't get chip ports");
 
 	sc->sc_clock_freq = ga->ga_ca.ca_pdc_iodc_read->filler2[14] / 1000000;
 	if (!sc->sc_clock_freq)
 		sc->sc_clock_freq = 50;
 
-	if (ga->ga_ca.ca_type.iodc_sv_model == HPPA_FIO_GSCSI) {
-		sc->sc_dcntl = OSIOP_DCNTL_EA;
-		/* XXX set burst mode to 8 words (32 bytes) */
-		sc->sc_ctest7 = OSIOP_CTEST7_CDIS;
-		sc->sc_dmode = OSIOP_DMODE_BL8; /* | OSIOP_DMODE_FC2 */
-	} else {
-		sc->sc_dcntl = 0;
-		sc->sc_ctest7 = 0;
-		sc->sc_dmode = 0; /* | OSIOP_DMODE_FC2 */
-	}
-
+	sc->sc_dcntl = OSIOP_DCNTL_EA;
+	/* XXX set burst mode to 8 words (32 bytes) */
+	sc->sc_ctest7 = OSIOP_CTEST7_CDIS;
+	sc->sc_dmode = OSIOP_DMODE_BL8; /* | OSIOP_DMODE_FC2 */
 	sc->sc_flags = 0;
 	sc->sc_id = 7;	/* XXX */