1 files changed, 15 insertions, 20 deletions

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 445cf364e461..2bf36e14b102 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -2082,7 +2082,6 @@ qdio_timeout_handler(struct ccw_device *cdev)
         default:
                 BUG();
         }
-        ccw_device_set_timeout(cdev, 0);
         wake_up(&cdev->private->wait_q);
 }
 
@@ -2121,6 +2120,8 @@ qdio_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                 case -EIO:
                         QDIO_PRINT_ERR("i/o error on device %s\n",
                                        cdev->dev.bus_id);
+                        qdio_set_state(irq_ptr, QDIO_IRQ_STATE_ERR);
+                        wake_up(&cdev->private->wait_q);
                         return;
                 case -ETIMEDOUT:
                         qdio_timeout_handler(cdev);
@@ -2139,8 +2140,8 @@ qdio_handler(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         QDIO_DBF_TEXT4(0, trace, dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
-        cstat = irb->scsw.cstat;
-        dstat = irb->scsw.dstat;
+        cstat = irb->scsw.cmd.cstat;
+        dstat = irb->scsw.cmd.dstat;
 
         switch (irq_ptr->state) {
         case QDIO_IRQ_STATE_INACTIVE:
@@ -2353,9 +2354,6 @@ tiqdio_check_chsc_availability(void)
 {
         char dbf_text[15];
 
-        if (!css_characteristics_avail)
-                return -EIO;
-
         /* Check for bit 41. */
         if (!css_general_characteristics.aif) {
                 QDIO_PRINT_WARN("Adapter interruption facility not " \
@@ -2667,12 +2665,12 @@ qdio_shutdown(struct ccw_device *cdev, int how)
                 spin_unlock_irqrestore(get_ccwdev_lock(cdev), flags);
         } else if (rc == 0) {
                 qdio_set_state(irq_ptr, QDIO_IRQ_STATE_CLEANUP);
-                ccw_device_set_timeout(cdev, timeout);
                 spin_unlock_irqrestore(get_ccwdev_lock(cdev),flags);
 
-                wait_event(cdev->private->wait_q,
-                           irq_ptr->state == QDIO_IRQ_STATE_INACTIVE ||
-                           irq_ptr->state == QDIO_IRQ_STATE_ERR);
+                wait_event_interruptible_timeout(cdev->private->wait_q,
+                        irq_ptr->state == QDIO_IRQ_STATE_INACTIVE ||
+                        irq_ptr->state == QDIO_IRQ_STATE_ERR,
+                        timeout);
         } else {
                 QDIO_PRINT_INFO("ccw_device_{halt,clear} returned %d for "
                                 "device %s\n", result, cdev->dev.bus_id);
@@ -2692,7 +2690,6 @@ qdio_shutdown(struct ccw_device *cdev, int how)
 
         /* Ignore errors. */
         qdio_set_state(irq_ptr, QDIO_IRQ_STATE_INACTIVE);
-        ccw_device_set_timeout(cdev, 0);
 out:
         up(&irq_ptr->setting_up_sema);
         return result;
@@ -2907,13 +2904,10 @@ qdio_establish_handle_irq(struct ccw_device *cdev, int cstat, int dstat)
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
 
-        if (qdio_establish_irq_check_for_errors(cdev, cstat, dstat)) {
-                ccw_device_set_timeout(cdev, 0);
+        if (qdio_establish_irq_check_for_errors(cdev, cstat, dstat))
                 return;
-        }
 
         qdio_set_state(irq_ptr,QDIO_IRQ_STATE_ESTABLISHED);
-        ccw_device_set_timeout(cdev, 0);
 }
 
 int
@@ -3196,8 +3190,6 @@ qdio_establish(struct qdio_initialize *init_data)
                                 irq_ptr->schid.ssid, irq_ptr->schid.sch_no,
                                 result, result2);
                 result=result2;
-                if (result)
-                        ccw_device_set_timeout(cdev, 0);
         }
 
         spin_unlock_irqrestore(get_ccwdev_lock(cdev),saveflags);
@@ -3279,7 +3271,6 @@ qdio_activate(struct ccw_device *cdev, int flags)
 
         spin_lock_irqsave(get_ccwdev_lock(cdev),saveflags);
 
-        ccw_device_set_timeout(cdev, 0);
         ccw_device_set_options(cdev, CCWDEV_REPORT_ALL);
         result=ccw_device_start(cdev,&irq_ptr->ccw,QDIO_DOING_ACTIVATE,
                                 0, DOIO_DENY_PREFETCH);
@@ -3722,7 +3713,8 @@ tiqdio_register_thinints(void)
         char dbf_text[20];
 
         tiqdio_ind =
-                s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL);
+                s390_register_adapter_interrupt(&tiqdio_thinint_handler, NULL,
+                                                TIQDIO_THININT_ISC);
         if (IS_ERR(tiqdio_ind)) {
                 sprintf(dbf_text, "regthn%lx", PTR_ERR(tiqdio_ind));
                 QDIO_DBF_TEXT0(0,setup,dbf_text);
@@ -3738,7 +3730,8 @@ static void
 tiqdio_unregister_thinints(void)
 {
         if (tiqdio_ind)
-                s390_unregister_adapter_interrupt(tiqdio_ind);
+                s390_unregister_adapter_interrupt(tiqdio_ind,
+                                                  TIQDIO_THININT_ISC);
 }
 
 static int
@@ -3899,6 +3892,7 @@ init_QDIO(void)
                                             qdio_mempool_alloc,
                                             qdio_mempool_free, NULL);
 
+        isc_register(QDIO_AIRQ_ISC);
         if (tiqdio_check_chsc_availability())
                 QDIO_PRINT_ERR("Not all CHSCs supported. Continuing.\n");
 
@@ -3911,6 +3905,7 @@ static void __exit
 cleanup_QDIO(void)
 {
         tiqdio_unregister_thinints();
+        isc_unregister(QDIO_AIRQ_ISC);
         qdio_remove_procfs_entry();
         qdio_release_qdio_memory();
         qdio_unregister_dbf_views();