Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amiga Driver for BlizzardPPC 603e+ SCSI host adatper.



details:   https://anonhg.NetBSD.org/src/rev/912bdd57fb16
branches:  trunk
changeset: 760844:912bdd57fb16
user:      phx <phx%NetBSD.org@localhost>
date:      Fri Jan 14 10:01:12 2011 +0000

description:
Driver for BlizzardPPC 603e+ SCSI host adatper.
Patch submitted by Radoslaw Kujawa.

diffstat:

 sys/arch/amiga/conf/GENERIC.in  |    6 +-
 sys/arch/amiga/conf/MDINSTALL   |    4 +-
 sys/arch/amiga/conf/files.amiga |    7 +-
 sys/arch/amiga/dev/bppcsc.c     |  216 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 229 insertions(+), 4 deletions(-)

diffs (286 lines):

diff -r c1cc816c52d7 -r 912bdd57fb16 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Fri Jan 14 10:01:03 2011 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Fri Jan 14 10:01:12 2011 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.76 2010/05/08 22:16:25 mrg Exp $
+# $NetBSD: GENERIC.in,v 1.77 2011/01/14 10:01:12 phx Exp $
 #
 # GENERIC machine description file
 #
@@ -56,7 +56,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.76 $"
+#ident                 "GENERIC-$Revision: 1.77 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions    COPTS="-Os"
@@ -501,6 +501,8 @@
 scsibus*       at mgnsc0
 wesc0          at zbus0                # Warp Engine scsi
 scsibus*       at wesc0
+bppcsc0                at zbus0                # BlizzardPPC 603e+ scsi
+scsibus*       at bppcsc0
 afsc0          at zbus0                # A4091 scsi
 scsibus*       at afsc0
 aftsc0         at mainbus0             # A4000T scsi
diff -r c1cc816c52d7 -r 912bdd57fb16 sys/arch/amiga/conf/MDINSTALL
--- a/sys/arch/amiga/conf/MDINSTALL     Fri Jan 14 10:01:03 2011 +0000
+++ b/sys/arch/amiga/conf/MDINSTALL     Fri Jan 14 10:01:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: MDINSTALL,v 1.28 2010/11/23 11:13:54 hannken Exp $
+#      $NetBSD: MDINSTALL,v 1.29 2011/01/14 10:01:12 phx Exp $
 
 #
 # INSTALL kernel for ramdisk installation
@@ -237,6 +237,8 @@
 scsibus*       at mgnsc0
 wesc0          at zbus0                # Warp Engine scsi
 scsibus*       at wesc0
+bppcsc0                at zbus0                # BlizzardPPC 603e+ scsi
+scsibus*       at bppcsc0
 afsc0          at zbus0                # A4091 scsi
 scsibus*       at afsc0
 aftsc0         at mainbus0             # A4000T scsi
diff -r c1cc816c52d7 -r 912bdd57fb16 sys/arch/amiga/conf/files.amiga
--- a/sys/arch/amiga/conf/files.amiga   Fri Jan 14 10:01:03 2011 +0000
+++ b/sys/arch/amiga/conf/files.amiga   Fri Jan 14 10:01:12 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.amiga,v 1.142 2009/12/06 06:46:25 tsutsui Exp $
+#      $NetBSD: files.amiga,v 1.143 2011/01/14 10:01:12 phx Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16                       # NOTE THAT AMIGA IS SPECIAL!
@@ -354,6 +354,11 @@
 attach wesc at zbus
 file   arch/amiga/dev/wesc.c           wesc needs-flag
 
+# Phase5 Blizzard 603e+ SCSI
+device bppcsc: scsi, asiop
+attach bppcsc at zbus
+file   arch/amiga/dev/bppcsc.c         bppcsc needs-flag
+
 # C= A4091 & A4000T
 device afsc: scsi, asiop
 attach afsc at zbus
diff -r c1cc816c52d7 -r 912bdd57fb16 sys/arch/amiga/dev/bppcsc.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/amiga/dev/bppcsc.c       Fri Jan 14 10:01:12 2011 +0000
@@ -0,0 +1,216 @@
+/*     $NetBSD: bppcsc.c,v 1.1 2011/01/14 10:01:12 phx Exp $ */
+
+/*
+ * Copyright (c) 1982, 1990 The Regents of the University of California.
+ * 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. Neither the name of the University 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 REGENTS 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 REGENTS 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.
+ *
+ *     @(#)dma.c
+ */
+
+/*
+ * Copyright (c) 2011 Radoslaw Kujawa
+ * Copyright (c) 1994 Michael L. Hitch
+ *
+ * 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.
+ *
+ * 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.
+ *
+ *     @(#)dma.c
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: bppcsc.c,v 1.1 2011/01/14 10:01:12 phx Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/device.h>
+
+#include <uvm/uvm_extern.h>
+
+#include <dev/scsipi/scsi_all.h>
+#include <dev/scsipi/scsipi_all.h>
+#include <dev/scsipi/scsiconf.h>
+
+#include <amiga/amiga/custom.h>
+#include <amiga/amiga/cc.h>
+#include <amiga/amiga/device.h>
+#include <amiga/amiga/isr.h>
+#include <amiga/dev/siopreg.h>
+#include <amiga/dev/siopvar.h>
+#include <amiga/dev/zbusvar.h>
+
+#define BPPC_SCSI_OFF  0xf40000
+#define BPPC_PUPROM_OFF        0xf00010
+
+void bppcscattach(struct device *, struct device *, void *);
+int bppcscmatch(struct device *, struct cfdata *, void *);
+int bppcsc_dmaintr(void *);
+#ifdef DEBUG
+void bppcsc_dump(void);
+#endif
+
+CFATTACH_DECL(bppcsc, sizeof(struct siop_softc),
+    bppcscmatch, bppcscattach, NULL, NULL);
+
+/*
+ * if we are a Phase5 BlizzardPPC 603e+
+ */
+int
+bppcscmatch(struct device *pdp, struct cfdata *cfp, void *auxp)
+{
+       struct zbus_args *zap;
+       char *p5type; 
+
+       zap = auxp;
+       if (zap->manid == 8512 && zap->prodid == 110) {
+               p5type = (char *)__UNVOLATILE(ztwomap(BPPC_PUPROM_OFF));
+               if (p5type[0] == 'I')           /* only "+" model has SCSI */
+                       return 1;
+       }
+       return 0 ;
+}
+
+void
+bppcscattach(struct device *pdp, struct device *dp, void *auxp)
+{
+       struct siop_softc *sc;
+       struct scsipi_adapter *adapt;
+       struct scsipi_channel *chan;
+       siop_regmap_p rp;
+
+       sc = (struct siop_softc *)dp;
+       adapt = &sc->sc_adapter;
+       chan = &sc->sc_channel;
+
+       aprint_naive(": SCSI controller\n");
+       aprint_normal(": BlizzardPPC 603e+ SCSI adapter\n");
+
+       sc->sc_siopp = rp = ztwomap(BPPC_SCSI_OFF);
+#ifdef DEBUG
+       siop_dump(sc);
+#endif
+       /*
+        * CTEST7 = 00
+        */
+       sc->sc_clock_freq = 50;         /* Clock = 50 MHz */
+       sc->sc_ctest7 = 0x00;
+       sc->sc_dcntl = 0x20;            /* XXX - taken from cbiiisc */
+
+       /*
+        * Fill in the scsipi_adapter.
+        */
+       memset(adapt, 0, sizeof(*adapt));
+       adapt->adapt_dev = &sc->sc_dev;
+       adapt->adapt_nchannels = 1;
+       adapt->adapt_openings = 7;
+       adapt->adapt_max_periph = 1;
+       adapt->adapt_request = siop_scsipi_request;
+       adapt->adapt_minphys = siop_minphys;
+
+       /*
+        * Fill in the scsipi_channel.
+        */
+       memset(chan, 0, sizeof(*chan));
+       chan->chan_adapter = adapt;
+       chan->chan_bustype = &scsi_bustype;
+       chan->chan_channel = 0;
+       chan->chan_ntargets = 8;
+       chan->chan_nluns = 8;
+       chan->chan_id = 7;
+
+       siopinitialize(sc);
+
+       sc->sc_isr.isr_intr = bppcsc_dmaintr;
+       sc->sc_isr.isr_arg = sc;
+       sc->sc_isr.isr_ipl = 2;
+       add_isr (&sc->sc_isr);
+
+       /*
+        * attach all scsi units on us
+        */
+       config_found(dp, chan, scsiprint);
+}
+
+int
+bppcsc_dmaintr(void *arg)
+{
+       struct siop_softc *sc;
+       siop_regmap_p rp;
+       u_char istat;
+
+       sc = arg;
+       if (sc->sc_flags & SIOP_INTSOFF)
+               return 0;       /* interrupts are not active */
+       rp = sc->sc_siopp;
+       amiga_membarrier();
+       istat = rp->siop_istat;
+       if ((istat & (SIOP_ISTAT_SIP | SIOP_ISTAT_DIP)) == 0)
+               return 0;
+       /*
+        * save interrupt status, DMA status, and SCSI status 0
+        * (may need to deal with stacked interrupts?)
+        */
+       sc->sc_sstat0 = rp->siop_sstat0;
+       sc->sc_istat = istat;
+       sc->sc_dstat = rp->siop_dstat;
+       amiga_membarrier();
+       siopintr(sc);
+       return 1;
+}
+
+#ifdef DEBUG
+void
+bppcsc_dump(void)
+{
+       extern struct cfdriver bppcsc_cd;
+       struct siop_softc *sc;
+       int i;
+
+       for (i = 0; i < bppcsc_cd.cd_ndevs; ++i) {
+               sc = device_lookup_private(&bppcsc_cd, i);
+               if (sc != NULL)
+                       siop_dump(sc);
+       }
+}
+#endif



Home | Main Index | Thread Index | Old Index