1 files changed, 64 insertions, 24 deletions

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 51bd3687d163..8e04c00cf0ad 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -127,7 +127,7 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env)
         return ret;
 }
 
-struct bus_type ccw_bus_type;
+static struct bus_type ccw_bus_type;
 
 static void io_subchannel_irq(struct subchannel *);
 static int io_subchannel_probe(struct subchannel *);
@@ -172,9 +172,11 @@ static int io_subchannel_settle(void)
 }
 
 static struct css_driver io_subchannel_driver = {
-        .owner = THIS_MODULE,
+        .drv = {
+                .owner = THIS_MODULE,
+                .name = "io_subchannel",
+        },
         .subchannel_type = io_subchannel_ids,
-        .name = "io_subchannel",
         .irq = io_subchannel_irq,
         .sch_event = io_subchannel_sch_event,
         .chp_event = io_subchannel_chp_event,
@@ -539,15 +541,24 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
         int force, ret;
         unsigned long i;
 
-        if (!dev_fsm_final_state(cdev) &&
-            cdev->private->state != DEV_STATE_DISCONNECTED)
-                return -EAGAIN;
+        /* Prevent conflict between multiple on-/offline processing requests. */
         if (atomic_cmpxchg(&cdev->private->onoff, 0, 1) != 0)
                 return -EAGAIN;
+        /* Prevent conflict between internal I/Os and on-/offline processing. */
+        if (!dev_fsm_final_state(cdev) &&
+            cdev->private->state != DEV_STATE_DISCONNECTED) {
+                ret = -EAGAIN;
+                goto out_onoff;
+        }
+        /* Prevent conflict between pending work and on-/offline processing.*/
+        if (work_pending(&cdev->private->todo_work)) {
+                ret = -EAGAIN;
+                goto out_onoff;
+        }
 
-        if (cdev->drv && !try_module_get(cdev->drv->owner)) {
-                atomic_set(&cdev->private->onoff, 0);
-                return -EINVAL;
+        if (cdev->drv && !try_module_get(cdev->drv->driver.owner)) {
+                ret = -EINVAL;
+                goto out_onoff;
         }
         if (!strncmp(buf, "force\n", count)) {
                 force = 1;
@@ -571,7 +582,8 @@ static ssize_t online_store (struct device *dev, struct device_attribute *attr,
         }
 out:
         if (cdev->drv)
-                module_put(cdev->drv->owner);
+                module_put(cdev->drv->driver.owner);
+out_onoff:
         atomic_set(&cdev->private->onoff, 0);
         return (ret < 0) ? ret : count;
 }
@@ -1030,6 +1042,7 @@ static void io_subchannel_init_fields(struct subchannel *sch)
  */
 static int io_subchannel_probe(struct subchannel *sch)
 {
+        struct io_subchannel_private *io_priv;
         struct ccw_device *cdev;
         int rc;
 
@@ -1073,10 +1086,11 @@ static int io_subchannel_probe(struct subchannel *sch)
         if (rc)
                 goto out_schedule;
         /* Allocate I/O subchannel private data. */
-        sch->private = kzalloc(sizeof(struct io_subchannel_private),
-                               GFP_KERNEL | GFP_DMA);
-        if (!sch->private)
+        io_priv = kzalloc(sizeof(*io_priv), GFP_KERNEL | GFP_DMA);
+        if (!io_priv)
                 goto out_schedule;
+
+        set_io_private(sch, io_priv);
         css_schedule_eval(sch->schid);
         return 0;
 
@@ -1090,6 +1104,7 @@ out_schedule:
 static int
 io_subchannel_remove (struct subchannel *sch)
 {
+        struct io_subchannel_private *io_priv = to_io_private(sch);
         struct ccw_device *cdev;
 
         cdev = sch_get_cdev(sch);
@@ -1099,11 +1114,12 @@ io_subchannel_remove (struct subchannel *sch)
         /* Set ccw device to not operational and drop reference. */
         spin_lock_irq(cdev->ccwlock);
         sch_set_cdev(sch, NULL);
+        set_io_private(sch, NULL);
         cdev->private->state = DEV_STATE_NOT_OPER;
         spin_unlock_irq(cdev->ccwlock);
         ccw_device_unregister(cdev);
 out_free:
-        kfree(sch->private);
+        kfree(io_priv);
         sysfs_remove_group(&sch->dev.kobj, &io_subchannel_attr_group);
         return 0;
 }
@@ -1147,6 +1163,7 @@ err:
 static int io_subchannel_chp_event(struct subchannel *sch,
                                    struct chp_link *link, int event)
 {
+        struct ccw_device *cdev = sch_get_cdev(sch);
         int mask;
 
         mask = chp_ssd_get_mask(&sch->ssd_info, link);
@@ -1156,22 +1173,30 @@ static int io_subchannel_chp_event(struct subchannel *sch,
         case CHP_VARY_OFF:
                 sch->opm &= ~mask;
                 sch->lpm &= ~mask;
+                if (cdev)
+                        cdev->private->path_gone_mask |= mask;
                 io_subchannel_terminate_path(sch, mask);
                 break;
         case CHP_VARY_ON:
                 sch->opm |= mask;
                 sch->lpm |= mask;
+                if (cdev)
+                        cdev->private->path_new_mask |= mask;
                 io_subchannel_verify(sch);
                 break;
         case CHP_OFFLINE:
                 if (cio_update_schib(sch))
                         return -ENODEV;
+                if (cdev)
+                        cdev->private->path_gone_mask |= mask;
                 io_subchannel_terminate_path(sch, mask);
                 break;
         case CHP_ONLINE:
                 if (cio_update_schib(sch))
                         return -ENODEV;
                 sch->lpm |= mask & sch->opm;
+                if (cdev)
+                        cdev->private->path_new_mask |= mask;
                 io_subchannel_verify(sch);
                 break;
         }
@@ -1196,6 +1221,7 @@ static void io_subchannel_quiesce(struct subchannel *sch)
                 cdev->handler(cdev, cdev->private->intparm, ERR_PTR(-EIO));
         while (ret == -EBUSY) {
                 cdev->private->state = DEV_STATE_QUIESCE;
+                cdev->private->iretry = 255;
                 ret = ccw_device_cancel_halt_clear(cdev);
                 if (ret == -EBUSY) {
                         ccw_device_set_timeout(cdev, HZ/10);
@@ -1295,10 +1321,12 @@ static int purge_fn(struct device *dev, void *data)
 
         spin_lock_irq(cdev->ccwlock);
         if (is_blacklisted(id->ssid, id->devno) &&
-            (cdev->private->state == DEV_STATE_OFFLINE)) {
+            (cdev->private->state == DEV_STATE_OFFLINE) &&
+            (atomic_cmpxchg(&cdev->private->onoff, 0, 1) == 0)) {
                 CIO_MSG_EVENT(3, "ccw: purging 0.%x.%04x\n", id->ssid,
                               id->devno);
                 ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
+                atomic_set(&cdev->private->onoff, 0);
         }
         spin_unlock_irq(cdev->ccwlock);
         /* Abort loop in case of pending signal. */
@@ -1445,7 +1473,16 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
                 break;
         case IO_SCH_UNREG_ATTACH:
         case IO_SCH_UNREG:
-                if (cdev)
+                if (!cdev)
+                        break;
+                if (cdev->private->state == DEV_STATE_SENSE_ID) {
+                        /*
+                         * Note: delayed work triggered by this event
+                         * and repeated calls to sch_event are synchronized
+                         * by the above check for work_pending(cdev).
+                         */
+                        dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
+                } else
                         ccw_device_set_notoper(cdev);
                 break;
         case IO_SCH_NOP:
@@ -1468,9 +1505,13 @@ static int io_subchannel_sch_event(struct subchannel *sch, int process)
                         goto out;
                 break;
         case IO_SCH_UNREG_ATTACH:
+                if (cdev->private->flags.resuming) {
+                        /* Device will be handled later. */
+                        rc = 0;
+                        goto out;
+                }
                 /* Unregister ccw device. */
-                if (!cdev->private->flags.resuming)
-                        ccw_device_unregister(cdev);
+                ccw_device_unregister(cdev);
                 break;
         default:
                 break;
@@ -1530,11 +1571,12 @@ spinlock_t * cio_get_console_lock(void)
 static int ccw_device_console_enable(struct ccw_device *cdev,
                                      struct subchannel *sch)
 {
+        struct io_subchannel_private *io_priv = cio_get_console_priv();
         int rc;
 
         /* Attach subchannel private data. */
-        sch->private = cio_get_console_priv();
-        memset(sch->private, 0, sizeof(struct io_subchannel_private));
+        memset(io_priv, 0, sizeof(*io_priv));
+        set_io_private(sch, io_priv);
         io_subchannel_init_fields(sch);
         rc = cio_commit_config(sch);
         if (rc)
@@ -1812,6 +1854,7 @@ static void __ccw_device_pm_restore(struct ccw_device *cdev)
          * available again. Kick re-detection.
          */
         cdev->private->flags.resuming = 1;
+        cdev->private->path_new_mask = LPM_ANYPATH;
         css_schedule_eval(sch->schid);
         spin_unlock_irq(sch->lock);
         css_complete_work();
@@ -1939,7 +1982,7 @@ static const struct dev_pm_ops ccw_pm_ops = {
         .restore = ccw_device_pm_restore,
 };
 
-struct bus_type ccw_bus_type = {
+static struct bus_type ccw_bus_type = {
         .name   = "ccw",
         .match  = ccw_bus_match,
         .uevent = ccw_uevent,
@@ -1962,8 +2005,6 @@ int ccw_driver_register(struct ccw_driver *cdriver)
         struct device_driver *drv = &cdriver->driver;
 
         drv->bus = &ccw_bus_type;
-        drv->name = cdriver->name;
-        drv->owner = cdriver->owner;
 
         return driver_register(drv);
 }
@@ -2081,5 +2122,4 @@ EXPORT_SYMBOL(ccw_device_set_offline);
 EXPORT_SYMBOL(ccw_driver_register);
 EXPORT_SYMBOL(ccw_driver_unregister);
 EXPORT_SYMBOL(get_ccwdev_by_busid);
-EXPORT_SYMBOL(ccw_bus_type);
 EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id);