Fix for a problem seen only on 6xxx series controllers, where-in the

driver tries to submit the same request repeatedly, on finding the
controller cmd queue to be full.

Submitted by:ps, vkashyap
Reviewed by:re
Approved by:re

1 files changed, 7 insertions, 3 deletions

diff --git a/sys/dev/twe/twe_freebsd.c b/sys/dev/twe/twe_freebsd.c
index 0f04532..2415ca5 100644
--- a/sys/dev/twe/twe_freebsd.c
+++ b/sys/dev/twe/twe_freebsd.c
@@ -1014,8 +1014,10 @@ twe_setup_data_dmamap(void *arg, bus_dma_segment_t *segs, int nsegments, int err
 	}
     }
 
-    if (twe_start(tr) == EBUSY)
+    if (twe_start(tr) == EBUSY) {
+	tr->tr_sc->twe_state |= TWE_STATE_CTLR_BUSY;
 	twe_requeue_ready(tr);
+    }
 }
 
 static void
@@ -1037,8 +1039,10 @@ twe_map_request(struct twe_request *tr)
 
     debug_called(4);
 
-    if (sc->twe_state & TWE_STATE_FRZN)
+    if (sc->twe_state & (TWE_STATE_CTLR_BUSY | TWE_STATE_FRZN)) {
+	twe_requeue_ready(tr);
 	return (EBUSY);
+    }
 
     bus_dmamap_sync(sc->twe_cmd_dmat, sc->twe_cmdmap, BUS_DMASYNC_PREWRITE);
 
@@ -1079,8 +1083,8 @@ twe_map_request(struct twe_request *tr)
 	}
     } else
 	if ((error = twe_start(tr)) == EBUSY) {
+	    sc->twe_state |= TWE_STATE_CTLR_BUSY;
 	    twe_requeue_ready(tr);
-	    error = 0;
 	}
 
     return(error);