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.c b/sys/dev/twe/twe.c
index e935c89..340dab9 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -384,7 +384,7 @@ twe_startio(struct twe_softc *sc)
 
     debug_called(4);
 
-    if (sc->twe_state & TWE_STATE_FRZN)
+    if (sc->twe_state & (TWE_STATE_CTLR_BUSY | TWE_STATE_FRZN))
 	return;
 
     /* spin until something prevents us from doing any work */
@@ -435,6 +435,8 @@ twe_startio(struct twe_softc *sc)
 	error = twe_map_request(tr);
 
 	if (error != 0) {
+	    if (error == EBUSY)
+		break;
 	    tr->tr_status = TWE_CMD_ERROR;
 	    if (tr->tr_private != NULL) {
 		bp = (twe_bio *)(tr->tr_private);
@@ -762,7 +764,7 @@ twe_get_param(struct twe_softc *sc, int table_id, int param_id, size_t param_siz
     } else {
 	tr->tr_complete = func;
 	error = twe_map_request(tr);
-	if (error == 0)
+	if ((error == 0) || (error == EBUSY))
 	    return(func);
     }
 
@@ -931,7 +933,8 @@ twe_immediate_request(struct twe_request *tr)
     tr->tr_flags |= TWE_CMD_IMMEDIATE;
     tr->tr_status = TWE_CMD_BUSY;
     if ((error = twe_map_request(tr)) != 0)
-	return(error);
+	if (error != EBUSY)
+	    return(error);
     while (tr->tr_status == TWE_CMD_BUSY){
 	twe_done(tr->tr_sc);
     }
@@ -1131,6 +1134,7 @@ twe_done(struct twe_softc *sc)
 	    /* move to completed queue */
 	    twe_remove_busy(tr);
 	    twe_enqueue_complete(tr);
+	    sc->twe_state &= ~TWE_STATE_CTLR_BUSY;
 	} else {
 	    break;					/* no response ready */
 	}