3 files changed, 13 insertions, 0 deletions

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index dace46fc32e8..b67620208f36 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -349,6 +349,8 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         sch = to_subchannel(cdev->dev.parent);
 
+        ccw_device_set_timeout(cdev, 0);
+
         if (state != DEV_STATE_ONLINE)
                 cio_disable_subchannel(sch);
 
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 93a897eebfff..e7eeaf1c1826 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -216,6 +216,9 @@ ccw_device_call_handler(struct ccw_device *cdev)
               (stctl & SCSW_STCTL_PRIM_STATUS)))
                 return 0;
 
+        /* Clear pending timers for device driver initiated I/O. */
+        if (ending_status)
+                ccw_device_set_timeout(cdev, 0);
         /*
          * Now we are ready to call the device driver interrupt handler.
          */
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index 8ca2d078848c..84917b39de45 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -96,6 +96,9 @@ ccw_device_sense_pgid_start(struct ccw_device *cdev)
 {
         int ret;
 
+        /* Set a timeout of 60s */
+        ccw_device_set_timeout(cdev, 60*HZ);
+
         cdev->private->state = DEV_STATE_SENSE_PGID;
         cdev->private->imask = 0x80;
         cdev->private->iretry = 5;
@@ -480,6 +483,8 @@ ccw_device_verify_start(struct ccw_device *cdev)
                 ccw_device_verify_done(cdev, -ENODEV);
                 return;
         }
+        /* After 60s path verification is considered to have failed. */
+        ccw_device_set_timeout(cdev, 60*HZ);
         __ccw_device_verify_start(cdev);
 }
 
@@ -554,6 +559,9 @@ ccw_device_disband_irq(struct ccw_device *cdev, enum dev_event dev_event)
 void
 ccw_device_disband_start(struct ccw_device *cdev)
 {
+        /* After 60s disbanding is considered to have failed. */
+        ccw_device_set_timeout(cdev, 60*HZ);
+
         cdev->private->flags.pgid_single = 0;
         cdev->private->iretry = 5;
         cdev->private->imask = 0x80;