This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / s390 / cio / device.c

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 7b6f85b..bf652fa 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/device.c
  *  bus driver for ccw devices
- *   $Revision: 1.129 $
+ *   $Revision: 1.124 $
  *
  *    Copyright (C) 2002 IBM Deutschland Entwicklung GmbH,
  *                      IBM Corporation
@@ -68,6 +68,9 @@ ccw_hotplug (struct device *dev, char **envp, int num_envp,
        if (!cdev)
                return -ENODEV;
 
+       if (cdev->private->state == DEV_STATE_NOT_OPER)
+               return -ENODEV;
+
        /* what we want to pass to /sbin/hotplug */
 
        envp[i++] = buffer;
@@ -498,11 +501,9 @@ ccw_device_register(struct ccw_device *cdev)
        if ((ret = device_add(dev)))
                return ret;
 
-       set_bit(1, &cdev->private->registered);
-       if ((ret = device_add_files(dev))) {
-               if (test_and_clear_bit(1, &cdev->private->registered))
-                       device_del(dev);
-       }
+       if ((ret = device_add_files(dev)))
+               device_del(dev);
+
        return ret;
 }
 
@@ -525,7 +526,8 @@ get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
                cdev = to_ccwdev(dev);
                if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
                    (cdev->private->devno == devno) &&
-                   (cdev != sibling)) {
+                   (!strncmp(cdev->dev.bus_id, sibling->dev.bus_id,
+                             BUS_ID_SIZE))) {
                        cdev->private->state = DEV_STATE_NOT_OPER;
                        break;
                }
@@ -538,24 +540,6 @@ get_disc_ccwdev_by_devno(unsigned int devno, struct ccw_device *sibling)
        return cdev;
 }
 
-static void
-ccw_device_add_changed(void *data)
-{
-
-       struct ccw_device *cdev;
-
-       cdev = (struct ccw_device *)data;
-       if (device_add(&cdev->dev)) {
-               put_device(&cdev->dev);
-               return;
-       }
-       set_bit(1, &cdev->private->registered);
-       if (device_add_files(&cdev->dev)) {
-               if (test_and_clear_bit(1, &cdev->private->registered))
-                       device_unregister(&cdev->dev);
-       }
-}
-
 extern int css_get_ssd_info(struct subchannel *sch);
 
 void
@@ -605,14 +589,16 @@ ccw_device_do_unreg_rereg(void *data)
        } else
                need_rename = 0;
        device_remove_files(&cdev->dev);
-       if (test_and_clear_bit(1, &cdev->private->registered))
-               device_del(&cdev->dev);
+       device_del(&cdev->dev);
        if (need_rename)
                snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.0.%04x",
                          sch->schib.pmcw.dev);
-       PREPARE_WORK(&cdev->private->kick_work,
-                    ccw_device_add_changed, (void *)cdev);
-       queue_work(ccw_device_work, &cdev->private->kick_work);
+       if (device_add(&cdev->dev)) {
+               put_device(&cdev->dev);
+               return;
+       }
+       if (device_add_files(&cdev->dev))
+               device_unregister(&cdev->dev);
 }
 
 static void
@@ -634,7 +620,6 @@ io_subchannel_register(void *data)
        struct ccw_device *cdev;
        struct subchannel *sch;
        int ret;
-       unsigned long flags;
 
        cdev = (struct ccw_device *) data;
        sch = to_subchannel(cdev->dev.parent);
@@ -649,14 +634,10 @@ io_subchannel_register(void *data)
                printk (KERN_WARNING "%s: could not register %s\n",
                        __func__, cdev->dev.bus_id);
                put_device(&cdev->dev);
-               spin_lock_irqsave(&sch->lock, flags);
-               sch->dev.driver_data = NULL;
-               spin_unlock_irqrestore(&sch->lock, flags);
+               sch->dev.driver_data = 0;
                kfree (cdev->private);
                kfree (cdev);
                put_device(&sch->dev);
-               if (atomic_dec_and_test(&ccw_device_init_count))
-                       wake_up(&ccw_device_init_wq);
                return;
        }
 
@@ -669,8 +650,6 @@ out:
        cdev->private->flags.recog_done = 1;
        put_device(&sch->dev);
        wake_up(&cdev->private->wait_q);
-       if (atomic_dec_and_test(&ccw_device_init_count))
-               wake_up(&ccw_device_init_wq);
 }
 
 void
@@ -707,11 +686,9 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                if (!get_device(&cdev->dev))
                        break;
                sch = to_subchannel(cdev->dev.parent);
-               PREPARE_WORK(&cdev->private->kick_work,
-                            ccw_device_call_sch_unregister, (void *) cdev);
+               INIT_WORK(&cdev->private->kick_work,
+                         ccw_device_call_sch_unregister, (void *) cdev);
                queue_work(slow_path_wq, &cdev->private->kick_work);
-               if (atomic_dec_and_test(&ccw_device_init_count))
-                       wake_up(&ccw_device_init_wq);
                break;
        case DEV_STATE_BOXED:
                /* Device did not respond in time. */
@@ -722,11 +699,13 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                 */
                if (!get_device(&cdev->dev))
                        break;
-               PREPARE_WORK(&cdev->private->kick_work,
-                            io_subchannel_register, (void *) cdev);
-               queue_work(slow_path_wq, &cdev->private->kick_work);
+               INIT_WORK(&cdev->private->kick_work,
+                         io_subchannel_register, (void *) cdev);
+               queue_work(ccw_device_work, &cdev->private->kick_work);
                break;
        }
+       if (atomic_dec_and_test(&ccw_device_init_count))
+               wake_up(&ccw_device_init_wq);
 }
 
 static int
@@ -771,7 +750,6 @@ io_subchannel_probe (struct device *pdev)
        struct subchannel *sch;
        struct ccw_device *cdev;
        int rc;
-       unsigned long flags;
 
        sch = to_subchannel(pdev);
        if (sch->dev.driver_data) {
@@ -812,7 +790,6 @@ io_subchannel_probe (struct device *pdev)
                .parent = pdev,
                .release = ccw_device_release,
        };
-       INIT_LIST_HEAD(&cdev->private->kick_work.entry);
        /* Do first half of device_register. */
        device_initialize(&cdev->dev);
 
@@ -824,9 +801,7 @@ io_subchannel_probe (struct device *pdev)
 
        rc = io_subchannel_recog(cdev, to_subchannel(pdev));
        if (rc) {
-               spin_lock_irqsave(&sch->lock, flags);
-               sch->dev.driver_data = NULL;
-               spin_unlock_irqrestore(&sch->lock, flags);
+               sch->dev.driver_data = 0;
                if (cdev->dev.release)
                        cdev->dev.release(&cdev->dev);
        }
@@ -834,40 +809,24 @@ io_subchannel_probe (struct device *pdev)
        return rc;
 }
 
-static void
-ccw_device_unregister(void *data)
-{
-       struct ccw_device *cdev;
-
-       cdev = (struct ccw_device *)data;
-       if (test_and_clear_bit(1, &cdev->private->registered))
-               device_unregister(&cdev->dev);
-       put_device(&cdev->dev);
-}
-
 static int
 io_subchannel_remove (struct device *dev)
 {
        struct ccw_device *cdev;
-       unsigned long flags;
 
        if (!dev->driver_data)
                return 0;
        cdev = dev->driver_data;
        /* Set ccw device to not operational and drop reference. */
-       spin_lock_irqsave(cdev->ccwlock, flags);
-       dev->driver_data = NULL;
        cdev->private->state = DEV_STATE_NOT_OPER;
-       spin_unlock_irqrestore(cdev->ccwlock, flags);
        /*
-        * Put unregistration on workqueue to avoid livelocks on the css bus
-        * semaphore.
+        * Careful here. Our ccw device might be yet unregistered when
+        * de-registering its subchannel (machine check during device
+        * recognition). Better look if the subchannel has children.
         */
-       if (get_device(&cdev->dev)) {
-               PREPARE_WORK(&cdev->private->kick_work,
-                            ccw_device_unregister, (void *) cdev);
-               queue_work(ccw_device_work, &cdev->private->kick_work);
-       }
+       if (!list_empty(&dev->children))
+               device_unregister(&cdev->dev);
+       dev->driver_data = NULL;
        return 0;
 }