[src/trunk]: src/sys/dev/ic Timeouts have priority over panicing.

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/23395b99bbfc
branches:  trunk
changeset: 784824:23395b99bbfc
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Sun Feb 10 20:13:53 2013 +0000

description:
Timeouts have priority over panicing.

diffstat:

 sys/dev/ic/mvsata.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (48 lines):

diff -r 613b6030ce6d -r 23395b99bbfc sys/dev/ic/mvsata.c
--- a/sys/dev/ic/mvsata.c       Sun Feb 10 19:22:23 2013 +0000
+++ b/sys/dev/ic/mvsata.c       Sun Feb 10 20:13:53 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsata.c,v 1.27 2013/02/10 19:22:23 jakllsch Exp $     */
+/*     $NetBSD: mvsata.c,v 1.28 2013/02/10 20:13:53 jakllsch Exp $     */
 /*
  * Copyright (c) 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.27 2013/02/10 19:22:23 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsata.c,v 1.28 2013/02/10 20:13:53 jakllsch Exp $");
 
 #include "opt_mvsata.h"
 
@@ -1260,14 +1260,6 @@
 
        chp->ch_flags &= ~(ATACH_IRQ_WAIT|ATACH_DMA_WAIT);
 
-       /* Is it not a transfer, but a control operation? */
-       if (!(xfer->c_flags & C_DMA) && drvp->state < READY) {
-               aprint_error_dev(atac->atac_dev,
-                   "channel %d: drive %d bad state %d in mvsata_bio_intr\n",
-                   chp->ch_channel, xfer->c_drive, drvp->state);
-               panic("mvsata_bio_intr: bad state");
-       }
-
        /*
         * If we missed an interrupt transfer, reset and restart.
         * Don't try to continue transfer, we may have missed cycles.
@@ -1278,6 +1270,14 @@
                return 1;
        }
 
+       /* Is it not a transfer, but a control operation? */
+       if (!(xfer->c_flags & C_DMA) && drvp->state < READY) {
+               aprint_error_dev(atac->atac_dev,
+                   "channel %d: drive %d bad state %d in mvsata_bio_intr\n",
+                   chp->ch_channel, xfer->c_drive, drvp->state);
+               panic("mvsata_bio_intr: bad state");
+       }
+
        /* Ack interrupt done by wdc_wait_for_unbusy */
        if (!(xfer->c_flags & C_DMA) &&
            (wdc_wait_for_unbusy(chp, (irq == 0) ? ATA_DELAY : 0, AT_POLL)