1 files changed, 18 insertions, 3 deletions

diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index e58169c32474..288c9140290e 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -313,7 +313,7 @@ static int qdio_siga_output(struct qdio_q *q, unsigned int *busy_bit)
         unsigned long schid = *((u32 *) &q->irq_ptr->schid);
         unsigned int fc = QDIO_SIGA_WRITE;
         u64 start_time = 0;
-        int cc;
+        int retries = 0, cc;
 
         if (is_qebsm(q)) {
                 schid = q->irq_ptr->sch_token;
@@ -325,6 +325,7 @@ again:
         /* hipersocket busy condition */
         if (unlikely(*busy_bit)) {
                 WARN_ON(queue_type(q) != QDIO_IQDIO_QFMT || cc != 2);
+                retries++;
 
                 if (!start_time) {
                         start_time = get_clock();
@@ -333,6 +334,11 @@ again:
                 if ((get_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
                         goto again;
         }
+        if (retries) {
+                DBF_DEV_EVENT(DBF_WARN, q->irq_ptr,
+                              "%4x cc2 BB1:%1d", SCH_NO(q), q->nr);
+                DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "count:%u", retries);
+        }
         return cc;
 }
 
@@ -728,13 +734,14 @@ static inline int qdio_outbound_q_moved(struct qdio_q *q)
 
 static int qdio_kick_outbound_q(struct qdio_q *q)
 {
+        int retries = 0, cc;
         unsigned int busy_bit;
-        int cc;
 
         if (!need_siga_out(q))
                 return 0;
 
         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w:%1d", q->nr);
+retry:
         qperf_inc(q, siga_write);
 
         cc = qdio_siga_output(q, &busy_bit);
@@ -743,7 +750,11 @@ static int qdio_kick_outbound_q(struct qdio_q *q)
                 break;
         case 2:
                 if (busy_bit) {
-                        DBF_ERROR("%4x cc2 REP:%1d", SCH_NO(q), q->nr);
+                        while (++retries < QDIO_BUSY_BIT_RETRIES) {
+                                mdelay(QDIO_BUSY_BIT_RETRY_DELAY);
+                                goto retry;
+                        }
+                        DBF_ERROR("%4x cc2 BBC:%1d", SCH_NO(q), q->nr);
                         cc |= QDIO_ERROR_SIGA_BUSY;
                 } else
                         DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "siga-w cc2:%1d", q->nr);
@@ -753,6 +764,10 @@ static int qdio_kick_outbound_q(struct qdio_q *q)
                 DBF_ERROR("%4x SIGA-W:%1d", SCH_NO(q), cc);
                 break;
         }
+        if (retries) {
+                DBF_ERROR("%4x cc2 BB2:%1d", SCH_NO(q), q->nr);
+                DBF_ERROR("count:%u", retries);
+        }
         return cc;
 }