cd ../vaxuba

[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 9007bc9..b3a78c7 100644 (file)
--- a/usr/src/sys/vax/mba/hp.c
+++ b/usr/src/sys/vax/mba/hp.c
@@ -1,4 +1,10 @@
-/*     hp.c    6.3     84/03/22        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)hp.c        6.19 (Berkeley) %G%
+ */

 
 #ifdef HPDEBUG
 int    hpdebug;
 
 #ifdef HPDEBUG
 int    hpdebug;


@@ -13,32 +19,30 @@ int hpbdebug;
  * HP disk driver for RP0x+RMxx+ML11
  *
  * TODO:
  * HP disk driver for RP0x+RMxx+ML11
  *
  * TODO:

- *     check RM80 skip sector handling when ECC's occur later
- *     check offset recovery handling

  *     see if DCLR and/or RELEASE set attention status
  *     see if DCLR and/or RELEASE set attention status

- *     print bits of mr && mr2 symbolically

  */
 #include "../machine/pte.h"
 
  */
 #include "../machine/pte.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 "param.h"
+#include "systm.h"
+#include "dk.h"
+#include "buf.h"
+#include "conf.h"
+#include "dir.h"
+#include "user.h"
+#include "map.h"

 #include "../vax/mtpr.h"
 #include "../vax/mtpr.h"

-#include "../h/vm.h"
-#include "../h/cmap.h"
-#include "../h/dkbad.h"
-#include "../h/ioctl.h"
-#include "../h/uio.h"
+#include "vm.h"
+#include "cmap.h"
+#include "dkbad.h"
+#include "ioctl.h"
+#include "uio.h"
+#include "syslog.h"

 
 #include "../vax/dkio.h"
 
 #include "../vax/dkio.h"

-#include "../vaxmba/mbareg.h"
-#include "../vaxmba/mbavar.h"
-#include "../vaxmba/hpreg.h"
+#include "mbareg.h"
+#include "mbavar.h"
+#include "hpreg.h"

 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
 struct size {
 
 /* THIS SHOULD BE READ OFF THE PACK, PER DRIVE */
 struct size {


@@ -248,6 +252,8 @@ struct      hpsoftc {
        u_char  sc_hdr;         /* next i/o includes header */
        u_char  sc_doseeks;     /* perform explicit seeks */
        daddr_t sc_mlsize;      /* ML11 size */
        u_char  sc_hdr;         /* next i/o includes header */
        u_char  sc_doseeks;     /* perform explicit seeks */
        daddr_t sc_mlsize;      /* ML11 size */

+       int     sc_blkdone;     /* amount sucessfully transfered */
+       daddr_t sc_badbn;       /* replacement block number */

 } hpsoftc[NHP];
 
 #define        b_cylin b_resid
 } hpsoftc[NHP];
 
 #define        b_cylin b_resid


@@ -257,11 +263,9 @@ struct     hpsoftc {
 #define        RP06    (hptypes[mi->mi_type] <= MBDT_RP06)
 #define        RM80    (hptypes[mi->mi_type] == MBDT_RM80)
 
 #define        RP06    (hptypes[mi->mi_type] <= MBDT_RP06)
 #define        RM80    (hptypes[mi->mi_type] == MBDT_RM80)
 

+#define hpunit(dev)    (minor(dev) >> 3)

 #define        MASKREG(reg)    ((reg)&0xffff)
 #define        MASKREG(reg)    ((reg)&0xffff)

-
-#ifdef INTRLVE
-daddr_t dkblock();
-#endif
+#define HPWAIT(mi, addr) (((addr)->hpds & HPDS_DRY) || hpwait(mi))

 
 /*ARGSUSED*/
 hpattach(mi, slave)
 
 /*ARGSUSED*/
 hpattach(mi, slave)


@@ -399,7 +403,7 @@ done:
 hpopen(dev)
        dev_t dev;
 {
 hpopen(dev)
        dev_t dev;
 {

-       register int unit = minor(dev) >> 3;
+       register int unit = hpunit(dev);

        register struct mba_device *mi;
 
        if (unit >= NHP || (mi = hpinfo[unit]) == 0 || mi->mi_alive == 0)
        register struct mba_device *mi;
 
        if (unit >= NHP || (mi = hpinfo[unit]) == 0 || mi->mi_alive == 0)


@@ -413,31 +417,47 @@ hpstrategy(bp)
        register struct mba_device *mi;
        register struct hpst *st;
        register int unit;
        register struct mba_device *mi;
        register struct hpst *st;
        register int unit;

-       long sz, bn;
+       long sz;

        int xunit = minor(bp->b_dev) & 07;
        int s;
 
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;
        int xunit = minor(bp->b_dev) & 07;
        int s;
 
        sz = bp->b_bcount;
        sz = (sz+511) >> 9;

-       unit = dkunit(bp);
-       if (unit >= NHP)
+       unit = hpunit(bp->b_dev);
+       if (unit >= NHP) {
+               bp->b_error = ENXIO;

                goto bad;
                goto bad;

+       }

        mi = hpinfo[unit];
        mi = hpinfo[unit];

-       if (mi == 0 || mi->mi_alive == 0)
+       if (mi == 0 || mi->mi_alive == 0) {
+               bp->b_error = ENXIO;

                goto bad;
                goto bad;

+       }

        st = &hpst[mi->mi_type];
        if (ML11) {
                struct hpsoftc *sc = &hpsoftc[unit];
 
                if (bp->b_blkno < 0 ||
        st = &hpst[mi->mi_type];
        if (ML11) {
                struct hpsoftc *sc = &hpsoftc[unit];
 
                if (bp->b_blkno < 0 ||

-                   dkblock(bp)+sz > sc->sc_mlsize)
+                   bp->b_blkno+sz > sc->sc_mlsize) {
+                       if (bp->b_blkno == sc->sc_mlsize) {
+                           bp->b_resid = bp->b_bcount;
+                           goto done;
+                       }
+                       bp->b_error = EINVAL;

                        goto bad;
                        goto bad;

+               }

                bp->b_cylin = 0;
        } else {
                if (bp->b_blkno < 0 ||
                bp->b_cylin = 0;
        } else {
                if (bp->b_blkno < 0 ||

-                   (bn = dkblock(bp))+sz > st->sizes[xunit].nblocks)
+                   bp->b_blkno+sz > st->sizes[xunit].nblocks) {
+                       if (bp->b_blkno == st->sizes[xunit].nblocks) {
+                           bp->b_resid = bp->b_bcount;
+                           goto done;
+                       }
+                       bp->b_error = EINVAL;

                        goto bad;
                        goto bad;

-               bp->b_cylin = bn/st->nspc + st->sizes[xunit].cyloff;
+               }
+               bp->b_cylin = bp->b_blkno/st->nspc + st->sizes[xunit].cyloff;

        }
        s = spl5();
        disksort(&mi->mi_tab, bp);
        }
        s = spl5();
        disksort(&mi->mi_tab, bp);


@@ -448,6 +468,7 @@ hpstrategy(bp)
 
 bad:
        bp->b_flags |= B_ERROR;
 
 bad:
        bp->b_flags |= B_ERROR;

+done:

        iodone(bp);
        return;
 }
        iodone(bp);
        return;
 }


@@ -460,12 +481,25 @@ hpustart(mi)
        register struct hpst *st;
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;
        register struct hpst *st;
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;

-       int sn, dist;
+       int sn, tn, dist;

 
        st = &hpst[mi->mi_type];
        hpaddr->hpcs1 = 0;
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);
 
        st = &hpst[mi->mi_type];
        hpaddr->hpcs1 = 0;
        if ((hpaddr->hpcs1&HP_DVA) == 0)
                return (MBU_BUSY);

+
+       switch (sc->sc_recal) {
+
+       case 1:
+               HPWAIT(mi, hpaddr);
+               hpaddr->hpdc = bp->b_cylin;
+               hpaddr->hpcs1 = HP_SEEK|HP_GO;
+               sc->sc_recal++;
+               return (MBU_STARTED);
+       case 2:
+               break;
+       }
+       sc->sc_recal = 0;

        if ((hpaddr->hpds & HPDS_VV) == 0 || !sc->sc_hpinit) {
                struct buf *bbp = &bhpbuf[mi->mi_unit];
 
        if ((hpaddr->hpds & HPDS_VV) == 0 || !sc->sc_hpinit) {
                struct buf *bbp = &bhpbuf[mi->mi_unit];
 


@@ -489,14 +523,24 @@ hpustart(mi)
                        bp = bbp;
                }
        }
                        bp = bbp;
                }
        }

-       if (mi->mi_tab.b_active || mi->mi_hd->mh_ndrive == 1)
+       if (mi->mi_tab.b_active || mi->mi_hd->mh_ndrive == 1) {
+               if (mi->mi_tab.b_errcnt >= 16 && (bp->b_flags & B_READ)) {
+                       hpaddr->hpof =
+                           hp_offset[mi->mi_tab.b_errcnt & 017]|HPOF_FMT22;
+                       hpaddr->hpcs1 = HP_OFFSET|HP_GO;
+                       HPWAIT(mi, hpaddr);
+                       mbclrattn(mi);
+               }

                return (MBU_DODATA);
                return (MBU_DODATA);

+       }

        if (ML11)
                return (MBU_DODATA);
        if ((hpaddr->hpds & HPDS_DREADY) != HPDS_DREADY)
                return (MBU_DODATA);
        if (ML11)
                return (MBU_DODATA);
        if ((hpaddr->hpds & HPDS_DREADY) != HPDS_DREADY)
                return (MBU_DODATA);

-       bn = dkblock(bp);
-       sn = bn%st->nspc;
+       bn = bp->b_blkno;
+       sn = bn % st->nspc;
+       tn = sn / st->nsect;
+       sn = sn % st->nsect;

        if (bp->b_cylin == MASKREG(hpaddr->hpdc)) {
                if (sc->sc_doseeks)
                        return (MBU_DODATA);
        if (bp->b_cylin == MASKREG(hpaddr->hpdc)) {
                if (sc->sc_doseeks)
                        return (MBU_DODATA);


@@ -511,7 +555,7 @@ hpustart(mi)
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
        else {
                sn = (sn + st->nsect - st->sdist) % st->nsect;
                hpaddr->hpcs1 = HP_SEEK|HP_GO;
        else {
                sn = (sn + st->nsect - st->sdist) % st->nsect;

-               hpaddr->hpda = sn;
+               hpaddr->hpda = (tn << 8) + sn;

                hpaddr->hpcs1 = HP_SEARCH|HP_GO;
        }
        return (MBU_STARTED);
                hpaddr->hpcs1 = HP_SEARCH|HP_GO;
        }
        return (MBU_STARTED);


@@ -525,18 +569,29 @@ hpstart(mi)
        register struct hpst *st = &hpst[mi->mi_type];
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;
        register struct hpst *st = &hpst[mi->mi_type];
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        daddr_t bn;

-       int sn, tn;
+       int sn, tn, cn;

 
 

-       bn = dkblock(bp);

        if (ML11)
        if (ML11)

-               hpaddr->hpda = bn;
+               hpaddr->hpda = bp->b_blkno + sc->sc_blkdone;

        else {
        else {

-               sn = bn%st->nspc;
-               tn = sn/st->nsect;
+               if (bp->b_flags & B_BAD) {
+                       bn = sc->sc_badbn;
+                       cn = bn / st->nspc;
+               } else {
+                       bn = bp->b_blkno;
+                       cn = bp->b_cylin;
+               }
+               sn = bn % st->nspc;
+               if ((bp->b_flags & B_BAD) == 0)
+                       sn += sc->sc_blkdone;
+               tn = sn / st->nsect;

                sn %= st->nsect;
                sn %= st->nsect;

-               hpaddr->hpdc = bp->b_cylin;
+               cn += tn / st->ntrak;
+               tn %= st->ntrak;

                hpaddr->hpda = (tn << 8) + sn;
                hpaddr->hpda = (tn << 8) + sn;

+               hpaddr->hpdc = cn;

        }
        }

+       mi->mi_tab.b_bdone = dbtob(sc->sc_blkdone);

        if (sc->sc_hdr) {
                if (bp->b_flags & B_READ)
                        return (HP_RHDR|HP_GO);
        if (sc->sc_hdr) {
                if (bp->b_flags & B_READ)
                        return (HP_RHDR|HP_GO);


@@ -552,155 +607,143 @@ 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;

        register int er1, er2;
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        int retry = 0;
        register int er1, er2;
        struct hpsoftc *sc = &hpsoftc[mi->mi_unit];
        int retry = 0;

+       int npf;
+       daddr_t bn;
+       int bcr;

 
 

-       st = &hpst[mi->mi_type];
-       if (bp->b_flags&B_BAD && hpecc(mi, CONT))
-               return (MBD_RESTARTED);
+       bcr = MASKREG(-mi->mi_mba->mba_bcr);

        if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {
                er1 = hpaddr->hper1;
                er2 = hpaddr->hper2;
        if (hpaddr->hpds&HPDS_ERR || mbsr&MBSR_EBITS) {
                er1 = hpaddr->hper1;
                er2 = hpaddr->hper2;

+               if (bp->b_flags & B_BAD) {
+                       npf = bp->b_error;
+                       bn = sc->sc_badbn;
+               } else {
+                       npf = btop(bp->b_bcount - bcr);
+                       if (er1 & (HPER1_DCK | HPER1_ECH))
+                               npf--;
+                       bn = bp->b_blkno + npf;
+               }
+               if (HPWAIT(mi, hpaddr) == 0)
+                       goto hard;

 #ifdef HPDEBUG
                if (hpdebug) {
                        int dc = hpaddr->hpdc, da = hpaddr->hpda;
 
 #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",MASKREG(dc), MASKREG(da));
-                       printf("errcnt %d ", mi->mi_tab.b_errcnt);
-                       printf("mbsr=%b ", mbsr, mbsr_bits);
-                       printf("er1=%b er2=%b\n", MASKREG(er1), HPER1_BITS,
-                           MASKREG(er2), HPER2_BITS);
-                       DELAY(1000000);
+                       log(LOG_DEBUG,
+                   "hperr: bp %x cyl %d blk %d blkdone %d as %o dc %x da %x\n",
+                               bp, bp->b_cylin, bn, sc->sc_blkdone,
+                               hpaddr->hpas&0xff, MASKREG(dc), MASKREG(da));
+                       log(LOG_DEBUG,
+                               "errcnt %d mbsr=%b er1=%b er2=%b bcr -%d\n",
+                               mi->mi_tab.b_errcnt, mbsr, mbsr_bits,
+                               MASKREG(er1), HPER1_BITS,
+                               MASKREG(er2), HPER2_BITS, bcr);

                }
 #endif
                if (er1 & HPER1_HCRC) {
                        er1 &= ~(HPER1_HCE|HPER1_FER);
                        er2 &= ~HPER2_BSE;
                }
                }
 #endif
                if (er1 & HPER1_HCRC) {
                        er1 &= ~(HPER1_HCE|HPER1_FER);
                        er2 &= ~HPER2_BSE;
                }

-               if (er1&HPER1_WLE) {
-                       printf("hp%d: write locked\n", dkunit(bp));
+               if (er1 & HPER1_WLE) {
+                       log(LOG_WARNING, "hp%d: write locked\n",
+                           hpunit(bp->b_dev));

                        bp->b_flags |= B_ERROR;
                        bp->b_flags |= B_ERROR;

-               } else if (MASKREG(er1) == HPER1_FER && RP06 && !sc->sc_hdr) {
+               } else if (sc->sc_hdr) {
+                       goto hard;
+               } else if (RM80 && er2&HPER2_SSE) {
+                       (void) hpecc(mi, SSE);
+                       return (MBD_RESTARTED);
+               } else if ((er2 & HPER2_BSE) && !ML11) {

                        if (hpecc(mi, BSE))
                                return (MBD_RESTARTED);
                        goto hard;
                        if (hpecc(mi, BSE))
                                return (MBD_RESTARTED);
                        goto hard;

-               } else if (++mi->mi_tab.b_errcnt > 27 ||
-                   mbsr & MBSR_HARD ||
-                   er1 & HPER1_HARD ||
-                   sc->sc_hdr ||
-                   (!ML11 && (er2 & HPER2_HARD))) {
+               } else if (MASKREG(er1) == HPER1_FER && RP06) {
+                       if (hpecc(mi, BSE))
+                               return (MBD_RESTARTED);
+                       goto hard;
+               } else if ((er1 & (HPER1_DCK | HPER1_ECH)) == HPER1_DCK &&
+                   mi->mi_tab.b_errcnt >= 3) {
+                       if (hpecc(mi, ECC))
+                               return (MBD_RESTARTED);
+                       /*
+                        * ECC corrected.  Only log retries below
+                        * if we got errors other than soft ECC
+                        * (as indicated by additional retries).
+                        */
+                       if (mi->mi_tab.b_errcnt == 3)
+                               mi->mi_tab.b_errcnt = 0;
+               } else if ((er1 & HPER1_HCRC) && !ML11 && hpecc(mi, BSE)) {

                        /*
                         * HCRC means the header is screwed up and the sector
                         * might well exist in the bad sector table, 
                         * better check....
                         */
                        /*
                         * HCRC means the header is screwed up and the sector
                         * might well exist in the bad sector table, 
                         * better check....
                         */

-                       if ((er1&HPER1_HCRC) && 
-                           !ML11 && !sc->sc_hdr && hpecc(mi, BSE))
-                               return (MBD_RESTARTED);
+                       return (MBD_RESTARTED);
+               } else if (++mi->mi_tab.b_errcnt > 27 ||
+                   (ML11 && mi->mi_tab.b_errcnt > 15) ||
+                   mbsr & MBSR_HARD ||
+                   er1 & HPER1_HARD ||
+                   (!ML11 && (er2 & HPER2_HARD))) {

 hard:
 hard:

-                       if (ML11)
-                               bp->b_blkno = MASKREG(hpaddr->hpda);
-                       else
-                               bp->b_blkno = MASKREG(hpaddr->hpdc) * st->nspc +
-                                  (MASKREG(hpaddr->hpda) >> 8) * st->nsect +
-                                  (hpaddr->hpda&0xff);
-                       /*
-                        * If we have a data check error or a hard
-                        * ecc error the bad sector has been read/written,
-                        * and the controller registers are pointing to
-                        * the next sector...
-                        */
-                        if (er1&(HPER1_DCK|HPER1_ECH) || sc->sc_hdr)
-                               bp->b_blkno--;
+                       bp->b_blkno = bn;               /* XXX */

                        harderr(bp, "hp");
                        if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
                                printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b",
                            MASKREG(hpaddr->hper1), HPER1_BITS,
                            MASKREG(hpaddr->hper2), HPER2_BITS);
                        harderr(bp, "hp");
                        if (mbsr & (MBSR_EBITS &~ (MBSR_DTABT|MBSR_MBEXC)))
                                printf("mbsr=%b ", mbsr, mbsr_bits);
                        printf("er1=%b er2=%b",
                            MASKREG(hpaddr->hper1), HPER1_BITS,
                            MASKREG(hpaddr->hper2), HPER2_BITS);

-                       if (hpaddr->hpmr)
-                               printf(" mr=%o", MASKREG(hpaddr->hpmr));
-                       if (hpaddr->hpmr2)
-                               printf(" mr2=%o", MASKREG(hpaddr->hpmr2));

                        if (sc->sc_hdr)
                                printf(" (hdr i/o)");
                        printf("\n");
                        bp->b_flags |= B_ERROR;
                        if (sc->sc_hdr)
                                printf(" (hdr i/o)");
                        printf("\n");
                        bp->b_flags |= B_ERROR;

-                       retry = 0;
-                       sc->sc_recal = 0;
-               } else if ((er2 & HPER2_BSE) && !ML11) {
-                       if (hpecc(mi, BSE))
-                               return (MBD_RESTARTED);
-                       goto hard;
-               } else if (RM80 && er2&HPER2_SSE) {
-                       (void) hpecc(mi, SSE);
-                       return (MBD_RESTARTED);
-               } else if ((er1&(HPER1_DCK|HPER1_ECH))==HPER1_DCK) {
-                       if (hpecc(mi, ECC))
-                               return (MBD_RESTARTED);
-                       /* else done */
+                       bp->b_flags &= ~B_BAD;

                } else
                        retry = 1;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;
                } else
                        retry = 1;
                hpaddr->hpcs1 = HP_DCLR|HP_GO;

-               if (ML11) {
-                       if (mi->mi_tab.b_errcnt >= 16)
-                               goto hard;
-               } else if ((mi->mi_tab.b_errcnt&07) == 4) {
+               if (retry && (mi->mi_tab.b_errcnt & 07) == 4) {

                        hpaddr->hpcs1 = HP_RECAL|HP_GO;
                        sc->sc_recal = 1;
                        hpaddr->hpcs1 = HP_RECAL|HP_GO;
                        sc->sc_recal = 1;

-                       return (MBD_RESTARTED);
+                       return (MBD_REPOSITION);

                }
                }

-               if (retry)
-                       sc->sc_recal = 2;

        }
 #ifdef HPDEBUG
        else
                if (hpdebug && sc->sc_recal) {
        }
 #ifdef HPDEBUG
        else
                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",
+                       log(LOG_DEBUG,
+                           "recal %d errcnt %d mbsr=%b er1=%b er2=%b\n",
+                           sc->sc_recal, mi->mi_tab.b_errcnt, mbsr, mbsr_bits,

                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                }
 #endif
                            hpaddr->hper1, HPER1_BITS,
                            hpaddr->hper2, HPER2_BITS);
                }
 #endif

-       switch (sc->sc_recal) {
-
-       case 1:
-               hpaddr->hpdc = bp->b_cylin;
-               hpaddr->hpcs1 = HP_SEEK|HP_GO;
-               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;
-               while ((hpaddr->hpds & (HPDS_DRY | HPDS_PIP)) != HPDS_DRY)
-                       ;
-               mbclrattn(mi);
-       donerecal:
-               sc->sc_recal = 0;
+       HPWAIT(mi, hpaddr);
+       if (retry)

                return (MBD_RETRY);
                return (MBD_RETRY);

-       }
-       sc->sc_hdr = 0;
-       bp->b_resid = MASKREG(-mi->mi_mba->mba_bcr);

        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;
        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_DRY | HPDS_PIP)) != HPDS_DRY)
-                       ;
+               HPWAIT(mi, hpaddr);

                mbclrattn(mi);
        }
                mbclrattn(mi);
        }

+       if (mi->mi_tab.b_errcnt && (bp->b_flags & B_ERROR) == 0)
+               log(LOG_INFO, "hp%d%c: %d retries %sing sn%d\n",
+                   hpunit(bp->b_dev), 'a'+(minor(bp->b_dev)&07),
+                   mi->mi_tab.b_errcnt,
+                   (bp->b_flags & B_READ) ? "read" : "writ",
+                   (bp->b_flags & B_BAD) ?
+                   sc->sc_badbn : bp->b_blkno + sc->sc_blkdone);
+       if ((bp->b_flags & B_BAD) && hpecc(mi, CONT))
+               return (MBD_RESTARTED);
+       sc->sc_hdr = 0;
+       sc->sc_blkdone = 0;
+       bp->b_resid = bcr;

        if (!ML11) {
                hpaddr->hpof = HPOF_FMT22;
                hpaddr->hpcs1 = HP_RELEASE|HP_GO;
        if (!ML11) {
                hpaddr->hpof = HPOF_FMT22;
                hpaddr->hpcs1 = HP_RELEASE|HP_GO;


@@ -708,11 +751,28 @@ hard:
        return (MBD_DONE);
 }
 
        return (MBD_DONE);
 }
 

+/*
+ * Wait (for a bit) for a drive to come ready;
+ * returns nonzero on success.
+ */
+hpwait(mi)
+       register struct mba_device *mi;
+{
+       register struct hpdevice *hpaddr = (struct hpdevice *)mi->mi_drv;
+       register i = 100000;
+
+       while ((hpaddr->hpds & HPDS_DRY) == 0 && --i)
+               DELAY(10);
+       if (i == 0)
+               printf("hp%d: intr, not ready\n", mi->mi_unit);
+       return (i);
+}
+

 hpread(dev, uio)
        dev_t dev;
        struct uio *uio;
 {
 hpread(dev, uio)
        dev_t dev;
        struct uio *uio;
 {

-       register int unit = minor(dev) >> 3;
+       register int unit = hpunit(dev);

 
        if (unit >= NHP)
                return (ENXIO);
 
        if (unit >= NHP)
                return (ENXIO);


@@ -723,7 +783,7 @@ hpwrite(dev, uio)
        dev_t dev;
        struct uio *uio;
 {
        dev_t dev;
        struct uio *uio;
 {

-       register int unit = minor(dev) >> 3;
+       register int unit = hpunit(dev);

 
        if (unit >= NHP)
                return (ENXIO);
 
        if (unit >= NHP)
                return (ENXIO);


@@ -741,7 +801,7 @@ hpioctl(dev, cmd, data, flag)
        switch (cmd) {
 
        case DKIOCHDR:  /* do header read/write */
        switch (cmd) {
 
        case DKIOCHDR:  /* do header read/write */

-               hpsoftc[minor(dev) >> 3].sc_hdr = 1;
+               hpsoftc[hpunit(dev)].sc_hdr = 1;

                return (0);
 
        default:
                return (0);
 
        default:


@@ -757,25 +817,25 @@ hpecc(mi, flag)
        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];
        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];

+       struct hpsoftc *sc = &hpsoftc[mi->mi_unit];

        int npf, o;
        int bn, cn, tn, sn;
        int bcr;
 
        int npf, o;
        int bn, cn, tn, sn;
        int bcr;
 

-       bcr = MASKREG(mbp->mba_bcr);
-       if (bcr)
-               bcr |= 0xffff0000;              /* sxt */
-       if (flag == CONT)
+       bcr = MASKREG(-mbp->mba_bcr);
+       if (bp->b_flags & B_BAD)

                npf = bp->b_error;
        else
                npf = bp->b_error;
        else

-               npf = btop(bcr + bp->b_bcount);
+               npf = btodb(bp->b_bcount - bcr);

        o = (int)bp->b_un.b_addr & PGOFSET;
        o = (int)bp->b_un.b_addr & PGOFSET;

-       bn = dkblock(bp);
+       bn = bp->b_blkno;

        cn = bp->b_cylin;
        sn = bn%(st->nspc) + npf;
        tn = sn/st->nsect;
        sn %= st->nsect;
        cn += tn/st->ntrak;
        tn %= st->ntrak;
        cn = bp->b_cylin;
        sn = bn%(st->nspc) + npf;
        tn = sn/st->nsect;
        sn %= st->nsect;
        cn += tn/st->ntrak;
        tn %= st->ntrak;

+       bn += npf;

        switch (flag) {
        case ECC: {
                register int i;
        switch (flag) {
        case ECC: {
                register int i;


@@ -784,14 +844,17 @@ hpecc(mi, flag)
                int bit, byte, mask;
 
                npf--;          /* because block in error is previous block */
                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);
+               bn--;
+               if (bp->b_flags & B_BAD)
+                       bn = sc->sc_badbn;
+               log(LOG_WARNING, "hp%d%c: soft ecc sn%d\n", hpunit(bp->b_dev),
+                   'a'+(minor(bp->b_dev)&07), bn);

                mask = MASKREG(rp->hpec2);
                i = MASKREG(rp->hpec1) - 1;             /* -1 makes 0 origin */
                bit = i&07;
                i = (i&~07)>>3;
                byte = i + o;
                mask = MASKREG(rp->hpec2);
                i = MASKREG(rp->hpec1) - 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) {
+               while (i < 512 && (int)dbtob(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));
                        mpte = mbp->mba_map[npf+btop(byte)];
                        addr = ptob(mpte.pg_pfnum) + (byte & PGOFSET);
                        putmemc(addr, getmemc(addr)^(mask<<bit));


@@ -807,47 +870,54 @@ hpecc(mi, flag)
 
        case SSE:
                rp->hpof |= HPOF_SSEI;
 
        case SSE:
                rp->hpof |= HPOF_SSEI;

+               if (bp->b_flags & B_BAD) {
+                       bn = sc->sc_badbn;
+                       goto fixregs;
+               }

                mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
                break;
 
        case BSE:
                mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
                break;
 
        case BSE:

+               if (rp->hpof & HPOF_SSEI)
+                       sn++;

 #ifdef HPBDEBUG
                if (hpbdebug)
 #ifdef HPBDEBUG
                if (hpbdebug)

-               printf("hpecc, BSE: bn %d cn %d tn %d sn %d\n", bn, cn, tn, sn);
+               log(LOG_DEBUG, "hpecc, BSE: bn %d cn %d tn %d sn %d\n", bn, cn, tn, sn);

 #endif
 #endif

-               if (rp->hpof&HPOF_SSEI)
-                       sn++;
+               if (bp->b_flags & B_BAD)
+                       return (0);

                if ((bn = isbad(&hpbad[mi->mi_unit], cn, tn, sn)) < 0)
                        return (0);
                bp->b_flags |= B_BAD;
                bp->b_error = npf + 1;
                if ((bn = isbad(&hpbad[mi->mi_unit], cn, tn, sn)) < 0)
                        return (0);
                bp->b_flags |= B_BAD;
                bp->b_error = npf + 1;

+               rp->hpof &= ~HPOF_SSEI;

                bn = st->ncyl*st->nspc - st->nsect - 1 - bn;
                bn = st->ncyl*st->nspc - st->nsect - 1 - bn;

+               sc->sc_badbn = bn;
+       fixregs:

                cn = bn/st->nspc;
                sn = bn%st->nspc;
                tn = sn/st->nsect;
                sn %= st->nsect;
                cn = bn/st->nspc;
                sn = bn%st->nspc;
                tn = sn/st->nsect;
                sn %= st->nsect;

-               mbp->mba_bcr = -512;
-               rp->hpof &= ~HPOF_SSEI;
+               mbp->mba_bcr = -(min(512, bp->b_bcount - (int)ptob(npf)));

 #ifdef HPBDEBUG
                if (hpbdebug)
 #ifdef HPBDEBUG
                if (hpbdebug)

-               printf("revector to cn %d tn %d sn %d\n", cn, tn, sn);
+               log(LOG_DEBUG, "revector to cn %d tn %d sn %d\n", cn, tn, sn);

 #endif
                break;
 
        case CONT:
 #ifdef HPBDEBUG
                if (hpbdebug)
 #endif
                break;
 
        case CONT:
 #ifdef HPBDEBUG
                if (hpbdebug)

-               printf("hpecc, CONT: bn %d cn %d tn %d sn %d\n", bn,cn,tn,sn);
+               log(LOG_DEBUG, "hpecc, CONT: bn %d cn %d tn %d sn %d\n", bn,cn,tn,sn);

 #endif
 #endif

-               npf = bp->b_error;

                bp->b_flags &= ~B_BAD;
                bp->b_flags &= ~B_BAD;

-               mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));
-               if (MASKREG(mbp->mba_bcr) == 0)
+               if ((int)ptob(npf) >= bp->b_bcount)

                        return (0);
                        return (0);

+               mbp->mba_bcr = -(bp->b_bcount - (int)ptob(npf));

                break;
        }
        rp->hpcs1 = HP_DCLR|HP_GO;
                break;
        }
        rp->hpcs1 = HP_DCLR|HP_GO;

-       if (rp->hpof&HPOF_SSEI)
+       if (rp->hpof & HPOF_SSEI)

                sn++;
        rp->hpdc = cn;
        rp->hpda = (tn<<8) + sn;
                sn++;
        rp->hpdc = cn;
        rp->hpda = (tn<<8) + sn;


@@ -855,6 +925,7 @@ hpecc(mi, flag)
        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 */
        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 */

+       sc->sc_blkdone = npf;

        return (1);
 }
 
        return (1);
 }
 


@@ -872,7 +943,7 @@ hpdump(dev)
 
        num = maxfree;
        start = 0;
 
        num = maxfree;
        start = 0;

-       unit = minor(dev) >> 3;
+       unit = hpunit(dev);

        if (unit >= NHP)
                return (ENXIO);
 #define        phys(a,b)       ((b)((int)(a)&0x7fffffff))
        if (unit >= NHP)
                return (ENXIO);
 #define        phys(a,b)       ((b)((int)(a)&0x7fffffff))


@@ -888,8 +959,10 @@ hpdump(dev)
                hpaddr->hpof = HPOF_FMT22;
        }
        st = &hpst[mi->mi_type];
                hpaddr->hpof = HPOF_FMT22;
        }
        st = &hpst[mi->mi_type];

-       if (dumplo < 0 || dumplo + num >= st->sizes[minor(dev)&07].nblocks)
+       if (dumplo < 0)

                return (EINVAL);
                return (EINVAL);

+       if (dumplo + num >= st->sizes[minor(dev)&07].nblocks)
+               num = st->sizes[minor(dev)&07].nblocks - dumplo;

        while (num > 0) {
                register struct pte *hpte = mba->mba_map;
                register int i;
        while (num > 0) {
                register struct pte *hpte = mba->mba_map;
                register int i;


@@ -911,7 +984,7 @@ hpdump(dev)
                mba->mba_var = 0;
                hpaddr->hpcs1 = HP_WCOM | HP_GO;
                while ((hpaddr->hpds & HPDS_DRY) == 0)
                mba->mba_var = 0;
                hpaddr->hpcs1 = HP_WCOM | HP_GO;
                while ((hpaddr->hpds & HPDS_DRY) == 0)

-                       ;
+                       DELAY(10);

                if (hpaddr->hpds&HPDS_ERR)
                        return (EIO);
                start += blk*NBPG;
                if (hpaddr->hpds&HPDS_ERR)
                        return (EIO);
                start += blk*NBPG;


@@ -923,7 +996,7 @@ hpdump(dev)
 hpsize(dev)
        dev_t dev;
 {
 hpsize(dev)
        dev_t dev;
 {

-       int unit = minor(dev) >> 3;
+       int unit = hpunit(dev);

        struct mba_device *mi;
        struct hpst *st;
 
        struct mba_device *mi;
        struct hpst *st;