[src/trunk]: src/sys/dev/scsipi If our enqueue failed -- because we're pollin...

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

details:   https://anonhg.NetBSD.org/src/rev/2aa19a92c5ec
branches:  trunk
changeset: 570046:2aa19a92c5ec
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Sat Sep 18 18:49:50 2004 +0000

description:
If our enqueue failed -- because we're polling and there is already something
in the queue -- do not attempt to requeue it.  We only poll in two cases:

1) We have a non-interrupting controller.  In this case, execution of the
   previous command should have left the queue empty.  (Perhaps there should be
   a KASSERT() to this effect.)

2) We're in the shutdown path, either doing a cache sync or a dump.  In these
   cases, the retry behavior is useless, because we will no longer get
   interrupts to notify us that the earlier commands completed.  Instead we
   just spin for a few seconds and fail anyway.  (XXX We should probably clear
   the queue explicitly so that the shutdown/dump will succeed.)

diffstat:

 sys/dev/scsipi/scsipi_base.c |  17 ++++-------------
 1 files changed, 4 insertions(+), 13 deletions(-)

diffs (59 lines):

diff -r b346757fc4c7 -r 2aa19a92c5ec sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Sat Sep 18 18:29:00 2004 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Sat Sep 18 18:49:50 2004 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.119 2004/09/18 18:29:00 mycroft Exp $        */
+/*     $NetBSD: scsipi_base.c,v 1.120 2004/09/18 18:49:50 mycroft Exp $        */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.119 2004/09/18 18:29:00 mycroft Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.120 2004/09/18 18:49:50 mycroft Exp $");
 
 #include "opt_scsi.h"
 
@@ -1868,7 +1868,7 @@
 {
        struct scsipi_periph *periph = xs->xs_periph;
        struct scsipi_channel *chan = periph->periph_channel;
-       int oasync, async, poll, retries, error, s;
+       int oasync, async, poll, error, s;
 
        KASSERT(!cold);
 
@@ -1963,7 +1963,6 @@
 
        async = (xs->xs_control & XS_CTL_ASYNC);
        poll = (xs->xs_control & XS_CTL_POLL);
-       retries = xs->xs_retries;               /* for polling commands */
 
 #ifdef DIAGNOSTIC
        if (oasync != 0 && xs->bp == NULL)
@@ -1974,7 +1973,6 @@
         * Enqueue the transfer.  If we're not polling for completion, this
         * should ALWAYS return `no error'.
         */
- try_again:
        error = scsipi_enqueue(xs);
        if (error) {
                if (poll == 0) {
@@ -1985,14 +1983,7 @@
                }
                
                scsipi_printaddr(periph);
-               printf("failed to enqueue polling command");
-               if (retries != 0) {
-                       printf(", retrying...\n");
-                       delay(1000000);
-                       retries--;
-                       goto try_again;
-               }
-               printf("\n");
+               printf("should have flushed queue?\n");
                goto free_xs;
        }