lint
[unix-history] / usr / src / sys / vax / mba / hp.c
index 4f151ee..34fc1c4 100644 (file)
-/*     hp.c    3.1     %H%     */
+/*     hp.c    4.42    81/11/18        */
 
 
+#ifdef HPDEBUG
+int    hpdebug;
+#endif
+#ifdef HPBDEBUG
+int    hpbdebug;
+#endif
+
+#include "hp.h"
+#if NHP > 0
 /*
 /*
- * RP04/RP06/RM03 disk driver
+ * HP disk driver for RP0x+RMxx
+ *
+ * TODO:
+ *     check RM80 skip sector handling when ECC's occur later
+ *     check offset recovery handling
+ *     see if DCLR and/or RELEASE set attention status
+ *     print bits of mr && mr2 symbolically
  */
 
 #include "../h/param.h"
 #include "../h/systm.h"
  */
 
 #include "../h/param.h"
 #include "../h/systm.h"
+#include "../h/dk.h"
 #include "../h/buf.h"
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/map.h"
 #include "../h/buf.h"
 #include "../h/conf.h"
 #include "../h/dir.h"
 #include "../h/user.h"
 #include "../h/map.h"
-#include "../h/mba.h"
-#include "../h/mtpr.h"
 #include "../h/pte.h"
 #include "../h/pte.h"
+#include "../h/mbareg.h"
+#include "../h/mbavar.h"
+#include "../h/mtpr.h"
+#include "../h/vm.h"
+#include "../h/cmap.h"
+#include "../h/dkbad.h"
 
 
-#define        DK_N    0
+#include "../h/hpreg.h"
 
 
-struct device
-{
-       int     hpcs1;          /* control and Status register 1 */
-       int     hpds;           /* Drive Status */
-       int     hper1;          /* Error register 1 */
-       int     hpmr;           /* Maintenance */ 
-       int     hpas;           /* Attention Summary */
-       int     hpda;           /* Desired address register */
-       int     hpdt;           /* Drive type */
-       int     hpla;           /* Look ahead */
-       int     hpsn;           /* serial number */
-       int     hpof;           /* Offset register */
-       int     hpdc;           /* Desired Cylinder address register */
-       int     hpcc;           /* Current Cylinder */
-       int     hper2;          /* Error register 2 */
-       int     hper3;          /* Error register 3 */
-       int     hpec1;          /* Burst error bit position */
-       int     hpec2;          /* Burst error bit pattern */
-};
-
-#define        HPADDR  ((struct device *)(MBA0 + MBA_ERB))
-#define        NHP     1
-#define        RP      022
-#define        RM      024
-#define        NSECT   22
-#define        NTRAC   19
-#define        NRMSECT 32
-#define        NRMTRAC 5
-#define        SDIST   2
-#define        RDIST   6
-
-struct size
-{
+/* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
+struct size {
        daddr_t nblocks;
        int     cyloff;
        daddr_t nblocks;
        int     cyloff;
-} hp_sizes[8] =
-{
-       15884,  0,              /* cyl 0 thru 37 */
-       33440,  38,             /* cyl 38 thru 117 */
-       8360,   98,             /* cyl 98 thru 117 */
-#ifdef ERNIE
-       15884,  118,            /* cyl 118 thru 155 */
-       66880,  156,            /* cyl 156 thru 315 */
+} 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,
-       291346, 118,            /* cyl 118 thru 814, (like distrib) */
-       208582, 316,            /* cyl 316 thru 814 */
+       0,      0,
+#ifndef NOBADSECT
+       291280, 118,            /* G=cyl 118 thru 814 */
 #else
 #else
+       291346, 118,
+#endif
        0,      0,
        0,      0,
+}, rm3_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 99 */
+       33440,  100,            /* B=cyl 100 thru 309 */
+       131680, 0,              /* C=cyl 0 thru 822 */
        0,      0,
        0,      0,
        0,      0,
        0,      0,
-       291346, 118,            /* cyl 118 thru 814 */
        0,      0,
        0,      0,
+#ifndef NOBADSECT
+       81984,  310,            /* G=cyl 310 thru 822 */
+#else
+       82080,  310,
 #endif
 #endif
-}, rm_sizes[8] = {
-       15884,  0,              /* cyl 0 thru 99 */
-       33440,  100,            /* cyl 100 thru 309 */
-       0,      0,
        0,      0,
        0,      0,
+}, rm5_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 26 */
+       33440,  27,             /* B=cyl 27 thru 81 */
+       500384, 0,              /* C=cyl 0 thru 822 */
+       15884,  562,            /* D=cyl 562 thru 588 */
+       55936,  589,            /* E=cyl 589 thru 680 */
+#ifndef NOBADSECT
+       86240,  681,            /* F=cyl 681 thru 822 */
+       158592, 562,            /* G=cyl 562 thru 822 */
+#else
+       86636,  681,
+       158688, 562,
+#endif
+       291346, 82,             /* H=cyl 82 thru 561 */
+}, rm80_sizes[8] = {
+       15884,  0,              /* A=cyl 0 thru 36 */
+       33440,  37,             /* B=cyl 37 thru 114 */
+       242606, 0,              /* C=cyl 0 thru 558 */
        0,      0,
        0,      0,
        0,      0,
        0,      0,
-       82080,  310,            /* cyl 310 thru 822 */
        0,      0,
        0,      0,
+       82080,  115,            /* G=cyl 115 thru 304 */
+       110143, 305,            /* H=cyl 305 thru 558 */
+}, hp7_sizes[8] = {
+       15844,  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 */
+};
+/* END OF STUFF WHICH SHOULD BE READ IN PER DISK */
+
+#define        _hpSDIST        2
+#define        _hpRDIST        3
+
+int    hpSDIST = _hpSDIST;
+int    hpRDIST = _hpRDIST;
+
+short  hptypes[] =
+       { MBDT_RM03, MBDT_RM05, MBDT_RP06, MBDT_RM80, MBDT_RP05, MBDT_RP07, 0 };
+struct mba_device *hpinfo[NHP];
+int    hpattach(),hpustart(),hpstart(),hpdtint();
+struct mba_driver hpdriver =
+       { hpattach, 0, hpustart, hpstart, hpdtint, 0,
+         hptypes, "hp", 0, hpinfo };
+
+struct hpst {
+       short   nsect;
+       short   ntrak;
+       short   nspc;
+       short   ncyl;
+       struct  size *sizes;
+} hpst[] = {
+       32,     5,      32*5,   823,    rm3_sizes,      /* RM03 */
+       32,     19,     32*19,  823,    rm5_sizes,      /* RM05 */
+       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 */
 };
 
 };
 
-#define        P400    020
-#define        M400    0220
-#define        P800    040
-#define        M800    0240
-#define        P1200   060
-#define        M1200   0260
-int    hp_offset[16] =
-{
-       P400, M400, P400, M400,
-       P800, M800, P800, M800,
-       P1200, M1200, P1200, M1200,
-       0, 0, 0, 0,
+u_char hp_offset[16] = {
+    HPOF_P400, HPOF_M400, HPOF_P400, HPOF_M400,
+    HPOF_P800, HPOF_M800, HPOF_P800, HPOF_M800,
+    HPOF_P1200, HPOF_M1200, HPOF_P1200, HPOF_M1200,
+    0, 0, 0, 0,
 };
 
 };
 
-struct buf     hptab;
-struct buf     rhpbuf;
-struct buf     hputab[NHP];
-char   hp_type[NHP];   /* drive type */
-
-#define        GO      01
-#define        PRESET  020
-#define        RTC     016
-#define        OFFSET  014
-#define        SEARCH  030
-#define        RECAL   06
-#define        DCLR    010
-#define        WCOM    060
-#define        RCOM    070
-
-#define        IE      0100
-#define        PIP     020000
-#define        DRY     0200
-#define        ERR     040000
-#define        TRE     040000
-#define        DCK     0100000
-#define        WLE     04000
-#define        ECH     0100
-#define        VV      0100
-#define        DPR     0400
-#define        MOL     010000
-#define        FMT22   010000
+struct buf     rhpbuf[NHP];
+#ifndef NOBADSECT
+struct buf     bhpbuf[NHP];
+struct dkbad   hpbad[NHP];
+#endif
+char   hpinit[NHP];
+char   hprecal[NHP];
 
 #define        b_cylin b_resid
  
 
 #define        b_cylin b_resid
  
@@ -129,340 +152,450 @@ char    hp_type[NHP];   /* drive type */
 daddr_t dkblock();
 #endif
  
 daddr_t dkblock();
 #endif
  
+int    hpseek;
+
+/*ARGSUSED*/
+hpattach(mi, slave)
+       struct mba_device *mi;
+{
+       register struct hpst *st = &hpst[mi->mi_type];
+
+       if (mi->mi_dk >= 0)
+               dk_mspw[mi->mi_dk] = 1.0 / 60 / (st->nsect * 256);
+}
+
 hpstrategy(bp)
 hpstrategy(bp)
-register struct buf *bp;
+       register struct buf *bp;
 {
 {
-       register struct buf *dp;
-       register unit, xunit, nspc;
+       register struct mba_device *mi;
+       register struct hpst *st;
+       register int unit;
        long sz, bn;
        long sz, bn;
-       struct size *sizes;
+       int xunit = minor(bp->b_dev) & 07;
 
 
-       xunit = minor(bp->b_dev) & 077;
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;
        unit = dkunit(bp);
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;
        unit = dkunit(bp);
-       if (hp_type[unit] == 0) {
-               struct device *hpaddr;
+       if (unit >= NHP)
+               goto bad;
+       mi = hpinfo[unit];
+       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();
+       disksort(&mi->mi_tab, bp);
+       if (mi->mi_tab.b_active == 0)
+               mbustart(mi);
+       (void) spl0();
+       return;
 
 
-               /* determine device type */
-               hpaddr = (struct device *)((int*)HPADDR + 32*unit);
-               hp_type[unit] = hpaddr->hpdt;
-       }
-       if (hp_type[unit] == RM) {
-               sizes = rm_sizes;
-               nspc = NRMSECT*NRMTRAC;
-       } else {
-               sizes = hp_sizes;
-               nspc = NSECT*NTRAC;
-       }
-       if (unit >= NHP ||
-           bp->b_blkno < 0 ||
-           (bn = dkblock(bp))+sz > sizes[xunit&07].nblocks) {
-               bp->b_flags |= B_ERROR;
-               iodone(bp);
-               return;
-       }
-       bp->b_cylin = bn/nspc + sizes[xunit&07].cyloff;
-       dp = &hputab[unit];
-       VOID spl5();
-       disksort(dp, bp);
-       if (dp->b_active == 0) {
-               hpustart(unit);
-               if(hptab.b_active == 0)
-                       hpstart();
-       }
-       VOID spl0();
+bad:
+       bp->b_flags |= B_ERROR;
+       iodone(bp);
+       return;
 }
 
 }
 
-hpustart(unit)
-register unit;
+hpustart(mi)
+       register struct mba_device *mi;
 {
 {
-       register struct buf *bp, *dp;
-       register struct device *hpaddr;
+       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];
        daddr_t bn;
        daddr_t bn;
-       int sn, cn, csn;
-
-       ((struct mba_regs *)MBA0)->mba_cr |= MBAIE;
-       HPADDR->hpas = 1<<unit;
+       int sn, dist;
+
+       hpaddr->hpcs1 = 0;
+       if ((hpaddr->hpcs1&HP_DVA) == 0)
+               return (MBU_BUSY);
+       if ((hpaddr->hpds & HPDS_VV) == 0 || hpinit[mi->mi_unit] == 0) {
+#ifndef NOBADSECT
+               struct buf *bbp = &bhpbuf[mi->mi_unit];
+#endif
 
 
-       if(unit >= NHP)
-               return;
-/*
-       dk_busy &= ~(1<<(unit+DK_N));
-*/
-       dp = &hputab[unit];
-       if((bp=dp->b_actf) == NULL)
-               return;
-       hpaddr = (struct device *)((int *)HPADDR + 32*unit);
-       if((hpaddr->hpds & VV) == 0) {
-               hpaddr->hpcs1 = PRESET|GO;
-               hpaddr->hpof = FMT22;
+               hpinit[mi->mi_unit] = 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->hpof = HPOF_FMT22;
+               mbclrattn(mi);
+#ifndef NOBADSECT
+               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;
+#endif
        }
        }
-       if(dp->b_active)
-               goto done;
-       dp->b_active++;
-       if ((hpaddr->hpds & (DPR|MOL)) != (DPR|MOL))
-               goto done;
-
+       if (mi->mi_tab.b_active || mi->mi_hd->mh_ndrive == 1)
+               return (MBU_DODATA);
+       if ((hpaddr->hpds & HPDS_DREADY) != HPDS_DREADY)
+               return (MBU_DODATA);
        bn = dkblock(bp);
        bn = dkblock(bp);
-       cn = bp->b_cylin;
-       if(hp_type[unit] == RM) {
-               sn = bn%(NRMSECT*NRMTRAC);
-               sn = (sn+NRMSECT-SDIST)%NRMSECT;
-       } else {
-               sn = bn%(NSECT*NTRAC);
-               sn = (sn+NSECT-SDIST)%NSECT;
+       sn = bn%st->nspc;
+       sn = (sn+st->nsect-hpSDIST)%st->nsect;
+       if (bp->b_cylin == (hpaddr->hpdc & 0xffff)) {
+               if (hpseek)
+                       return (MBU_DODATA);
+               dist = ((hpaddr->hpla & 0xffff)>>6) - st->nsect + 1;
+               if (dist < 0)
+                       dist += st->nsect;
+               if (dist > st->nsect - hpRDIST)
+                       return (MBU_DODATA);
+       } else
+               hpaddr->hpdc = bp->b_cylin;
+       if (hpseek)
+               hpaddr->hpcs1 = HP_SEEK|HP_GO;
+       else {
+               hpaddr->hpda = sn;
+               hpaddr->hpcs1 = HP_SEARCH|HP_GO;
        }
        }
-
-       if(cn - (hpaddr->hpdc & 0xffff))
-               goto search;
-       csn = ((hpaddr->hpla & 0xffff)>>6) - sn + SDIST - 1;
-       if(csn < 0)
-               csn += NSECT;
-       if(csn > NSECT-RDIST)
-               goto done;
-
-search:
-       hpaddr->hpdc = cn;
-       hpaddr->hpda = sn;
-       hpaddr->hpcs1 = SEARCH|GO;
-/*
-       unit += DK_N;
-       dk_busy |= 1<<unit;
-       dk_numb[unit] += 1;
-*/
-       return;
-
-done:
-       dp->b_forw = NULL;
-       if(hptab.b_actf == NULL)
-               hptab.b_actf = dp; else
-               hptab.b_actl->b_forw = dp;
-       hptab.b_actl = dp;
+       return (MBU_STARTED);
 }
 
 }
 
-hpstart()
+hpstart(mi)
+       register struct mba_device *mi;
 {
 {
-       register struct buf *bp, *dp;
-       register unit;
-       register struct device *hpaddr;
+       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];
        daddr_t bn;
        daddr_t bn;
-       int dn, sn, tn, cn, nspc, ns;
-
-loop:
-       if ((dp = hptab.b_actf) == NULL)
-               return;
-       if ((bp = dp->b_actf) == NULL) {
-               hptab.b_actf = dp->b_forw;
-               goto loop;
-       }
-       hptab.b_active++;
-       unit = minor(bp->b_dev) & 077;
-       dn = dkunit(bp);
+       int sn, tn;
+
        bn = dkblock(bp);
        bn = dkblock(bp);
-       if (hp_type[dn] == RM) {
-               nspc = NRMSECT*NRMTRAC;
-               ns = NRMSECT;
-               cn = rm_sizes[unit&07].cyloff;
-       } else {
-               nspc = NSECT*NTRAC;
-               ns = NSECT;
-               cn = hp_sizes[unit&07].cyloff;
-       }
-       cn += bn/nspc;
-       sn = bn%nspc;
-       tn = sn/ns;
-       sn = sn%ns;
-
-       hpaddr =  (struct device *)((int *)HPADDR + 32*dn);
-       if ((hpaddr->hpds & (DPR|MOL)) != (DPR|MOL)) {
-               hptab.b_active = 0;
-               hptab.b_errcnt = 0;
-               dp->b_actf = bp->av_forw;
-               bp->b_flags |= B_ERROR;
-               iodone(bp);
-               goto loop;
-       }
-       if(hptab.b_errcnt >= 16) {
-               hpaddr->hpof = hp_offset[hptab.b_errcnt & 017] | FMT22;
-               ((struct mba_regs *)MBA0)->mba_cr &= ~MBAIE;
-               hpaddr->hpcs1 = OFFSET|GO;
-               while(hpaddr->hpds & PIP)
-                       ;
-               ((struct mba_regs *)MBA0)->mba_cr |= MBAIE;
-       }
-       hpaddr->hpdc = cn;
+       sn = bn%st->nspc;
+       tn = sn/st->nsect;
+       sn %= st->nsect;
+       hpaddr->hpdc = bp->b_cylin;
        hpaddr->hpda = (tn << 8) + sn;
        hpaddr->hpda = (tn << 8) + sn;
-       mbastart(bp, (int *)hpaddr);
-
-       dk_busy |= 1<<(DK_N /*+NHP*/);
-       dk_numb[DK_N /*+NHP*/] += 1;
-       unit = bp->b_bcount>>6;
-       dk_wds[DK_N /*+NHP*/] += unit;
+       return(0);
 }
 
 }
 
-hpintr(mbastat, as)
+hpdtint(mi, mbsr)
+       register struct mba_device *mi;
+       int mbsr;
 {
 {
-       register struct buf *bp, *dp;
-       register unit;
-       register struct device *hpaddr;
-
-       if(hptab.b_active) {
-               dk_busy &= ~(1<<(DK_N /*+NHP*/));
-               dp = hptab.b_actf;
-               bp = dp->b_actf;
-               unit = dkunit(bp);
-               hpaddr = (struct device *)((int *)HPADDR + 32*unit);
-               if (hpaddr->hpds & ERR || mbastat & MBAEBITS) {         /* error bit */
-                       while((hpaddr->hpds & DRY) == 0)
-                               ;
-                       if(++hptab.b_errcnt > 28 || hpaddr->hper1&WLE)
-                               bp->b_flags |= B_ERROR; else
-                               hptab.b_active = 0;
-                       if(hptab.b_errcnt > 27)
-                               deverror(bp, mbastat, hpaddr->hper1);
-                       if ((hpaddr->hper1&0xffff) == DCK) {
-                               if (hpecc(hpaddr, bp))
-                                       return;
-                       }
-                       hpaddr->hpcs1 = DCLR|GO;
-                       if((hptab.b_errcnt&07) == 4) {
-                               ((struct mba_regs *)MBA0)->mba_cr &= ~MBAIE;
-                               hpaddr->hpcs1 = RECAL|GO;
-                               while(hpaddr->hpds & PIP)
-                                       ;
-                               ((struct mba_regs *)MBA0)->mba_cr |= MBAIE;
-                       }
+       register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
+       register struct buf *bp = mi->mi_tab.b_actf;
+       int retry = 0;
+
+#ifndef NOBADSECT
+       if (bp->b_flags&B_BAD) {
+               if (hpecc(mi, CONT))
+                       return(MBD_RESTARTED);
+       }
+#endif
+       if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {
+#ifdef 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",
+                           hpaddr->hper1, HPER1_BITS,
+                           hpaddr->hper2, HPER2_BITS);
+                       DELAY(1000000);
                }
                }
-               if(hptab.b_active) {
-                       if(hptab.b_errcnt) {
-                               ((struct mba_regs *)MBA0)->mba_cr &= ~MBAIE;
-                               hpaddr->hpcs1 = RTC|GO;
-                               while(hpaddr->hpds & PIP)
-                                       ;
-                               ((struct mba_regs *)MBA0)->mba_cr |= MBAIE;
-                       }
-                       hptab.b_active = 0;
-                       hptab.b_errcnt = 0;
-                       hptab.b_actf = dp->b_forw;
-                       dp->b_active = 0;
-                       dp->b_errcnt = 0;
-                       dp->b_actf = bp->av_forw;
-                       bp->b_resid = -(((struct mba_regs *)MBA0)->mba_bcr) & 0xffff;
-                       iodone(bp);
-                       if(dp->b_actf)
-                               hpustart(unit);
+#endif
+               if (hpaddr->hper1&HPER1_WLE) {
+                       printf("hp%d: write locked\n", dkunit(bp));
+                       bp->b_flags |= B_ERROR;
+               } else if (++mi->mi_tab.b_errcnt > 27 ||
+                   mbsr & MBSR_HARD ||
+                   hpaddr->hper1 & HPER1_HARD ||
+                   hpaddr->hper2 & HPER2_HARD) {
+hard:
+                       harderr(bp, "hp");
+                       if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
+                               printf("mbsr=%b ", mbsr, mbsr_bits);
+                       printf("er1=%b er2=%b",
+                           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;
+                       hprecal[mi->mi_unit] = 0;
+               } else if (hpaddr->hper2 & HPER2_BSE) {
+#ifndef NOBADSECT
+                       if (hpecc(mi, BSE))
+                               return(MBD_RESTARTED);
+                       else
+#endif
+                               goto hard;
+               } else if (hptypes[mi->mi_type] == MBDT_RM80 &&
+                   hpaddr->hper2&HPER2_SSE) {
+                       (void) hpecc(mi, SSE);
+                       return (MBD_RESTARTED);
+               } else if ((hpaddr->hper1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
+                       if (hpecc(mi, ECC))
+                               return (MBD_RESTARTED);
+                       /* else done */
+               } else
+                       retry = 1;
+               hpaddr->hpcs1 = HP_DCLR|HP_GO;
+               if ((mi->mi_tab.b_errcnt&07) == 4) {
+                       hpaddr->hpcs1 = HP_RECAL|HP_GO;
+                       hprecal[mi->mi_unit] = 1;
+                       return(MBD_RESTARTED);
                }
                }
-               as &= ~(1<<unit);
-       } else {
-               if(as == 0)
-                       ((struct mba_regs *)MBA0)->mba_cr |= MBAIE;
+               if (retry)
+                       return (MBD_RETRY);
+       }
+#ifdef HPDEBUG
+       else
+               if (hpdebug && hprecal[mi->mi_unit]) {
+                       printf("recal %d ", hprecal[mi->mi_unit]);
+                       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);
+               }
+#endif
+       switch (hprecal[mi->mi_unit]) {
+
+       case 1:
+               hpaddr->hpdc = bp->b_cylin;
+               hpaddr->hpcs1 = HP_SEEK|HP_GO;
+               hprecal[mi->mi_unit]++;
+               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;
+               hprecal[mi->mi_unit]++;
+               return (MBD_RESTARTED);
+       donerecal:
+       case 3:
+               hprecal[mi->mi_unit] = 0;
+               return (MBD_RETRY);
        }
        }
-       for(unit=0; unit<NHP; unit++)
-               if(as & (1<<unit))
-                       hpustart(unit);
-       hpstart();
+       bp->b_resid = -(mi->mi_mba->mba_bcr) & 0xffff;
+       if (mi->mi_tab.b_errcnt >= 16) {
+               /*
+                * This is fast and occurs rarely; we don't
+                * bother with interrupts.
+                */
+               hpaddr->hpcs1 = HP_RTC|HP_GO;
+               while (hpaddr->hpds & HPDS_PIP)
+                       ;
+               mbclrattn(mi);
+       }
+       hpaddr->hpof = HPOF_FMT22;
+       hpaddr->hpcs1 = HP_RELEASE|HP_GO;
+       return (MBD_DONE);
 }
 
 hpread(dev)
 }
 
 hpread(dev)
+       dev_t dev;
 {
 {
+       register int unit = minor(dev) >> 3;
 
 
-       physio(hpstrategy, &rhpbuf, dev, B_READ, minphys);
+       if (unit >= NHP)
+               u.u_error = ENXIO;
+       else
+               physio(hpstrategy, &rhpbuf[unit], dev, B_READ, minphys);
 }
 
 hpwrite(dev)
 }
 
 hpwrite(dev)
+       dev_t dev;
 {
 {
+       register int unit = minor(dev) >> 3;
 
 
-       physio(hpstrategy, &rhpbuf, dev, B_WRITE, minphys);
+       if (unit >= NHP)
+               u.u_error = ENXIO;
+       else
+               physio(hpstrategy, &rhpbuf[unit], dev, B_WRITE, minphys);
 }
 
 }
 
-hpecc(rp, bp)
-register struct device *rp;
-register struct buf *bp;
+hpecc(mi, flag)
+       register struct mba_device *mi;
+       int flag;
 {
 {
-       register i;
-       register b, n, map, mix;
-       register char *cp;
-       register mask;
-       short piget();
-       extern char buffers[][];
-
-       b = (((((struct mba_regs *)MBA0)->mba_bcr&0xffff) +
-               (bp->b_bcount) - 1)>>9)&0177;
-       printf("%D ", bp->b_blkno+b);
-       prdev("ECC", bp->b_dev);
-       mask = rp->hpec2&0xffff;
-       if (mask == 0) {
-               rp->hpof = FMT22;
-               return(0);
-       }
-       i = (rp->hpec1&0xffff) - 1;
-       n = i&017;
-       i = (i&~017)>>3;
-       if (bp->b_flags&B_PHYS)
-               map = 128 + b;
+       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 = &hpst[mi->mi_type];
+       int npf, o;
+       int bn, cn, tn, sn;
+       int bcr;
+
+       bcr = mbp->mba_bcr & 0xffff;
+       if (bcr)
+               bcr |= 0xffff0000;              /* sxt */
+#ifndef NOBADSECT
+       if (flag == CONT)
+               npf = bp->b_error;
        else
        else
-               map = ((bp->b_un.b_addr - (char *)buffers)>>9) + b;
-       mix = i + ((int)bp->b_un.b_addr&0x1ff);
-       i += b<<9;
-       if ( i < bp->b_bcount) {
-               cp = (char *)((((int *)MBA0_MAP)[map+(mix>>9)]&0x1fffff)<<9)+(mix&0x1ff);
-               piput((int)cp,piget((int)cp)^(mask<<n));
-       }
-       mix += 2;
-       i += 2;
-       if (i < bp->b_bcount) {
-               cp = (char *)((((int *)MBA0_MAP)[map+(mix>>9)]&0x1fffff)<<9)+(mix&0x1ff);
-               piput((int)cp,piget((int)cp)^(mask>>(16-n)));
+#endif
+               npf = btop(bcr + bp->b_bcount);
+       o = (int)bp->b_un.b_addr & PGOFSET;
+       bn = dkblock(bp);
+       cn = bp->b_cylin;
+       sn = bn%(st->nspc) + npf;
+       tn = sn/st->nsect;
+       sn %= st->nsect;
+       cn += tn/st->ntrak;
+       tn %= st->ntrak;
+       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;
+
+#ifndef NOBADSECT
+       case BSE:
+#ifdef HPBDEBUG
+               if (hpbdebug)
+               printf("hpecc, BSE: bn %d cn %d tn %d sn %d\n", bn, cn, tn, sn);
+#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;
+#endif
        }
        }
-       hptab.b_active++;
-       if (((struct mba_regs *)MBA0)->mba_bcr) {
-               i = bp->b_blkno%(NSECT*NTRAC);
-               i = ((i/NSECT)<<8)+(i%NSECT);
-               i = NSECT*(i>>8) + (i&0377) + b + 1;
-               if (i >= NSECT*NTRAC) {
-                       i -= NSECT*NTRAC;
-                       rp->hpdc = bp->b_cylin + 1;
-               } else
-                       rp->hpdc = bp->b_cylin;
-               rp->hpda = ((i/NSECT)<<8) + (i%NSECT);
-               rp->hpcs1 = DCLR|GO;
-               ((struct mba_regs *)MBA0)->mba_sr = -1;
-               ((struct mba_regs *)MBA0)->mba_var =
-                       ((map+1)<<9)|((int)bp->b_un.b_addr&0x1ff);
-               rp->hpcs1 = RCOM|GO;
-               return(1);
-       } else
-               return(0);
+       rp->hpcs1 = HP_DCLR|HP_GO;
+       if (rp->hpof&HPOF_SSEI)
+               sn++;
+       rp->hpdc = cn;
+       rp->hpda = (tn<<8) + sn;
+       mbp->mba_sr = -1;
+       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);
 }
 
 }
 
-short
-piget(pad)
-{
-       register b, savemap;
-       register short s;
-
-       savemap = (int)mmap;
-       b = (pad>>9)&0x7fffff;
-       *(int *)mmap = b|(PG_V|PG_KR);
-       mtpr(TBIS, vmmap);
-       s = *(short *)&vmmap[pad&0x1ff];
-       *(int *)mmap = savemap;
-       mtpr(TBIS, vmmap);
-       return(s);
-}
+#define        DBSIZE  20
 
 
-piput(pad, val)
+hpdump(dev)
+       dev_t dev;
 {
 {
-       register b, savemap;
-       register short *p;
-
-       savemap = (int)mmap;
-       b = (pad>>9)&0x7fffff;
-       *(int *)mmap = b|(PG_V|PG_KW);
-       mtpr(TBIS, vmmap);
-       p = (short *)&vmmap[pad&0x1ff];
-       *p = val;
-       *(int *)mmap = savemap;
-       mtpr(TBIS, vmmap);
+       register struct mba_device *mi;
+       register struct mba_regs *mba;
+       struct hpdevice *hpaddr;
+       char *start;
+       int num, unit;
+       register struct hpst *st;
+
+       num = maxfree;
+       start = 0;
+       unit = minor(dev) >> 3;
+       if (unit >= NHP)
+               return (ENXIO);
+#define        phys(a,b)       ((b)((int)(a)&0x7fffffff))
+       mi = phys(hpinfo[unit],struct mba_device *);
+       if (mi == 0 || mi->mi_alive == 0)
+               return (ENXIO);
+       mba = phys(mi->mi_hd, struct mba_hd *)->mh_physmba;
+       mba->mba_cr = MBCR_INIT;
+       hpaddr = (struct hpdevice *)&mba->mba_drv[mi->mi_drive];
+       if ((hpaddr->hpds & HPDS_VV) == 0) {
+               hpaddr->hpcs1 = HP_DCLR|HP_GO;
+               hpaddr->hpcs1 = HP_PRESET|HP_GO;
+               hpaddr->hpof = HPOF_FMT22;
+       }
+       st = &hpst[mi->mi_type];
+       if (dumplo < 0 || dumplo + num >= st->sizes[minor(dev)&07].nblocks)
+               return (EINVAL);
+       while (num > 0) {
+               register struct pte *hpte = mba->mba_map;
+               register int i;
+               int blk, cn, sn, tn;
+               daddr_t bn;
+
+               blk = num > DBSIZE ? DBSIZE : num;
+               bn = dumplo + btop(start);
+               cn = bn/st->nspc + st->sizes[minor(dev)&07].cyloff;
+               sn = bn%st->nspc;
+               tn = sn/st->nsect;
+               sn = sn%st->nsect;
+               hpaddr->hpdc = cn;
+               hpaddr->hpda = (tn << 8) + sn;
+               for (i = 0; i < blk; i++)
+                       *(int *)hpte++ = (btop(start)+i) | PG_V;
+               mba->mba_sr = -1;
+               mba->mba_bcr = -(blk*NBPG);
+               mba->mba_var = 0;
+               hpaddr->hpcs1 = HP_WCOM | HP_GO;
+               while ((hpaddr->hpds & HPDS_DRY) == 0)
+                       ;
+               if (hpaddr->hpds&HPDS_ERR)
+                       return (EIO);
+               start += blk*NBPG;
+               num -= blk;
+       }
+       return (0);
 }
 }
+#endif