Skip to content

Commit

Permalink
[S390] dasd: tolerate devices that have no feature codes
Browse files Browse the repository at this point in the history
The DASD device driver reads the feature codes of a device during
device initialization. These codes are later used to determine the
availability of advanced features like PAV or High Performance FICON.
Some very old devices do not support the command to read feature
codes and the initialization routine fails.
As the feature codes are not necessary for basic DASD operations, we
can support such devices by just ignoring missing feature codes.

Signed-off-by: Stefan Weinhuber <wein@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Stefan Weinhuber authored and Martin Schwidefsky committed Sep 22, 2009
1 parent 5314af6 commit 68d1e5f
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions drivers/s390/block/dasd_eckd.c
Original file line number Diff line number Diff line change
Expand Up @@ -935,6 +935,7 @@ static int dasd_eckd_read_features(struct dasd_device *device)
struct dasd_eckd_private *private;

private = (struct dasd_eckd_private *) device->private;
memset(&private->features, 0, sizeof(struct dasd_rssd_features));
cqr = dasd_smalloc_request(DASD_ECKD_MAGIC, 1 /* PSF */ + 1 /* RSSD */,
(sizeof(struct dasd_psf_prssd_data) +
sizeof(struct dasd_rssd_features)),
Expand Down Expand Up @@ -982,7 +983,9 @@ static int dasd_eckd_read_features(struct dasd_device *device)
features = (struct dasd_rssd_features *) (prssdp + 1);
memcpy(&private->features, features,
sizeof(struct dasd_rssd_features));
}
} else
dev_warn(&device->cdev->dev, "Reading device feature codes"
" failed with rc=%d\n", rc);
dasd_sfree_request(cqr, cqr->memdev);
return rc;
}
Expand Down Expand Up @@ -1144,9 +1147,7 @@ dasd_eckd_check_characteristics(struct dasd_device *device)
}

/* Read Feature Codes */
rc = dasd_eckd_read_features(device);
if (rc)
goto out_err3;
dasd_eckd_read_features(device);

/* Read Device Characteristics */
rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
Expand Down Expand Up @@ -3241,9 +3242,7 @@ int dasd_eckd_restore_device(struct dasd_device *device)
}

/* Read Feature Codes */
rc = dasd_eckd_read_features(device);
if (rc)
goto out_err;
dasd_eckd_read_features(device);

/* Read Device Characteristics */
memset(&private->rdc_data, 0, sizeof(private->rdc_data));
Expand Down

0 comments on commit 68d1e5f

Please sign in to comment.