projects / unix-history / blobdiff
? search:
summary | tags | clone url | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
add stamp tracing
[unix-history] / usr / src / sys / vax / uba / up.c
diff --git a/usr/src/sys/vax/uba/up.c b/usr/src/sys/vax/uba/up.c
index bdc6524..43e801f 100644 (file)
--- a/usr/src/sys/vax/uba/up.c
+++ b/usr/src/sys/vax/uba/up.c
@@ -1,4 +1,4 @@
-/*     up.c    4.30    81/03/07        */
+/*     up.c    4.37    81/04/09        */
 
 #include "up.h"
 #if NSC > 0
 
 #include "up.h"
 #if NSC > 0
@@ -6,13 +6,9 @@
  * UNIBUS disk driver with overlapped seeks and ECC recovery.
  *
  * TODO:
  * UNIBUS disk driver with overlapped seeks and ECC recovery.
  *
  * TODO:
- *     Add reading of bad sector information and disk layout from sector 1
  *     Add bad sector forwarding code
  *     Add bad sector forwarding code
- *     Check multiple drive handling
- *     Check unibus reset code
- *     Check that offset recovery code, etc works
+ *     Check that offset recovery code works
  */
  */
-#define        DELAY(N)                { register int d; d = N; while (--d > 0); }
 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"
@@ -95,8 +91,10 @@ struct       upst {
 };
 
 u_char up_offset[16] = {
 };
 
 u_char up_offset[16] = {
-    UP_P400, UP_M400, UP_P400, UP_M400, UP_P800, UP_M800, UP_P800, UP_M800, 
-    UP_P1200, UP_M1200, UP_P1200, UP_M1200, 0, 0, 0, 0
+    UPOF_P400, UPOF_M400, UPOF_P400, UPOF_M400,
+    UPOF_P800, UPOF_M800, UPOF_P800, UPOF_M800, 
+    UPOF_P1200, UPOF_M1200, UPOF_P1200, UPOF_M1200,
+    0, 0, 0, 0
 };
 
 struct buf     rupbuf[NUP];
 };
 
 struct buf     rupbuf[NUP];
@@ -134,7 +132,7 @@ upslave(ui, reg)
 
        upaddr->upcs1 = 0;              /* conservative */
        upaddr->upcs2 = ui->ui_slave;
 
        upaddr->upcs1 = 0;              /* conservative */
        upaddr->upcs2 = ui->ui_slave;
-       if (upaddr->upcs2&UP_NED) {
+       if (upaddr->upcs2&UPCS2_NED) {
                upaddr->upcs1 = UP_DCLR|UP_GO;
                return (0);
        }
                upaddr->upcs1 = UP_DCLR|UP_GO;
                return (0);
        }
@@ -144,9 +142,7 @@ upslave(ui, reg)
 upattach(ui)
        register struct uba_device *ui;
 {
 upattach(ui)
        register struct uba_device *ui;
 {
-#ifdef notdef
        register struct updevice *upaddr;
        register struct updevice *upaddr;
-#endif
 
        if (upwstart == 0) {
                timeout(upwatch, (caddr_t)0, hz);
 
        if (upwstart == 0) {
                timeout(upwatch, (caddr_t)0, hz);
@@ -156,15 +152,21 @@ upattach(ui)
                dk_mspw[ui->ui_dk] = .0000020345;
        upip[ui->ui_ctlr][ui->ui_slave] = ui;
        up_softc[ui->ui_ctlr].sc_ndrive++;
                dk_mspw[ui->ui_dk] = .0000020345;
        upip[ui->ui_ctlr][ui->ui_slave] = ui;
        up_softc[ui->ui_ctlr].sc_ndrive++;
-#ifdef notdef
        upaddr = (struct updevice *)ui->ui_addr;
        upaddr->upcs1 = 0;
        upaddr->upcs2 = ui->ui_slave;
        upaddr = (struct updevice *)ui->ui_addr;
        upaddr->upcs1 = 0;
        upaddr->upcs2 = ui->ui_slave;
-       upaddr->uphr = -1;
-       /* ... */
-       if (upaddr-> ... == 10)
-               ui->ui_type = 1;
-#endif
+       upaddr->uphr = UPHR_MAXTRAK;
+       if (upaddr->uphr == 10)
+               ui->ui_type = 1;                /* fujitsu hack */
+       upaddr->upcs2 = UPCS2_CLR;
+/*
+       upaddr->uphr = UPHR_MAXCYL;
+       printf("maxcyl %d\n", upaddr->uphr);
+       upaddr->uphr = UPHR_MAXTRAK;
+       printf("maxtrak %d\n", upaddr->uphr);
+       upaddr->uphr = UPHR_MAXSECT;
+       printf("maxsect %d\n", upaddr->uphr);
+*/
 }
  
 upstrategy(bp)
 }
  
 upstrategy(bp)
@@ -265,17 +267,17 @@ upustart(ui)
         * If drive has just come up,
         * setup the pack.
         */
         * If drive has just come up,
         * setup the pack.
         */
-       if ((upaddr->upds & UP_VV) == 0) {
+       if ((upaddr->upds & UPDS_VV) == 0) {
                /* SHOULD WARN SYSTEM THAT THIS HAPPENED */
                upaddr->upcs1 = UP_IE|UP_DCLR|UP_GO;
                upaddr->upcs1 = UP_IE|UP_PRESET|UP_GO;
                /* SHOULD WARN SYSTEM THAT THIS HAPPENED */
                upaddr->upcs1 = UP_IE|UP_DCLR|UP_GO;
                upaddr->upcs1 = UP_IE|UP_PRESET|UP_GO;
-               upaddr->upof = UP_FMT22;
+               upaddr->upof = UPOF_FMT22;
                didie = 1;
        }
        /*
         * If drive is offline, forget about positioning.
         */
                didie = 1;
        }
        /*
         * If drive is offline, forget about positioning.
         */
-       if ((upaddr->upds & (UP_DPR|UP_MOL)) != (UP_DPR|UP_MOL))
+       if ((upaddr->upds & (UPDS_DPR|UPDS_MOL)) != (UPDS_DPR|UPDS_MOL))
                goto done;
        /*
         * If there is only one drive,
                goto done;
        /*
         * If there is only one drive,
@@ -385,14 +387,14 @@ loop:
         * Check that it is ready and online
         */
        waitdry = 0;
         * Check that it is ready and online
         */
        waitdry = 0;
-       while ((upaddr->upds&UP_DRY) == 0) {
+       while ((upaddr->upds&UPDS_DRY) == 0) {
                if (++waitdry > 512)
                        break;
                upwaitdry++;
        }
                if (++waitdry > 512)
                        break;
                upwaitdry++;
        }
-       if ((upaddr->upds & UP_DREADY) != UP_DREADY) {
+       if ((upaddr->upds & UPDS_DREADY) != UPDS_DREADY) {
                printf("up%d: not ready", dkunit(bp));
                printf("up%d: not ready", dkunit(bp));
-               if ((upaddr->upds & UP_DREADY) != UP_DREADY) {
+               if ((upaddr->upds & UPDS_DREADY) != UPDS_DREADY) {
                        printf("\n");
                        um->um_tab.b_active = 0;
                        um->um_tab.b_errcnt = 0;
                        printf("\n");
                        um->um_tab.b_active = 0;
                        um->um_tab.b_errcnt = 0;
@@ -408,15 +410,6 @@ loop:
                 */
                printf(" (flakey)\n");
        }
                 */
                printf(" (flakey)\n");
        }
-       /*
-        * After 16th retry, do offset positioning
-        */
-       if (um->um_tab.b_errcnt >= 16 && (bp->b_flags&B_READ) != 0) {
-               upaddr->upof = up_offset[um->um_tab.b_errcnt & 017] | UP_FMT22;
-               upaddr->upcs1 = UP_IE|UP_OFFSET|UP_GO;
-               while (upaddr->upds & UP_PIP)
-                       DELAY(25);
-       }
        /*
         * Setup for the transfer, and get in the
         * UNIBUS adaptor queue.
        /*
         * Setup for the transfer, and get in the
         * UNIBUS adaptor queue.
@@ -429,7 +422,7 @@ loop:
        else
                cmd = UP_IE|UP_WCOM|UP_GO;
        um->um_cmd = cmd;
        else
                cmd = UP_IE|UP_WCOM|UP_GO;
        um->um_cmd = cmd;
-       ubago(ui);
+       (void) ubago(ui);
        return (1);
 }
 
        return (1);
 }
 
@@ -486,14 +479,14 @@ upintr(sc21)
         * Check for and process errors on
         * either the drive or the controller.
         */
         * Check for and process errors on
         * either the drive or the controller.
         */
-       if ((upaddr->upds&UP_ERR) || (upaddr->upcs1&UP_TRE)) {
+       if ((upaddr->upds&UPDS_ERR) || (upaddr->upcs1&UP_TRE)) {
                waitdry = 0;
                waitdry = 0;
-               while ((upaddr->upds & UP_DRY) == 0) {
+               while ((upaddr->upds & UPDS_DRY) == 0) {
                        if (++waitdry > 512)
                                break;
                        upwaitdry++;
                }
                        if (++waitdry > 512)
                                break;
                        upwaitdry++;
                }
-               if (upaddr->uper1&UP_WLE) {
+               if (upaddr->uper1&UPER1_WLE) {
                        /*
                         * Give up on write locked devices
                         * immediately.
                        /*
                         * Give up on write locked devices
                         * immediately.
@@ -519,7 +512,7 @@ upintr(sc21)
                         * Otherwise fall through and retry the transfer
                         */
                        um->um_tab.b_active = 0;         /* force retry */
                         * Otherwise fall through and retry the transfer
                         */
                        um->um_tab.b_active = 0;         /* force retry */
-                       if ((upaddr->uper1&(UP_DCK|UP_ECH))==UP_DCK)
+                       if ((upaddr->uper1&(UPER1_DCK|UPER1_ECH))==UPER1_DCK)
                                if (upecc(ui))
                                        return;
                }
                                if (upecc(ui))
                                        return;
                }
@@ -530,23 +523,41 @@ upintr(sc21)
                 */
                upaddr->upcs1 = UP_TRE|UP_IE|UP_DCLR|UP_GO;
                needie = 0;
                 */
                upaddr->upcs1 = UP_TRE|UP_IE|UP_DCLR|UP_GO;
                needie = 0;
-               if ((um->um_tab.b_errcnt&07) == 4) {
+               if ((um->um_tab.b_errcnt&07) == 4 && um->um_tab.b_active == 0) {
                        upaddr->upcs1 = UP_RECAL|UP_IE|UP_GO;
                        upaddr->upcs1 = UP_RECAL|UP_IE|UP_GO;
-                       um->um_tab.b_active = 1;
-                       sc->sc_recal = 1;
-                       return;
+                       sc->sc_recal = 0;
+                       goto nextrecal;
                }
        }
        /*
                }
        }
        /*
-        * Done retrying transfer... release
-        * resources... if we were recalibrating,
-        * then retry the transfer.
-        * Mathematical note: 28%8 != 4.
+        * Advance recalibration finite state machine
+        * if recalibrate in progress, through
+        *      RECAL
+        *      SEEK
+        *      OFFSET (optional)
+        *      RETRY
         */
         */
-       ubadone(um);
-       if (sc->sc_recal) {
+       switch (sc->sc_recal) {
+
+       case 1:
+               upaddr->updc = bp->b_cylin;
+               upaddr->upcs1 = UP_SEEK|UP_IE|UP_GO;
+               goto nextrecal;
+       case 2:
+               if (um->um_tab.b_errcnt < 16 || (bp->b_flags&B_READ) == 0)
+                       goto donerecal;
+               upaddr->upof = up_offset[um->um_tab.b_errcnt & 017] | UPOF_FMT22;
+               upaddr->upcs1 = UP_IE|UP_OFFSET|UP_GO;
+               goto nextrecal;
+       nextrecal:
+               sc->sc_recal++;
+               um->um_tab.b_active = 1;
+               return;
+       donerecal:
+       case 3:
                sc->sc_recal = 0;
                sc->sc_recal = 0;
-               um->um_tab.b_active = 0;        /* force retry */
+               um->um_tab.b_active = 0;
+               break;
        }
        /*
         * If still ``active'', then don't need any more retries.
        }
        /*
         * If still ``active'', then don't need any more retries.
@@ -557,9 +568,9 @@ upintr(sc21)
                 * return to centerline.
                 */
                if (um->um_tab.b_errcnt >= 16) {
                 * return to centerline.
                 */
                if (um->um_tab.b_errcnt >= 16) {
-                       upaddr->upof = UP_FMT22;
+                       upaddr->upof = UPOF_FMT22;
                        upaddr->upcs1 = UP_RTC|UP_GO|UP_IE;
                        upaddr->upcs1 = UP_RTC|UP_GO|UP_IE;
-                       while (upaddr->upds & UP_PIP)
+                       while (upaddr->upds & UPDS_PIP)
                                DELAY(25);
                        needie = 0;
                }
                                DELAY(25);
                        needie = 0;
                }
@@ -580,6 +591,10 @@ upintr(sc21)
                                needie = 0;
        }
        as &= ~(1<<ui->ui_slave);
                                needie = 0;
        }
        as &= ~(1<<ui->ui_slave);
+       /*
+        * Release unibus resources and flush data paths.
+        */
+       ubadone(um);
 doattn:
        /*
         * Process other units which need attention.
 doattn:
        /*
         * Process other units which need attention.
@@ -587,12 +602,13 @@ doattn:
         * the unit start routine to place the slave
         * on the controller device queue.
         */
         * the unit start routine to place the slave
         * on the controller device queue.
         */
-       for (unit = 0; as; as >>= 1, unit++)
-               if (as & 1) {
-                       upaddr->upas = 1<<unit;
-                       if (upustart(upip[sc21][unit]))
-                               needie = 0;
-               }
+       while (unit = ffs(as)) {
+               unit--;         /* was 1 origin */
+               as &= ~(1<<unit);
+               upaddr->upas = 1<<unit;
+               if (upustart(upip[sc21][unit]))
+                       needie = 0;
+       }
        /*
         * If the controller is not transferring, but
         * there are devices ready to transfer, start
        /*
         * If the controller is not transferring, but
         * there are devices ready to transfer, start
@@ -658,6 +674,10 @@ upecc(ui)
        printf("up%d%c: soft ecc sn%d\n", dkunit(bp),
            'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);
        mask = up->upec2;
        printf("up%d%c: soft ecc sn%d\n", dkunit(bp),
            'a'+(minor(bp->b_dev)&07), bp->b_blkno + npf);
        mask = up->upec2;
+#ifdef UPECCDEBUG
+       printf("npf %d reg %x o %d mask %o pos %d\n", npf, reg, o, mask,
+           up->upec1);
+#endif
        /*
         * Flush the buffered data path, and compute the
         * byte and bit position of the error.  The variable i
        /*
         * Flush the buffered data path, and compute the
         * byte and bit position of the error.  The variable i
@@ -678,7 +698,15 @@ upecc(ui)
        while (i < 512 && (int)ptob(npf)+i < bp->b_bcount && bit > -11) {
                addr = ptob(ubp->uba_map[reg+btop(byte)].pg_pfnum)+
                    (byte & PGOFSET);
        while (i < 512 && (int)ptob(npf)+i < bp->b_bcount && bit > -11) {
                addr = ptob(ubp->uba_map[reg+btop(byte)].pg_pfnum)+
                    (byte & PGOFSET);
+#ifdef UPECCDEBUG
+               printf("addr %x map reg %x\n",
+                   addr, *(int *)(&ubp->uba_map[reg+btop(byte)]));
+               printf("old: %x, ", getmemc(addr));
+#endif
                putmemc(addr, getmemc(addr)^(mask<<bit));
                putmemc(addr, getmemc(addr)^(mask<<bit));
+#ifdef UPECCDEBUG
+               printf("new: %x\n", getmemc(addr));
+#endif
                byte++;
                i++;
                bit -= 8;
                byte++;
                i++;
                bit -= 8;
@@ -740,7 +768,7 @@ upreset(uban)
                        printf("<%d>", (um->um_ubinfo>>28)&0xf);
                        ubadone(um);
                }
                        printf("<%d>", (um->um_ubinfo>>28)&0xf);
                        ubadone(um);
                }
-               ((struct updevice *)(um->um_addr))->upcs2 = UP_CLR;
+               ((struct updevice *)(um->um_addr))->upcs2 = UPCS2_CLR;
                for (unit = 0; unit < NUP; unit++) {
                        if ((ui = updinfo[unit]) == 0)
                                continue;
                for (unit = 0; unit < NUP; unit++) {
                        if ((ui = updinfo[unit]) == 0)
                                continue;
@@ -796,7 +824,7 @@ updump(dev)
 {
        struct updevice *upaddr;
        char *start;
 {
        struct updevice *upaddr;
        char *start;
-       int num, blk, unit, i;
+       int num, blk, unit;
        struct size *sizes;
        register struct uba_regs *uba;
        register struct uba_device *ui;
        struct size *sizes;
        register struct uba_regs *uba;
        register struct uba_device *ui;
@@ -820,12 +848,12 @@ updump(dev)
        DELAY(100);
        if ((upaddr->upcs1&UP_DVA) == 0)
                return (EFAULT);
        DELAY(100);
        if ((upaddr->upcs1&UP_DVA) == 0)
                return (EFAULT);
-       if ((upaddr->upds & UP_VV) == 0) {
+       if ((upaddr->upds & UPDS_VV) == 0) {
                upaddr->upcs1 = UP_DCLR|UP_GO;
                upaddr->upcs1 = UP_PRESET|UP_GO;
                upaddr->upcs1 = UP_DCLR|UP_GO;
                upaddr->upcs1 = UP_PRESET|UP_GO;
-               upaddr->upof = UP_FMT22;
+               upaddr->upof = UPOF_FMT22;
        }
        }
-       if ((upaddr->upds & UP_DREADY) != UP_DREADY)
+       if ((upaddr->upds & UPDS_DREADY) != UPDS_DREADY)
                return (EFAULT);
        st = &upst[ui->ui_type];
        sizes = phys(struct size *, st->sizes);
                return (EFAULT);
        st = &upst[ui->ui_type];
        sizes = phys(struct size *, st->sizes);
@@ -856,7 +884,7 @@ updump(dev)
                do {
                        DELAY(25);
                } while ((upaddr->upcs1 & UP_RDY) == 0);
                do {
                        DELAY(25);
                } while ((upaddr->upcs1 & UP_RDY) == 0);
-               if (upaddr->upcs1&UP_ERR)
+               if (upaddr->upds&UPDS_ERR)
                        return (EIO);
                start += blk*NBPG;
                num -= blk;
                        return (EIO);
                start += blk*NBPG;
                num -= blk;
Continuous source code history from original PDP-7 UNIX to FreeBSD 2, the first fully unencumbered FreeBSD release.