Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21c13a4f authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

usb-storage: redo incorrect reads 



Some USB mass-storage devices have bugs that cause them not to handle
the first READ(10) command they receive correctly.  The Corsair
Padlock v2 returns completely bogus data for its first read (possibly
it returns the data in encrypted form even though the device is
supposed to be unlocked).  The Feiya SD/SDHC card reader fails to
complete the first READ(10) command after it is plugged in or after a
new card is inserted, returning a status code that indicates it thinks
the command was invalid, which prevents the kernel from retrying the
read.

Since the first read of a new device or a new medium is for the
partition sector, the kernel is unable to retrieve the device's
partition table.  Users have to manually issue an "hdparm -z" or
"blockdev --rereadpt" command before they can access the device.

This patch (as1470) works around the problem.  It adds a new quirk
flag, US_FL_INVALID_READ10, indicating that the first READ(10) should
always be retried immediately, as should any failing READ(10) commands
(provided the preceding READ(10) command succeeded, to avoid getting
stuck in a loop).  The patch also adds appropriate unusual_devs
entries containing the new flag.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarSven Geggus <sven-usbst@geggus.net>
Tested-by: default avatarPaul Hartman <paul.hartman+linux@gmail.com>
CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
CC: <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3af51ac9

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -2598,6 +2598,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

					than 64 sectors = 32 KB at a time);

				n = INITIAL_READ10 (force a retry of the

					initial READ(10) command);

				o = CAPACITY_OK (accept the capacity

					reported by the device);

				r = IGNORE_RESIDUE (the device reports

drivers/usb/storage/transport.c

+29 −0
Original line number Diff line number Diff line
@@ -819,6 +819,35 @@ Retry_Sense: 
		}

	}



	/*

	 * Some devices don't work or return incorrect data the first

	 * time they get a READ(10) command, or for the first READ(10)

	 * after a media change.  If the INITIAL_READ10 flag is set,

	 * keep track of whether READ(10) commands succeed.  If the

	 * previous one succeeded and this one failed, set the REDO_READ10

	 * flag to force a retry.

	 */

	if (unlikely((us->fflags & US_FL_INITIAL_READ10) &&

			srb->cmnd[0] == READ_10)) {

		if (srb->result == SAM_STAT_GOOD) {

			set_bit(US_FLIDX_READ10_WORKED, &us->dflags);

		} else if (test_bit(US_FLIDX_READ10_WORKED, &us->dflags)) {

			clear_bit(US_FLIDX_READ10_WORKED, &us->dflags);

			set_bit(US_FLIDX_REDO_READ10, &us->dflags);

		}



		/*

		 * Next, if the REDO_READ10 flag is set, return a result

		 * code that will cause the SCSI core to retry the READ(10)

		 * command immediately.

		 */

		if (test_bit(US_FLIDX_REDO_READ10, &us->dflags)) {

			clear_bit(US_FLIDX_REDO_READ10, &us->dflags);

			srb->result = DID_IMM_RETRY << 16;

			srb->sense_buffer[0] = 0;

		}

	}



	/* Did we transfer less than the minimum amount required? */

	if ((srb->result == SAM_STAT_GOOD || srb->sense_buffer[2] == 0) &&

			scsi_bufflen(srb) - scsi_get_resid(srb) < srb->underflow)

drivers/usb/storage/unusual_devs.h

+19 −0
Original line number Diff line number Diff line
@@ -1114,6 +1114,16 @@ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_FIX_CAPACITY ),



/* Reported by Paul Hartman <paul.hartman+linux@gmail.com>

 * This card reader returns "Illegal Request, Logical Block Address

 * Out of Range" for the first READ(10) after a new card is inserted.

 */

UNUSUAL_DEV(  0x090c, 0x6000, 0x0100, 0x0100,

		"Feiya",

		"SD/SDHC Card Reader",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_INITIAL_READ10 ),



/* This Pentax still camera is not conformant

 * to the USB storage specification: -

 * - It does not like the INQUIRY command. So we must handle this command
@@ -1888,6 +1898,15 @@ UNUSUAL_DEV( 0x1908, 0x3335, 0x0200, 0x0200, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NO_READ_DISC_INFO ),



/* Reported by Sven Geggus <sven-usbst@geggus.net>

 * This encrypted pen drive returns bogus data for the initial READ(10).

 */

UNUSUAL_DEV(  0x1b1c, 0x1ab5, 0x0200, 0x0200,

		"Corsair",

		"Padlock v2",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_INITIAL_READ10 ),



/* Patch by Richard Schtz <r.schtz@t-online.de>

 * This external hard drive enclosure uses a JMicron chip which

 * needs the US_FL_IGNORE_RESIDUE flag to work properly. */

drivers/usb/storage/usb.c

+12 −1
Original line number Diff line number Diff line
@@ -440,7 +440,8 @@ static void adjust_quirks(struct us_data *us) 
			US_FL_NOT_LOCKABLE | US_FL_MAX_SECTORS_64 |

			US_FL_CAPACITY_OK | US_FL_IGNORE_RESIDUE |

			US_FL_SINGLE_LUN | US_FL_NO_WP_DETECT |

			US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16);

			US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16 |

			US_FL_INITIAL_READ10);



	p = quirks;

	while (*p) {
@@ -490,6 +491,9 @@ static void adjust_quirks(struct us_data *us) 
		case 'm':

			f |= US_FL_MAX_SECTORS_64;

			break;

		case 'n':

			f |= US_FL_INITIAL_READ10;

			break;

		case 'o':

			f |= US_FL_CAPACITY_OK;

			break;
@@ -953,6 +957,13 @@ int usb_stor_probe2(struct us_data *us) 
	if (result)

		goto BadDevice;



	/*

	 * If the device returns invalid data for the first READ(10)

	 * command, indicate the command should be retried.

	 */

	if (us->fflags & US_FL_INITIAL_READ10)

		set_bit(US_FLIDX_REDO_READ10, &us->dflags);



	/* Acquire all the other resources and add the host */

	result = usb_stor_acquire_resources(us);

	if (result)

drivers/usb/storage/usb.h

+2 −0
Original line number Diff line number Diff line
@@ -73,6 +73,8 @@ struct us_unusual_dev { 
#define US_FLIDX_RESETTING	4	/* device reset in progress */

#define US_FLIDX_TIMED_OUT	5	/* SCSI midlayer timed out  */

#define US_FLIDX_DONT_SCAN	6	/* don't scan (disconnect)  */

#define US_FLIDX_REDO_READ10	7	/* redo READ(10) command    */

#define US_FLIDX_READ10_WORKED	8	/* previous READ(10) succeeded */



#define USB_STOR_STRING_LEN 32