scsi: don't store LUN bits in CDB[1] for USB mass-storage devices

The SCSI specification requires that the second Command Data Byte
should contain the LUN value in its high-order bits if the recipient
device reports SCSI level 2 or below.  Nevertheless, some USB
mass-storage devices use those bits for other purposes in
vendor-specific commands.  Currently Linux has no way to send such
commands, because the SCSI stack always overwrites the LUN bits.

Testing shows that Windows 7 and XP do not store the LUN bits in the
CDB when sending commands to a USB device.  This doesn't matter if the
device uses the Bulk-Only or UAS transports (which virtually all
modern USB mass-storage devices do), as these have a separate
mechanism for sending the LUN value.

Therefore this patch introduces a flag in the Scsi_Host structure to
inform the SCSI midlayer that a transport does not require the LUN
bits to be stored in the CDB, and it makes usb-storage set this flag
for all devices using the Bulk-Only transport.  (UAS is handled by a
separate driver, but it doesn't really matter because no SCSI-2 or
lower device is at all likely to use UAS.)

The patch also cleans up the code responsible for storing the LUN
value by adding a bitflag to the scsi_device structure.  The test for
whether to stick the LUN value in the CDB can be made when the device
is probed, and stored for future use rather than being made over and
over in the fast path.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Reported-by: Tiziano Bacocco <tiziano.bacocco@gmail.com>
Acked-by: Martin K. Petersen <martin.petersen@oracle.com>
Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 8b4105a22ac2..85e36f3a5585 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1263,7 +1263,19 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
         sdev->sdev_dev.class = &sdev_class;
         dev_set_name(&sdev->sdev_dev, "%d:%d:%d:%llu",
                      sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
+        /*
+         * Get a default scsi_level from the target (derived from sibling
+         * devices).  This is the best we can do for guessing how to set
+         * sdev->lun_in_cdb for the initial INQUIRY command.  For LUN 0 the
+         * setting doesn't matter, because all the bits are zero anyway.
+         * But it does matter for higher LUNs.
+         */
         sdev->scsi_level = starget->scsi_level;
+        if (sdev->scsi_level <= SCSI_2 &&
+                        sdev->scsi_level != SCSI_UNKNOWN &&
+                        !shost->no_scsi2_lun_in_cdb)
+                sdev->lun_in_cdb = 1;
+
         transport_setup_device(&sdev->sdev_gendev);
         spin_lock_irqsave(shost->host_lock, flags);
         list_add_tail(&sdev->same_target_siblings, &starget->devices);