From: Hannes Reinecke <hare@suse.de>
Date: Mon, 26 May 2014 08:57:01 +0200
Subject: scsi_scan: Send TEST UNIT READY to LUN0 before LUN scanning
References: bnc#843236, bnc#893377
Patch-Mainline: n/a, rejected upstream
REPORT_LUN_SCAN does not report any outstanding unit attention
condition (SAM-3). However, the target might not be fully
initialized at that time, so we might end up getting a
default entry (or even a partially filled one).
But as we're not able to process the REPORT LUN DATA HAS CHANGED
unit attention correctly we'll be missing out some LUNs during
startup.
This has been seen on Fujitsu Eternus DXL, but unfortunately it interferes
with other targets (most notably NetApp ONTAP), which rely on the current
behaviour.
So add a new blacklist flag 'BLIST_TESTLUN' to handle this array.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/scsi_devinfo.c | 5 +++
drivers/scsi/scsi_scan.c | 92 ++++++++++++++++++++++++++++++++++++++-------
include/scsi/scsi_devinfo.h | 4 ++
3 files changed, 87 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c
index cc4f110..9cc859b 100644
--- a/drivers/scsi/scsi_devinfo.c
+++ b/drivers/scsi/scsi_devinfo.c
@@ -94,7 +94,9 @@ static struct {
{"SONY", "CD-ROM CDU-55S", "1.0i", BLIST_NOLUN},
{"SONY", "CD-ROM CDU-561", "1.7x", BLIST_NOLUN},
{"SONY", "CD-ROM CDU-8012", NULL, BLIST_NOLUN},
+#ifdef BLIST_SELECT_NO_ATN
{"SONY", "SDT-5000", "3.17", BLIST_SELECT_NO_ATN},
+#endif
{"TANDBERG", "TDC 3600", "U07", BLIST_NOLUN}, /* locks up */
{"TEAC", "CD-R55S", "1.0H", BLIST_NOLUN}, /* locks up */
/*
@@ -166,6 +168,7 @@ static struct {
{"easyRAID", "X6P", NULL, BLIST_NOREPORTLUN},
{"easyRAID", "F8", NULL, BLIST_NOREPORTLUN},
{"FSC", "CentricStor", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
+ {"FUJITSU", "ETERNUS_DXL", "*", BLIST_TESTLUN},
{"Generic", "USB SD Reader", "1.00", BLIST_FORCELUN | BLIST_INQUIRY_36},
{"Generic", "USB Storage-SMC", "0180", BLIST_FORCELUN | BLIST_INQUIRY_36},
{"Generic", "USB Storage-SMC", "0207", BLIST_FORCELUN | BLIST_INQUIRY_36},
@@ -254,9 +257,11 @@ static struct {
{"TOSHIBA", "CD-ROM", NULL, BLIST_ISROM},
{"Traxdata", "CDR4120", NULL, BLIST_NOLUN}, /* locks up */
{"USB2.0", "SMARTMEDIA/XD", NULL, BLIST_FORCELUN | BLIST_INQUIRY_36},
+#ifdef BLIST_SELECT_NO_ATN
{"WangDAT", "Model 2600", "01.7", BLIST_SELECT_NO_ATN},
{"WangDAT", "Model 3200", "02.2", BLIST_SELECT_NO_ATN},
{"WangDAT", "Model 1300", "02.4", BLIST_SELECT_NO_ATN},
+#endif
{"WDC WD25", "00JB-00FUA0", NULL, BLIST_NOREPORTLUN},
{"XYRATEX", "RS", "*", BLIST_SPARSELUN | BLIST_LARGELUN},
{"Zzyzx", "RocketStor 500S", NULL, BLIST_SPARSELUN},
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index b56948a..e16b96d 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -108,6 +108,13 @@ MODULE_PARM_DESC(inq_timeout,
"Timeout (in seconds) waiting for devices to answer INQUIRY."
" Default is 20. Some devices may need more; most need less.");
+static unsigned int scsi_scan_timeout = SCSI_TIMEOUT/HZ + 58;
+
+module_param_named(scan_timeout, scsi_scan_timeout, uint, S_IRUGO|S_IWUSR);
+MODULE_PARM_DESC(scan_timeout,
+ "Timeout (in seconds) waiting for devices to become ready"
+ " after INQUIRY. Default is 60.");
+
/* This lock protects only this list */
static DEFINE_SPINLOCK(async_scan_lock);
static LIST_HEAD(scanning_hosts);
@@ -714,19 +721,6 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
}
/*
- * Related to the above issue:
- *
- * XXX Devices (disk or all?) should be sent a TEST UNIT READY,
- * and if not ready, sent a START_STOP to start (maybe spin up) and
- * then send the INQUIRY again, since the INQUIRY can change after
- * a device is initialized.
- *
- * Ideally, start a device if explicitly asked to do so. This
- * assumes that a device is spun up on power on, spun down on
- * request, and then spun up on request.
- */
-
- /*
* The scanning code needs to know the scsi_level, even if no
* device is attached at LUN 0 (SCSI_SCAN_TARGET_PRESENT) so
* non-zero LUNs can be scanned.
@@ -751,6 +745,66 @@ static int scsi_probe_lun(struct scsi_device *sdev, unsigned char *inq_result,
}
/**
+ * scsi_test_lun - waiting for a LUN to become ready
+ * @sdev: scsi_device to test
+ *
+ * Description:
+ * Wait for the lun associated with @sdev to become ready
+ *
+ * Send a TEST UNIT READY to detect any unit attention conditions.
+ * Retry TEST UNIT READY for up to @scsi_scan_timeout if the
+ * returned sense key is 02/04/01 (Not ready, Logical Unit is
+ * in process of becoming ready)
+ **/
+static int
+scsi_test_lun(struct scsi_device *sdev)
+{
+ struct scsi_sense_hdr sshdr;
+ int res = SCSI_SCAN_TARGET_PRESENT;
+ int tur_result;
+ unsigned long tur_timeout = jiffies + scsi_scan_timeout * HZ;
+
+ /* Skip for older devices */
+ if (sdev->scsi_level <= SCSI_3)
+ return SCSI_SCAN_LUN_PRESENT;
+
+ /*
+ * Wait for the device to become ready.
+ *
+ * Some targets take some time before the firmware is
+ * fully initialized, during which time they might not
+ * be able to fill out any REPORT_LUN command correctly.
+ * And as we're not capable of handling the
+ * INQUIRY DATA CHANGED unit attention correctly we'd
+ * rather wait here.
+ */
+ do {
+ tur_result = scsi_test_unit_ready(sdev, SCSI_TIMEOUT,
+ 3, &sshdr);
+ if (!tur_result) {
+ res = SCSI_SCAN_LUN_PRESENT;
+ break;
+ }
+ if ((driver_byte(tur_result) & DRIVER_SENSE) &&
+ scsi_sense_valid(&sshdr)) {
+ SCSI_LOG_SCAN_BUS(3, sdev_printk(KERN_INFO, sdev,
+ "scsi_scan: tur returned %02x/%02x/%02x\n",
+ sshdr.sense_key, sshdr.asc, sshdr.ascq));
+ if (sshdr.sense_key == NOT_READY &&
+ sshdr.asc == 0x04 && sshdr.ascq == 0x01) {
+ /* Logical Unit is in process
+ * of becoming ready */
+ msleep(100);
+ continue;
+ }
+ }
+ res = SCSI_SCAN_LUN_PRESENT;
+ } while (time_before_eq(jiffies, tur_timeout) &&
+ (res == SCSI_SCAN_TARGET_PRESENT));
+ return res;
+}
+
+/**
* scsi_add_lun - allocate and fully initialze a scsi_device
* @sdev: holds information to be stored in the new scsi_device
* @inq_result: holds the result of a previous INQUIRY to the LUN
@@ -891,13 +945,14 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
if (*bflags & BLIST_NO_ULD_ATTACH)
sdev->no_uld_attach = 1;
+#ifdef BLIST_SELECT_NO_ATN
/*
* Apparently some really broken devices (contrary to the SCSI
* standards) need to be selected without asserting ATN
*/
if (*bflags & BLIST_SELECT_NO_ATN)
sdev->select_no_atn = 1;
-
+#endif
/*
* Maximum 512 sector transfer length
* broken RA4x00 Compaq Disk Array
@@ -1163,6 +1218,15 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
goto out_free_result;
}
+ if (bflags & BLIST_TESTLUN) {
+ res = scsi_test_lun(sdev);
+ if (res == SCSI_SCAN_TARGET_PRESENT) {
+ SCSI_LOG_SCAN_BUS(1, sdev_printk(KERN_INFO, sdev,
+ "scsi scan: device not ready\n"));
+ goto out_free_result;
+ }
+ }
+
res = scsi_add_lun(sdev, result, &bflags, shost->async_scan);
if (res == SCSI_SCAN_LUN_PRESENT) {
if (bflags & BLIST_KEY) {
diff --git a/include/scsi/scsi_devinfo.h b/include/scsi/scsi_devinfo.h
index 9f750cb..6c57591 100644
--- a/include/scsi/scsi_devinfo.h
+++ b/include/scsi/scsi_devinfo.h
@@ -26,7 +26,11 @@
#define BLIST_NOREPORTLUN 0x40000 /* don't try REPORT_LUNS scan (SCSI-3 devs) */
#define BLIST_NOT_LOCKABLE 0x80000 /* don't use PREVENT-ALLOW commands */
#define BLIST_NO_ULD_ATTACH 0x100000 /* device is actually for RAID config */
+#ifdef COMPAT_BLIST_FLAGS
#define BLIST_SELECT_NO_ATN 0x200000 /* select without ATN */
+#else
+#define BLIST_TESTLUN 0x200000 /* Sent TEST UNIT READY before scanning */
+#endif
#define BLIST_RETRY_HWERROR 0x400000 /* retry HARDWARE_ERROR */
#define BLIST_MAX_512 0x800000 /* maximum 512 sector cdb length */
#define BLIST_ATTACH_PQ3 0x1000000 /* Scan: Attach to PQ3 devices */
--
1.8.5.6