projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
consolidate random data structures
[unix-history] / usr / src / sys / vax / mba / hp.c
diff --git a/usr/src/sys/vax/mba/hp.c b/usr/src/sys/vax/mba/hp.c
index ee61b49..83c57d3 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,16 +1,24 @@
-/*     hp.c    4.33    81/03/17        */
+/*     hp.c    4.65    83/02/10        */
+
+#ifdef HPDEBUG
 int    hpdebug;
 int    hpdebug;
+#endif
+#ifdef HPBDEBUG
+int    hpbdebug;
+#endif
 
 #include "hp.h"
 #if NHP > 0
 /*
 
 #include "hp.h"
 #if NHP > 0
 /*
- * HP disk driver for RP0x+RM0x
+ * HP disk driver for RP0x+RMxx+ML11
  *
  * TODO:
  *
  * TODO:
- *     check RM80 skip sector handling, esp when ECC's occur later
+ *     check RM80 skip sector handling when ECC's occur later
  *     check offset recovery handling
  *     see if DCLR and/or RELEASE set attention status
  *     check offset recovery handling
  *     see if DCLR and/or RELEASE set attention status
+ *     print bits of mr && mr2 symbolically
  */
  */
+#include "../machine/pte.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -20,36 +28,39 @@ int hpdebug;
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/map.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/map.h"
-#include "../h/pte.h"
-#include "../h/mbareg.h"
-#include "../h/mbavar.h"
-#include "../h/mtpr.h"
+#include "../vax/mtpr.h"
 #include "../h/vm.h"
 #include "../h/cmap.h"
 #include "../h/vm.h"
 #include "../h/cmap.h"
+#include "../h/dkbad.h"
+#include "../h/ioctl.h"
+#include "../h/uio.h"
 
 
-#include "../h/hpreg.h"
+#include "../vax/dkio.h"
+#include "../vaxmba/mbareg.h"
+#include "../vaxmba/mbavar.h"
+#include "../vaxmba/hpreg.h"
 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
 struct size {
        daddr_t nblocks;
        int     cyloff;
 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
 struct size {
        daddr_t nblocks;
        int     cyloff;
-} hp_sizes[8] = {
+} hp6_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 37 */
        33440,  38,             /* B=cyl 38 thru 117 */
        340670, 0,              /* C=cyl 0 thru 814 */
        0,      0,
        0,      0,
        0,      0,
        15884,  0,              /* A=cyl 0 thru 37 */
        33440,  38,             /* B=cyl 38 thru 117 */
        340670, 0,              /* C=cyl 0 thru 814 */
        0,      0,
        0,      0,
        0,      0,
-       291346, 118,            /* G=cyl 118 thru 814 */
+       291280, 118,            /* G=cyl 118 thru 814 */
        0,      0,
        0,      0,
-}, rm_sizes[8] = {
+}, rm3_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 99 */
        33440,  100,            /* B=cyl 100 thru 309 */
        131680, 0,              /* C=cyl 0 thru 822 */
        15884,  0,              /* A=cyl 0 thru 99 */
        33440,  100,            /* B=cyl 100 thru 309 */
        131680, 0,              /* C=cyl 0 thru 822 */
-       2720,   291,
        0,      0,
        0,      0,
        0,      0,
        0,      0,
-       82080,  310,            /* G=cyl 310 thru 822 */
+       0,      0,
+       81984,  310,            /* G=cyl 310 thru 822 */
        0,      0,
 }, rm5_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 26 */
        0,      0,
 }, rm5_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 26 */
@@ -57,8 +68,8 @@ struct        size {
        500384, 0,              /* C=cyl 0 thru 822 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
        500384, 0,              /* C=cyl 0 thru 822 */
        15884,  562,            /* D=cyl 562 thru 588 */
        55936,  589,            /* E=cyl 589 thru 680 */
-       86636,  681,            /* F=cyl 681 thru 822 */
-       158688, 562,            /* G=cyl 562 thru 822 */
+       86240,  681,            /* F=cyl 681 thru 822 */
+       158592, 562,            /* G=cyl 562 thru 822 */
        291346, 82,             /* H=cyl 82 thru 561 */
 }, rm80_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 36 */
        291346, 82,             /* H=cyl 82 thru 561 */
 }, rm80_sizes[8] = {
        15884,  0,              /* A=cyl 0 thru 36 */
@@ -68,7 +79,61 @@ struct       size {
        0,      0,
        0,      0,
        82080,  115,            /* G=cyl 115 thru 304 */
        0,      0,
        0,      0,
        82080,  115,            /* G=cyl 115 thru 304 */
-       110236, 305,            /* H=cyl 305 thru 558 */
+       110143, 305,            /* H=cyl 305 thru 558 */
+}, hp7_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 9 */
+       64000,  10,             /* B=cyl 10 thru 49 */
+       1008000,0,              /* C=cyl 0 thru 629 */
+       15884,  330,            /* D=cyl 330 thru 339 */
+       256000, 340,            /* E=cyl 340 thru 499 */
+       207850, 500,            /* F=cyl 500 thru 629 */
+       479850, 330,            /* G=cyl 330 thru 629 */
+       448000, 50,             /* H=cyl 50 thru 329 */
+}, si9775_sizes[8] = {
+       16640,    0,            /* A=cyl 0 thru 12 */
+       34560,   13,            /* B=cyl 13 thru 39 */
+       1079040,  0,            /* C=cyl 0 thru 842 */
+       0,        0,
+       0,        0,
+       0,        0,
+       513280,  40,            /* G=cyl 40 thru 440 */
+       513280, 441,            /* H=cyl 441 thru 841 */
+}, si9730_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 49 */
+       33440,  50,             /* B=cyl 50 thru 154 */
+       263360, 0,              /* C=cyl 0 thru 822 */
+       0,      0,
+       0,      0,
+       0,      0,
+       0,      0,
+       213664, 155,            /* H=cyl 155 thru 822 */
+}, hpam_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 31 */
+       33440,  32,             /* B=cyl 32 thru 97 */
+       524288, 0,              /* C=cyl 0 thru 1023 */
+       27786,  668,
+       27786,  723,
+       125440, 778,
+       181760, 668,            /* G=cyl 668 thru 1022 */
+       291346, 98,             /* H=cyl 98 thru 667 */
+}, hpfj_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 18 */
+       33440,  19,             /* B=cyl 19 thru 58 */
+       724120, 0,              /* C=cyl 0 thru 841 */
+       0, 0,
+       0, 0,
+       0, 0,
+       381711, 398,            /* G=cyl 398 thru 841 */
+       291346, 59,             /* H=cyl 59 thru 397 */
+}, hpfj48_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 16 */
+       33440,  17,             /* B=cyl 17 thru 52 */
+       808176, 0,              /* C=cyl 0 thru 841 */
+       0, 0,
+       0, 0,
+       0, 0,
+       465456, 357,            /* G=cyl 357 thru 841 */
+       291346, 53,             /* H=cyl 52 thru 356 */
 };
 /* END OF STUFF WHICH SHOULD BE READ IN PER DISK */
 
 };
 /* END OF STUFF WHICH SHOULD BE READ IN PER DISK */
 
@@ -78,8 +143,43 @@ struct      size {
 int    hpSDIST = _hpSDIST;
 int    hpRDIST = _hpRDIST;
 
 int    hpSDIST = _hpSDIST;
 int    hpRDIST = _hpRDIST;
 
-short  hptypes[] =
-       { MBDT_RM03, MBDT_RM05, MBDT_RP06, MBDT_RM80, 0 };
+/*
+ * Table for converting Massbus drive types into
+ * indices into the partition tables.  Slots are
+ * left for those drives devined from other means
+ * (e.g. SI, AMPEX, etc.).
+ */
+short  hptypes[] = {
+#define        HPDT_RM03       0
+       MBDT_RM03,
+#define        HPDT_RM05       1
+       MBDT_RM05,
+#define        HPDT_RP06       2
+       MBDT_RP06,
+#define        HPDT_RM80       3
+       MBDT_RM80,
+#define        HPDT_RP05       4
+       MBDT_RP05,
+#define        HPDT_RP07       5
+       MBDT_RP07,
+#define        HPDT_ML11A      6
+       MBDT_ML11A,
+#define        HPDT_ML11B      7
+       MBDT_ML11B,
+#define        HPDT_9775       8
+       -1,
+#define        HPDT_9730       9
+       -1,
+#define        HPDT_CAPRICORN  10
+       -1,
+#define HPDT_EAGLE     11
+       -1,
+#define        HPDT_EAGLE48    12
+       -1,
+#define HPDT_RM02      13
+       MBDT_RM02,              /* beware, actually capricorn or eagle */
+       0
+};
 struct mba_device *hpinfo[NHP];
 int    hpattach(),hpustart(),hpstart(),hpdtint();
 struct mba_driver hpdriver =
 struct mba_device *hpinfo[NHP];
 int    hpattach(),hpustart(),hpstart(),hpdtint();
 struct mba_driver hpdriver =
@@ -93,10 +193,19 @@ struct hpst {
        short   ncyl;
        struct  size *sizes;
 } hpst[] = {
        short   ncyl;
        struct  size *sizes;
 } hpst[] = {
-       32,     5,      32*5,   823,    rm_sizes,       /* RM03 */
+       32,     5,      32*5,   823,    rm3_sizes,      /* RM03 */
        32,     19,     32*19,  823,    rm5_sizes,      /* RM05 */
        32,     19,     32*19,  823,    rm5_sizes,      /* RM05 */
-       22,     19,     22*19,  815,    hp_sizes,       /* RP06 */
-       31,     14,     31*14,  559,    rm80_sizes      /* RM80 */
+       22,     19,     22*19,  815,    hp6_sizes,      /* RP06 */
+       31,     14,     31*14,  559,    rm80_sizes,     /* RM80 */
+       22,     19,     22*19,  411,    hp6_sizes,      /* RP05 */
+       50,     32,     50*32,  630,    hp7_sizes,      /* RP07 */
+       1,      1,      1,      1,      0,              /* ML11A */
+       1,      1,      1,      1,      0,              /* ML11B */
+       32,     40,     32*40,  843,    si9775_sizes,   /* 9775 */
+       32,     10,     32*10,  823,    si9730_sizes,   /* 9730 */
+       32,     16,     32*16,  1024,   hpam_sizes,     /* AMPEX capricorn */
+       43,     20,     43*20,  842,    hpfj_sizes,     /* Fujitsu EAGLE */
+       48,     20,     48*20,  842,    hpfj48_sizes,   /* 48 sector EAGLE */
 };
 
 u_char hp_offset[16] = {
 };
 
 u_char hp_offset[16] = {
@@ -107,24 +216,159 @@ u_char   hp_offset[16] = {
 };
 
 struct buf     rhpbuf[NHP];
 };
 
 struct buf     rhpbuf[NHP];
-char   hprecal[NHP];
+struct buf     bhpbuf[NHP];
+struct dkbad   hpbad[NHP];
+
+struct hpsoftc {
+       u_char  sc_hpinit;      /* drive initialized */
+       u_char  sc_recal;       /* recalibrate state */
+       u_char  sc_hdr;         /* next i/o includes header */
+       u_char  sc_doseeks;     /* perform explicit seeks */
+       daddr_t sc_mlsize;      /* ML11 size */
+} hpsoftc[NHP];
 
 #define        b_cylin b_resid
  
 
 #define        b_cylin b_resid
  
+/* #define ML11 0  to remove ML11 support */
+#define        ML11    (hptypes[mi->mi_type] == MBDT_ML11A)
+#define        RP06    (hptypes[mi->mi_type] <= MBDT_RP06)
+#define        RM80    (hptypes[mi->mi_type] == MBDT_RM80)
+
 #ifdef INTRLVE
 daddr_t dkblock();
 #endif
 #ifdef INTRLVE
 daddr_t dkblock();
 #endif
- 
-int    hpseek;
 
 /*ARGSUSED*/
 hpattach(mi, slave)
 
 /*ARGSUSED*/
 hpattach(mi, slave)
-       struct mba_device *mi;
+       register struct mba_device *mi;
 {
 {
-       register struct hpst *st = &hpst[mi->mi_type];
 
 
-       if (mi->mi_dk >= 0)
+       mi->mi_type = hpmaptype(mi);
+       if (!ML11 && mi->mi_dk >= 0) {
+               struct hpst *st = &hpst[mi->mi_type];
+
                dk_mspw[mi->mi_dk] = 1.0 / 60 / (st->nsect * 256);
                dk_mspw[mi->mi_dk] = 1.0 / 60 / (st->nsect * 256);
+       }
+}
+
+/*
+ * Map apparent MASSBUS drive type into manufacturer
+ * specific configuration.  For SI controllers this is done
+ * based on codes in the serial number register.  For
+ * EMULEX controllers, the track and sector attributes are
+ * used when the drive type is an RM02 (not supported by DEC).
+ */
+hpmaptype(mi)
+       register struct mba_device *mi;
+{
+       register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
+       register int type = mi->mi_type;
+
+       /*
+        * Model-byte processing for SI 9400 controllers.
+        * NB:  Only deals with RM03 and RM05 emulations.
+        */
+       if (type == HPDT_RM03 || type == HPDT_RM05) {
+               int hpsn = hpaddr->hpsn;
+
+               if ((hpsn & SIMB_LU) != mi->mi_drive)
+                       return (type);
+               switch ((hpsn & SIMB_MB) & ~(SIMB_S6|SIRM03|SIRM05)) {
+
+               case SI9775D:
+                       printf("hp%d: si 9775 (direct)\n", mi->mi_unit);
+                       type = HPDT_9775;
+                       break;
+
+               case SI9730D:
+                       printf("hp%d: si 9730 (direct)\n", mi->mi_unit);
+                       type = HPDT_9730;
+                       break;
+
+               /*
+                * AMPEX 9300, SI Combination needs a have the
+                * drive cleared before we start.  We do not know
+                * why, but tests show that the recalibrate fixes
+                * the problem.
+                */
+               case SI9766:
+                       printf("hp%d: 9776/9300\n", mi->mi_unit);
+                       type = HPDT_RM05;
+                       hpaddr->hpcs1 = HP_RECAL|HP_GO;
+                       DELAY(100000);
+                       break;
+
+               case SI9762:
+                       printf("hp%d: 9762\n", mi->mi_unit);
+                       type = HPDT_RM03;
+                       break;
+               }
+               return (type);
+       }
+
+       /*
+        * EMULEX SC750 or SC780.  Poke the holding register.
+        */
+       if (type == HPDT_RM02) {
+               int ntracks, nsectors;
+
+               hpaddr->hpcs1 = HP_NOP;
+               hpaddr->hphr = HPHR_MAXTRAK;
+               ntracks = (hpaddr->hphr & 0xffff) + 1;
+               if (ntracks == 16) {
+                       printf("hp%d: capricorn\n", mi->mi_unit);
+                       type = HPDT_CAPRICORN;
+                       goto done;
+               }
+               if (ntracks != 20) {
+                       printf("hp%d: ntracks %d: unknown device\n", ntracks);
+                       goto done;
+               }
+               hpaddr->hpcs1 = HP_NOP;
+               hpaddr->hphr = HPHR_MAXSECT;
+               nsectors = (hpaddr->hphr & 0xffff) + 1;
+               printf("hp%d: ", mi->mi_unit);
+               if (nsectors == 43)
+                       type = HPDT_EAGLE;
+               else {
+                       type = HPDT_EAGLE48;
+                       printf("modified ");
+               }
+               printf("eagle\n");
+done:
+               hpaddr->hpcs1 = HP_DCLR|HP_GO;
+               return (type);
+       } 
+
+       /*
+        * Map all ML11's to the same type.  Also calculate
+        * transfer rates based on device characteristics.
+        */
+       if (type == HPDT_ML11A || type == HPDT_ML11B) {
+               register struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
+               register int trt;
+
+               sc->sc_mlsize = hpaddr->hpmr & HPMR_SZ;
+               if ((hpaddr->hpmr & HPMR_ARRTYP) == 0)
+                       sc->sc_mlsize >>= 2;
+               if (mi->mi_dk >= 0) {
+                       trt = (hpaddr->hpmr & HPMR_TRT) >> 8;
+                       dk_mspw[mi->mi_dk] = 1.0 / (1<<(20-trt));
+               }
+               type = HPDT_ML11A;
+       }
+       return (type);
+}
+
+hpopen(dev)
+       dev_t dev;
+{
+       register int unit = minor(dev) >> 3;
+       register struct mba_device *mi;
+
+       if (unit >= NHP || (mi = hpinfo[unit]) == 0 || mi->mi_alive == 0)
+               return (ENXIO);
+       return (0);
 }
 
 hpstrategy(bp)
 }
 
 hpstrategy(bp)
@@ -135,6 +379,7 @@ hpstrategy(bp)
        register int unit;
        long sz, bn;
        int xunit = minor(bp->b_dev) & 07;
        register int unit;
        long sz, bn;
        int xunit = minor(bp->b_dev) & 07;
+       int s;
 
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;
 
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;
@@ -145,15 +390,24 @@ hpstrategy(bp)
        if (mi == 0 || mi->mi_alive == 0)
                goto bad;
        st = &hpst[mi->mi_type];
        if (mi == 0 || mi->mi_alive == 0)
                goto bad;
        st = &hpst[mi->mi_type];
-       if (bp->b_blkno < 0 ||
-           (bn = dkblock(bp))+sz > st->sizes[xunit].nblocks)
-               goto bad;
-       bp->b_cylin = bn/st->nspc + st->sizes[xunit].cyloff;
-       (void) spl5();
+       if (ML11) {
+               struct hpsoftc *sc = &hpsoftc[unit];
+
+               if (bp->b_blkno < 0 ||
+                   dkblock(bp)+sz > sc->sc_mlsize)
+                       goto bad;
+               bp->b_cylin = 0;
+       } else {
+               if (bp->b_blkno < 0 ||
+                   (bn = dkblock(bp))+sz > st->sizes[xunit].nblocks)
+                       goto bad;
+               bp->b_cylin = bn/st->nspc + st->sizes[xunit].cyloff;
+       }
+       s = spl5();
        disksort(&mi->mi_tab, bp);
        if (mi->mi_tab.b_active == 0)
                mbustart(mi);
        disksort(&mi->mi_tab, bp);
        if (mi->mi_tab.b_active == 0)
                mbustart(mi);
-       (void) spl0();
+       splx(s);
        return;
 
 bad:
        return;
 
 bad:
@@ -167,30 +421,48 @@ hpustart(mi)
 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
-       register struct hpst *st;
+       register struct hpst *st = &hpst[mi->mi_type];
+       struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;
        int sn, dist;
 
        daddr_t bn;
        int sn, dist;
 
+       hpaddr->hpcs1 = 0;
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
-       if ((hpaddr->hpds & HPDS_VV) == 0) {
+       if ((hpaddr->hpds & HPDS_VV) == 0 || !sc->sc_hpinit) {
+               struct buf *bbp = &bhpbuf[mi->mi_unit];
+
+               sc->sc_hpinit = 1;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
                if (mi->mi_mba->mba_drv[0].mbd_as & (1<<mi->mi_drive))
                        printf("DCLR attn\n");
                hpaddr->hpcs1 = HP_PRESET|HP_GO;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
                if (mi->mi_mba->mba_drv[0].mbd_as & (1<<mi->mi_drive))
                        printf("DCLR attn\n");
                hpaddr->hpcs1 = HP_PRESET|HP_GO;
-               hpaddr->hpof = HPOF_FMT22;
+               if (!ML11)
+                       hpaddr->hpof = HPOF_FMT22;
                mbclrattn(mi);
                mbclrattn(mi);
+               if (!ML11) {
+                       bbp->b_flags = B_READ|B_BUSY;
+                       bbp->b_dev = bp->b_dev;
+                       bbp->b_bcount = 512;
+                       bbp->b_un.b_addr = (caddr_t)&hpbad[mi->mi_unit];
+                       bbp->b_blkno = st->ncyl*st->nspc - st->nsect;
+                       bbp->b_cylin = st->ncyl - 1;
+                       mi->mi_tab.b_actf = bbp;
+                       bbp->av_forw = bp;
+                       bp = bbp;
+               }
        }
        if (mi->mi_tab.b_active || mi->mi_hd->mh_ndrive == 1)
                return (MBU_DODATA);
        }
        if (mi->mi_tab.b_active || mi->mi_hd->mh_ndrive == 1)
                return (MBU_DODATA);
+       if (ML11)
+               return (MBU_DODATA);
        if ((hpaddr->hpds & HPDS_DREADY) != HPDS_DREADY)
                return (MBU_DODATA);
        if ((hpaddr->hpds & HPDS_DREADY) != HPDS_DREADY)
                return (MBU_DODATA);
-       st = &hpst[mi->mi_type];
        bn = dkblock(bp);
        sn = bn%st->nspc;
        sn = (sn+st->nsect-hpSDIST)%st->nsect;
        if (bp->b_cylin == (hpaddr->hpdc & 0xffff)) {
        bn = dkblock(bp);
        sn = bn%st->nspc;
        sn = (sn+st->nsect-hpSDIST)%st->nsect;
        if (bp->b_cylin == (hpaddr->hpdc & 0xffff)) {
-               if (hpseek)
+               if (sc->sc_seek)
                        return (MBU_DODATA);
                dist = ((hpaddr->hpla & 0xffff)>>6) - st->nsect + 1;
                if (dist < 0)
                        return (MBU_DODATA);
                dist = ((hpaddr->hpla & 0xffff)>>6) - st->nsect + 1;
                if (dist < 0)
@@ -199,7 +471,7 @@ hpustart(mi)
                        return (MBU_DODATA);
        } else
                hpaddr->hpdc = bp->b_cylin;
                        return (MBU_DODATA);
        } else
                hpaddr->hpdc = bp->b_cylin;
-       if (hpseek)
+       if (sc->sc_seek)
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
        else {
                hpaddr->hpda = sn;
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
        else {
                hpaddr->hpda = sn;
@@ -214,15 +486,27 @@ hpstart(mi)
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
        register struct hpst *st = &hpst[mi->mi_type];
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
        register struct hpst *st = &hpst[mi->mi_type];
+       struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;
        int sn, tn;
 
        bn = dkblock(bp);
        daddr_t bn;
        int sn, tn;
 
        bn = dkblock(bp);
-       sn = bn%st->nspc;
-       tn = sn/st->nsect;
-       sn %= st->nsect;
-       hpaddr->hpdc = bp->b_cylin;
-       hpaddr->hpda = (tn << 8) + sn;
+       if (ML11)
+               hpaddr->hpda = bn;
+       else {
+               sn = bn%st->nspc;
+               tn = sn/st->nsect;
+               sn %= st->nsect;
+               hpaddr->hpdc = bp->b_cylin;
+               hpaddr->hpda = (tn << 8) + sn;
+       }
+       if (sc->sc_hdr) {
+               if (bp->b_flags & B_READ)
+                       return (HP_RHDR|HP_GO);
+               else
+                       return (HP_WHDR|HP_GO);
+       }
+       return (0);
 }
 
 hpdtint(mi, mbsr)
 }
 
 hpdtint(mi, mbsr)
@@ -231,10 +515,24 @@ hpdtint(mi, mbsr)
 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
+       register struct hpst *st = &hpst[mi->mi_type];
+       register int er1, er2;
+       struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        int retry = 0;
 
        int retry = 0;
 
+       if (bp->b_flags&B_BAD) {
+               if (hpecc(mi, CONT))
+                       return(MBD_RESTARTED);
+       }
        if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {
        if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {
+#ifdef HPDEBUG
                if (hpdebug) {
                if (hpdebug) {
+                       int dc = hpaddr->hpdc, da = hpaddr->hpda;
+
+                       printf("hperr: bp %x cyl %d blk %d as %o ",
+                               bp, bp->b_cylin, bp->b_blkno,
+                               hpaddr->hpas&0xff);
+                       printf("dc %x da %x\n",dc&0xffff, da&0xffff);
                        printf("errcnt %d ", mi->mi_tab.b_errcnt);
                        printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b\n",
                        printf("errcnt %d ", mi->mi_tab.b_errcnt);
                        printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b\n",
@@ -242,71 +540,107 @@ hpdtint(mi, mbsr)
                            hpaddr->hper2, HPER2_BITS);
                        DELAY(1000000);
                }
                            hpaddr->hper2, HPER2_BITS);
                        DELAY(1000000);
                }
-               if (hpaddr->hper1&HPER1_WLE) {
+#endif
+               er1 = hpaddr->hper1;
+               er2 = hpaddr->hper2;
+               if (er1 & HPER1_HCRC) {
+                       er1 &= ~(HPER1_HCE|HPER1_FER);
+                       er2 &= ~HPER2_BSE;
+               }
+               if (er1&HPER1_WLE) {
                        printf("hp%d: write locked\n", dkunit(bp));
                        bp->b_flags |= B_ERROR;
                        printf("hp%d: write locked\n", dkunit(bp));
                        bp->b_flags |= B_ERROR;
+               } else if ((er1&0xffff) == HPER1_FER && RP06 && !sc->sc_hdr) {
+                       if (hpecc(mi, BSE))
+                               return(MBD_RESTARTED);
+                       else
+                               goto hard;
                } else if (++mi->mi_tab.b_errcnt > 27 ||
                    mbsr & MBSR_HARD ||
                } else if (++mi->mi_tab.b_errcnt > 27 ||
                    mbsr & MBSR_HARD ||
-                   hpaddr->hper1 & HPER1_HARD ||
-                   hpaddr->hper2 & HPER2_HARD) {
+                   er1 & HPER1_HARD ||
+                   sc->sc_hdr ||
+                   (!ML11 && (er2 & HPER2_HARD))) {
+hard:
+                       if (ML11)
+                               bp->b_blkno = hpaddr->hpda&0xffff;
+                       else
+                               bp->b_blkno = (hpaddr->hpdc*st->nspc)&0xffff +
+                                         ((hpaddr->hpda>>8)&0xffff)*st->nsect +
+                                               (hpaddr->hpda&0x1f);
                        harderr(bp, "hp");
                        if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
                                printf("mbsr=%b ", mbsr, mbsr_bits);
                        harderr(bp, "hp");
                        if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
                                printf("mbsr=%b ", mbsr, mbsr_bits);
-                       printf("er1=%b er2=%b\n",
+                       printf("er1=%b er2=%b",
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
+                       if (hpaddr->hpmr)
+                               printf(" mr=%o", hpaddr->hpmr&0xffff);
+                       if (hpaddr->hpmr2)
+                               printf(" mr2=%o", hpaddr->hpmr2&0xffff);
+                       printf("\n");
                        bp->b_flags |= B_ERROR;
                        bp->b_flags |= B_ERROR;
-                       hprecal[mi->mi_unit] = 0;
-               } else if (hptypes[mi->mi_type] == MBDT_RM80 && hpaddr->hper2&HPER2_SSE) {
-                       hpecc(mi, 1);
+                       retry = 0;
+                       sc->sc_recal = 0;
+               } else if ((er2 & HPER2_BSE) && !ML11) {
+                       if (hpecc(mi, BSE))
+                               return(MBD_RESTARTED);
+                       else
+                               goto hard;
+               } else if (RM80 && er2&HPER2_SSE) {
+                       (void) hpecc(mi, SSE);
                        return (MBD_RESTARTED);
                        return (MBD_RESTARTED);
-               } else if ((hpaddr->hper1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
-                       if (hpecc(mi, 0))
+               } else if ((er1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
+                       if (hpecc(mi, ECC))
                                return (MBD_RESTARTED);
                        /* else done */
                } else
                        retry = 1;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
                                return (MBD_RESTARTED);
                        /* else done */
                } else
                        retry = 1;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
-               if ((mi->mi_tab.b_errcnt&07) == 4) {
+               if (ML11) {
+                       if (mi->mi_tab.b_errcnt >= 16)
+                               goto hard;
+               } else if ((mi->mi_tab.b_errcnt&07) == 4) {
                        hpaddr->hpcs1 = HP_RECAL|HP_GO;
                        hpaddr->hpcs1 = HP_RECAL|HP_GO;
-                       hprecal[mi->mi_unit] = 0;
-                       goto nextrecal;
+                       sc->sc_recal = 1;
+                       return(MBD_RESTARTED);
                }
                if (retry)
                        return (MBD_RETRY);
        }
                }
                if (retry)
                        return (MBD_RETRY);
        }
+#ifdef HPDEBUG
        else
        else
-               if (hpdebug && hprecal[mi->mi_unit]) {
-                       printf("recal %d ", hprecal[mi->mi_unit]);
+               if (hpdebug && sc->sc_recal) {
+                       printf("recal %d ", sc->sc_recal);
                        printf("errcnt %d\n", mi->mi_tab.b_errcnt);
                        printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b\n",
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                }
                        printf("errcnt %d\n", mi->mi_tab.b_errcnt);
                        printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b\n",
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                }
-       switch (hprecal[mi->mi_unit]) {
+#endif
+       switch (sc->sc_recal) {
 
        case 1:
                hpaddr->hpdc = bp->b_cylin;
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
 
        case 1:
                hpaddr->hpdc = bp->b_cylin;
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
-               goto nextrecal;
+               sc->sc_recal++;
+               return (MBD_RESTARTED);
        case 2:
                if (mi->mi_tab.b_errcnt < 16 ||
                    (bp->b_flags & B_READ) == 0)
                        goto donerecal;
                hpaddr->hpof = hp_offset[mi->mi_tab.b_errcnt & 017]|HPOF_FMT22;
                hpaddr->hpcs1 = HP_OFFSET|HP_GO;
        case 2:
                if (mi->mi_tab.b_errcnt < 16 ||
                    (bp->b_flags & B_READ) == 0)
                        goto donerecal;
                hpaddr->hpof = hp_offset[mi->mi_tab.b_errcnt & 017]|HPOF_FMT22;
                hpaddr->hpcs1 = HP_OFFSET|HP_GO;
-               goto nextrecal;
-       nextrecal:
-               hprecal[mi->mi_unit]++;
+               sc->sc_recal++;
                return (MBD_RESTARTED);
        donerecal:
        case 3:
                return (MBD_RESTARTED);
        donerecal:
        case 3:
-               hprecal[mi->mi_unit] = 0;
+               sc->sc_recal = 0;
                return (MBD_RETRY);
        }
                return (MBD_RETRY);
        }
+       sc->sc_hdr = 0;
        bp->b_resid = -(mi->mi_mba->mba_bcr) & 0xffff;
        bp->b_resid = -(mi->mi_mba->mba_bcr) & 0xffff;
-       if (mi->mi_tab.b_errcnt > 16) {
+       if (mi->mi_tab.b_errcnt >= 16) {
                /*
                 * This is fast and occurs rarely; we don't
                 * bother with interrupts.
                /*
                 * This is fast and occurs rarely; we don't
                 * bother with interrupts.
@@ -316,106 +650,157 @@ hpdtint(mi, mbsr)
                        ;
                mbclrattn(mi);
        }
                        ;
                mbclrattn(mi);
        }
-       hpaddr->hpcs1 = HP_RELEASE|HP_GO;
-       if (mi->mi_mba->mba_drv[0].mbd_as & (1<<mi->mi_drive))
-               printf("REL attn\n");
-       mbclrattn(mi);
+       if (!ML11) {
+               hpaddr->hpof = HPOF_FMT22;
+               hpaddr->hpcs1 = HP_RELEASE|HP_GO;
+       }
        return (MBD_DONE);
 }
 
        return (MBD_DONE);
 }
 
-hpread(dev)
+hpread(dev, uio)
        dev_t dev;
        dev_t dev;
+       struct uio *uio;
 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NHP)
 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NHP)
-               u.u_error = ENXIO;
-       else
-               physio(hpstrategy, &rhpbuf[unit], dev, B_READ, minphys);
+               return (ENXIO);
+       return (physio(hpstrategy, &rhpbuf[unit], dev, B_READ, minphys, uio));
 }
 
 }
 
-hpwrite(dev)
+hpwrite(dev, uio)
        dev_t dev;
        dev_t dev;
+       struct uio *uio;
 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NHP)
 {
        register int unit = minor(dev) >> 3;
 
        if (unit >= NHP)
-               u.u_error = ENXIO;
-       else
-               physio(hpstrategy, &rhpbuf[unit], dev, B_WRITE, minphys);
+               return (ENXIO);
+       return (physio(hpstrategy, &rhpbuf[unit], dev, B_WRITE, minphys, uio));
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/
-hpecc(mi, rm80sse)
+hpioctl(dev, cmd, data, flag)
+       dev_t dev;
+       int cmd;
+       caddr_t data;
+       int flag;
+{
+
+       switch (cmd) {
+
+       case DKIOCHDR:  /* do header read/write */
+               hpsoftc[minor(dev) >> 3].sc_hdr = 1;
+               return (0);
+
+       default:
+               return (ENXIO);
+       }
+}
+
+hpecc(mi, flag)
        register struct mba_device *mi;
        register struct mba_device *mi;
-       int rm80sse;
+       int flag;
 {
        register struct mba_regs *mbp = mi->mi_mba;
        register struct hpdevice *rp = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
 {
        register struct mba_regs *mbp = mi->mi_mba;
        register struct hpdevice *rp = (struct hpdevice *)mi->mi_drv;
        register struct buf *bp = mi->mi_tab.b_actf;
-       register struct hpst *st;
-       register int i;
-       caddr_t addr;
-       int reg, bit, byte, npf, mask, o;
+       register struct hpst *st = &hpst[mi->mi_type];
+       int npf, o;
        int bn, cn, tn, sn;
        int bn, cn, tn, sn;
-       struct pte mpte;
        int bcr;
 
        bcr = mbp->mba_bcr & 0xffff;
        if (bcr)
                bcr |= 0xffff0000;              /* sxt */
        int bcr;
 
        bcr = mbp->mba_bcr & 0xffff;
        if (bcr)
                bcr |= 0xffff0000;              /* sxt */
-       npf = btop(bcr + bp->b_bcount) - 1;
-       reg = npf;
-       if (rm80sse) {
-               rp->hpof |= HPOF_SSEI;
-               reg--;          /* compensate in advance for reg+1 below */
-               goto sse;
-       }
+       if (flag == CONT)
+               npf = bp->b_error;
+       else
+               npf = btop(bcr + bp->b_bcount);
        o = (int)bp->b_un.b_addr & PGOFSET;
        o = (int)bp->b_un.b_addr & PGOFSET;
-       printf("hp%d%c: soft ecc sn%d\n", dkunit(bp),
-           'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);
-       mask = rp->hpec2&0xffff;
-       i = (rp->hpec1&0xffff) - 1;             /* -1 makes 0 origin */
-       bit = i&07;
-       i = (i&~07)>>3;
-       byte = i + o;
-       while (i < 512 && (int)ptob(npf)+i < bp->b_bcount && bit > -11) {
-               mpte = mbp->mba_map[reg+btop(byte)];
-               addr = ptob(mpte.pg_pfnum) + (byte & PGOFSET);
-               putmemc(addr, getmemc(addr)^(mask<<bit));
-               byte++;
-               i++;
-               bit -= 8;
-       }
-       if (bcr == 0)
-               return (0);
-#ifdef notdef
-sse:
-       if (rpof&HPOF_SSEI)
-               rp->hpda = rp->hpda + 1;
-       rp->hper1 = 0;
-       rp->hpcs1 = HP_RCOM|HP_GO;
-#else
-sse:
-       rp->hpcs1 = HP_DCLR|HP_GO;
        bn = dkblock(bp);
        bn = dkblock(bp);
-       st = &hpst[mi->mi_type];
        cn = bp->b_cylin;
        cn = bp->b_cylin;
-       sn = bn%(st->nspc) + npf + 1;
+       sn = bn%(st->nspc) + npf;
        tn = sn/st->nsect;
        sn %= st->nsect;
        cn += tn/st->ntrak;
        tn %= st->ntrak;
        tn = sn/st->nsect;
        sn %= st->nsect;
        cn += tn/st->ntrak;
        tn %= st->ntrak;
-#ifdef notdef
-       if (rp->hpof&SSEI)
-               sn++;
+       switch (flag) {
+       case ECC: {
+               register int i;
+               caddr_t addr;
+               struct pte mpte;
+               int bit, byte, mask;
+
+               npf--;          /* because block in error is previous block */
+               printf("hp%d%c: soft ecc sn%d\n", dkunit(bp),
+                   'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);
+               mask = rp->hpec2&0xffff;
+               i = (rp->hpec1&0xffff) - 1;             /* -1 makes 0 origin */
+               bit = i&07;
+               i = (i&~07)>>3;
+               byte = i + o;
+               while (i < 512 && (int)ptob(npf)+i < bp->b_bcount && bit > -11) {
+                       mpte = mbp->mba_map[npf+btop(byte)];
+                       addr = ptob(mpte.pg_pfnum) + (byte & PGOFSET);
+                       putmemc(addr, getmemc(addr)^(mask<<bit));
+                       byte++;
+                       i++;
+                       bit -= 8;
+               }
+               if (bcr == 0)
+                       return (0);
+               npf++;
+               break;
+               }
+
+       case SSE:
+               rp->hpof |= HPOF_SSEI;
+               mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
+               break;
+
+       case BSE:
+#ifdef HPBDEBUG
+               if (hpbdebug)
+               printf("hpecc, BSE: bn %d cn %d tn %d sn %d\n", bn, cn, tn, sn);
 #endif
 #endif
+               if ((bn = isbad(&hpbad[mi->mi_unit], cn, tn, sn)) < 0)
+                       return(0);
+               bp->b_flags |= B_BAD;
+               bp->b_error = npf + 1;
+               bn = st->ncyl*st->nspc - st->nsect - 1 - bn;
+               cn = bn/st->nspc;
+               sn = bn%st->nspc;
+               tn = sn/st->nsect;
+               sn %= st->nsect;
+               mbp->mba_bcr = -512;
+#ifdef HPBDEBUG
+               if (hpbdebug)
+               printf("revector to cn %d tn %d sn %d\n", cn, tn, sn);
+#endif
+               break;
+
+       case CONT:
+#ifdef HPBDEBUG
+               if (hpbdebug)
+               printf("hpecc, CONT: bn %d cn %d tn %d sn %d\n", bn,cn,tn,sn);
+#endif
+               npf = bp->b_error;
+               bp->b_flags &= ~B_BAD;
+               mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
+               if ((mbp->mba_bcr & 0xffff) == 0)
+                       return(0);
+               break;
+       }
+       rp->hpcs1 = HP_DCLR|HP_GO;
+       if (rp->hpof&HPOF_SSEI)
+               sn++;
        rp->hpdc = cn;
        rp->hpda = (tn<<8) + sn;
        mbp->mba_sr = -1;
        rp->hpdc = cn;
        rp->hpda = (tn<<8) + sn;
        mbp->mba_sr = -1;
-       mbp->mba_var = (int)ptob(reg+1) + o;
-       rp->hpcs1 = HP_RCOM|HP_GO;
-#endif
+       mbp->mba_var = (int)ptob(npf) + o;
+       rp->hpcs1 = bp->b_flags&B_READ ? HP_RCOM|HP_GO : HP_WCOM|HP_GO;
+       mi->mi_tab.b_errcnt = 0;        /* error has been corrected */
        return (1);
 }
 
        return (1);
 }
 
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.