Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 44 insertions, 9 deletions

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index c9b852647f01..52c233fa2b12 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -174,7 +174,10 @@ ccw_device_cancel_halt_clear(struct ccw_device *cdev)
                 ret = cio_clear (sch);
                 return (ret == 0) ? -EBUSY : ret;
         }
-        panic("Can't stop i/o on subchannel.\n");
+        /* Function was unsuccessful */
+        CIO_MSG_EVENT(0, "0.%x.%04x: could not stop I/O\n",
+                      cdev->private->dev_id.ssid, cdev->private->dev_id.devno);
+        return -EIO;
 }
 
 void ccw_device_update_sense_data(struct ccw_device *cdev)
@@ -315,7 +318,7 @@ ccw_device_sense_id_done(struct ccw_device *cdev, int err)
 
 /**
   * ccw_device_notify() - inform the device's driver about an event
-  * @cdev: device for which an event occured
+  * @cdev: device for which an event occurred
   * @event: event that occurred
   *
   * Returns:
@@ -349,9 +352,13 @@ out:
 
 static void ccw_device_oper_notify(struct ccw_device *cdev)
 {
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+
         if (ccw_device_notify(cdev, CIO_OPER) == NOTIFY_OK) {
                 /* Reenable channel measurements, if needed. */
                 ccw_device_sched_todo(cdev, CDEV_TODO_ENABLE_CMF);
+                /* Save indication for new paths. */
+                cdev->private->path_new_mask = sch->vpm;
                 return;
         }
         /* Driver doesn't want device back. */
@@ -401,9 +408,10 @@ ccw_device_done(struct ccw_device *cdev, int state)
                 CIO_MSG_EVENT(0, "Disconnected device %04x on subchannel "
                               "%04x\n", cdev->private->dev_id.devno,
                               sch->schid.sch_no);
-                if (ccw_device_notify(cdev, CIO_NO_PATH) != NOTIFY_OK)
+                if (ccw_device_notify(cdev, CIO_NO_PATH) != NOTIFY_OK) {
+                        cdev->private->state = DEV_STATE_NOT_OPER;
                         ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
-                else
+                } else
                         ccw_device_set_disconnected(cdev);
                 cdev->private->flags.donotify = 0;
                 break;
@@ -462,6 +470,32 @@ static void ccw_device_request_event(struct ccw_device *cdev, enum dev_event e)
         }
 }
 
+static void ccw_device_report_path_events(struct ccw_device *cdev)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+        int path_event[8];
+        int chp, mask;
+
+        for (chp = 0, mask = 0x80; chp < 8; chp++, mask >>= 1) {
+                path_event[chp] = PE_NONE;
+                if (mask & cdev->private->path_gone_mask & ~(sch->vpm))
+                        path_event[chp] |= PE_PATH_GONE;
+                if (mask & cdev->private->path_new_mask & sch->vpm)
+                        path_event[chp] |= PE_PATH_AVAILABLE;
+                if (mask & cdev->private->pgid_reset_mask & sch->vpm)
+                        path_event[chp] |= PE_PATHGROUP_ESTABLISHED;
+        }
+        if (cdev->online && cdev->drv->path_event)
+                cdev->drv->path_event(cdev, path_event);
+}
+
+static void ccw_device_reset_path_events(struct ccw_device *cdev)
+{
+        cdev->private->path_gone_mask = 0;
+        cdev->private->path_new_mask = 0;
+        cdev->private->pgid_reset_mask = 0;
+}
+
 void
 ccw_device_verify_done(struct ccw_device *cdev, int err)
 {
@@ -498,6 +532,7 @@ callback:
                                               &cdev->private->irb);
                         memset(&cdev->private->irb, 0, sizeof(struct irb));
                 }
+                ccw_device_report_path_events(cdev);
                 break;
         case -ETIME:
         case -EUSERS:
@@ -516,6 +551,7 @@ callback:
                 ccw_device_done(cdev, DEV_STATE_NOT_OPER);
                 break;
         }
+        ccw_device_reset_path_events(cdev);
 }
 
 /*
@@ -653,7 +689,7 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event)
             (scsw_stctl(&cdev->private->irb.scsw) & SCSW_STCTL_STATUS_PEND)) {
                 /*
                  * No final status yet or final status not yet delivered
-                 * to the device driver. Can't do path verfication now,
+                 * to the device driver. Can't do path verification now,
                  * delay until final status was delivered.
                  */
                 cdev->private->flags.doverify = 1;
@@ -734,13 +770,14 @@ ccw_device_online_timeout(struct ccw_device *cdev, enum dev_event dev_event)
         int ret;
 
         ccw_device_set_timeout(cdev, 0);
+        cdev->private->iretry = 255;
         ret = ccw_device_cancel_halt_clear(cdev);
         if (ret == -EBUSY) {
                 ccw_device_set_timeout(cdev, 3*HZ);
                 cdev->private->state = DEV_STATE_TIMEOUT_KILL;
                 return;
         }
-        if (ret == -ENODEV)
+        if (ret)
                 dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
         else if (cdev->handler)
                 cdev->handler(cdev, cdev->private->intparm,
@@ -804,9 +841,6 @@ call_handler:
 static void
 ccw_device_killing_irq(struct ccw_device *cdev, enum dev_event dev_event)
 {
-        struct subchannel *sch;
-
-        sch = to_subchannel(cdev->dev.parent);
         ccw_device_set_timeout(cdev, 0);
         /* Start delayed path verification. */
         ccw_device_online_verify(cdev, 0);
@@ -837,6 +871,7 @@ void ccw_device_kill_io(struct ccw_device *cdev)
 {
         int ret;
 
+        cdev->private->iretry = 255;
         ret = ccw_device_cancel_halt_clear(cdev);
         if (ret == -EBUSY) {
                 ccw_device_set_timeout(cdev, 3*HZ);