[S390] qdio: fix error reporting for hipersockets

Hipersocket connections can encounter temporary busy conditions.
In case of the busy bit set we retry the SIGA operation immediatelly.
If the busy condition still persists after 100 ms we fail and report
the error to the upper layer. The second stage retry logic is removed.
In case of ongoing busy conditions the upper layer needs to reset the
connection.

The reporting of a SIGA error is now done synchronously to allow the
network driver to requeue the buffers. Also no error trace is created
for the temporary SIGA errors so the error message view is not flooded.

Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 1 insertions, 7 deletions

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index c60f2566d28c..42f2b09631b6 100644
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -14,7 +14,6 @@
 #include "chsc.h"
 
 #define QDIO_BUSY_BIT_PATIENCE          100     /* 100 microseconds */
-#define QDIO_BUSY_BIT_GIVE_UP           2000000 /* 2 seconds = eternity */
 #define QDIO_INPUT_THRESHOLD            500     /* 500 microseconds */
 
 /*
@@ -195,12 +194,6 @@ struct qdio_input_q {
 };
 
 struct qdio_output_q {
-        /* failed siga-w attempts*/
-        atomic_t busy_siga_counter;
-
-        /* start time of busy condition */
-        u64 timestamp;
-
         /* PCIs are enabled for the queue */
         int pci_out_enabled;
 
@@ -251,6 +244,7 @@ struct qdio_q {
 
         struct qdio_irq *irq_ptr;
         struct tasklet_struct tasklet;
+        spinlock_t lock;
 
         /* error condition during a data transfer */
         unsigned int qdio_error;