[S390] qdio: cleanup SIGA sync

Simplify the SIGA sync code and add unlikely annotations. In polling mode
SBALs may be accessed without interrupt, so call SIGA sync before every scan.

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

1 files changed, 7 insertions, 12 deletions

diff --git a/drivers/s390/cio/qdio_setup.c b/drivers/s390/cio/qdio_setup.c
index 635f35dc846..89107d0938c 100644
--- a/drivers/s390/cio/qdio_setup.c
+++ b/drivers/s390/cio/qdio_setup.c
@@ -197,14 +197,10 @@ static void process_ac_flags(struct qdio_irq *irq_ptr, unsigned char qdioac)
                 irq_ptr->siga_flag.output = 1;
         if (qdioac & AC1_SIGA_SYNC_NEEDED)
                 irq_ptr->siga_flag.sync = 1;
-        if (qdioac & AC1_AUTOMATIC_SYNC_ON_THININT)
-                irq_ptr->siga_flag.no_sync_ti = 1;
-        if (qdioac & AC1_AUTOMATIC_SYNC_ON_OUT_PCI)
-                irq_ptr->siga_flag.no_sync_out_pci = 1;
-
-        if (irq_ptr->siga_flag.no_sync_out_pci &&
-            irq_ptr->siga_flag.no_sync_ti)
-                irq_ptr->siga_flag.no_sync_out_ti = 1;
+        if (!(qdioac & AC1_AUTOMATIC_SYNC_ON_THININT))
+                irq_ptr->siga_flag.sync_after_ai = 1;
+        if (!(qdioac & AC1_AUTOMATIC_SYNC_ON_OUT_PCI))
+                irq_ptr->siga_flag.sync_out_after_pci = 1;
 }
 
 static void check_and_setup_qebsm(struct qdio_irq *irq_ptr,
@@ -452,7 +448,7 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
         char s[80];
 
         snprintf(s, 80, "qdio: %s %s on SC %x using "
-                 "AI:%d QEBSM:%d PCI:%d TDD:%d SIGA:%s%s%s%s%s%s\n",
+                 "AI:%d QEBSM:%d PCI:%d TDD:%d SIGA:%s%s%s%s%s\n",
                  dev_name(&cdev->dev),
                  (irq_ptr->qib.qfmt == QDIO_QETH_QFMT) ? "OSA" :
                         ((irq_ptr->qib.qfmt == QDIO_ZFCP_QFMT) ? "ZFCP" : "HS"),
@@ -464,9 +460,8 @@ void qdio_print_subchannel_info(struct qdio_irq *irq_ptr,
                  (irq_ptr->siga_flag.input) ? "R" : " ",
                  (irq_ptr->siga_flag.output) ? "W" : " ",
                  (irq_ptr->siga_flag.sync) ? "S" : " ",
-                 (!irq_ptr->siga_flag.no_sync_ti) ? "A" : " ",
-                 (!irq_ptr->siga_flag.no_sync_out_ti) ? "O" : " ",
-                 (!irq_ptr->siga_flag.no_sync_out_pci) ? "P" : " ");
+                 (irq_ptr->siga_flag.sync_after_ai) ? "A" : " ",
+                 (irq_ptr->siga_flag.sync_out_after_pci) ? "P" : " ");
         printk(KERN_INFO "%s", s);
 }