[S390] cio: split PGID settings and status

Split setting (driver wants feature enabled) and status (feature
setup was successful) for PGID related ccw device features so that
setup errors can be detected. Previously, incorrectly handled setup
errors could in rare cases lead to erratic I/O behavior and
permanently unusuable devices.

Signed-off-by: Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index aaccc8ecfa8f..58ffbd1d04a1 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2208,13 +2208,6 @@ int dasd_generic_probe(struct ccw_device *cdev,
 {
         int ret;
 
-        ret = ccw_device_set_options(cdev, CCWDEV_DO_PATHGROUP);
-        if (ret) {
-                DBF_EVENT(DBF_WARNING,
-                       "dasd_generic_probe: could not set ccw-device options "
-                       "for %s\n", dev_name(&cdev->dev));
-                return ret;
-        }
         ret = dasd_add_sysfs_files(cdev);
         if (ret) {
                 DBF_EVENT(DBF_WARNING,
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 417b97cd3f94..a8ec0731609e 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -86,7 +86,8 @@ dasd_eckd_probe (struct ccw_device *cdev)
         int ret;
 
         /* set ECKD specific ccw-device options */
-        ret = ccw_device_set_options(cdev, CCWDEV_ALLOW_FORCE);
+        ret = ccw_device_set_options(cdev, CCWDEV_ALLOW_FORCE |
+                                     CCWDEV_DO_PATHGROUP | CCWDEV_DO_MULTIPATH);
         if (ret) {
                 DBF_EVENT(DBF_WARNING,
                        "dasd_eckd_probe: could not set ccw-device options "
@@ -1090,6 +1091,15 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
         struct dasd_block *block;
         int is_known, rc;
 
+        if (!ccw_device_is_pathgroup(device->cdev)) {
+                dev_warn(&device->cdev->dev,
+                         "A channel path group could not be established\n");
+                return -EIO;
+        }
+        if (!ccw_device_is_multipath(device->cdev)) {
+                dev_info(&device->cdev->dev,
+                         "The DASD is not operating in multipath mode\n");
+        }
         private = (struct dasd_eckd_private *) device->private;
         if (!private) {
                 private = kzalloc(sizeof(*private), GFP_KERNEL | GFP_DMA);