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

Commit 00914025 authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

usb-storage: add new no_read_capacity_16 quirk 



Some Rockbox based mp4 players will crash when ever they see a
read_capacity_16 scsi command.  So add a new US_FL which tells the scsi sd
driver to not issue any read_capacity_16 scsi commands.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Matthew Dharm <mdharm-usb@one-eyed-alien.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5ce524bd

drivers/usb/storage/scsiglue.c

+4 −0
Original line number Diff line number Diff line
@@ -209,6 +209,10 @@ static int slave_configure(struct scsi_device *sdev) 
		if (us->fflags & US_FL_CAPACITY_HEURISTICS)

			sdev->guess_capacity = 1;



		/* Some devices cannot handle READ_CAPACITY_16 */

		if (us->fflags & US_FL_NO_READ_CAPACITY_16)

			sdev->no_read_capacity_16 = 1;



		/* assume SPC3 or latter devices support sense size > 18 */

		if (sdev->scsi_level > SCSI_SPC_2)

			us->fflags |= US_FL_SANE_SENSE;

drivers/usb/storage/unusual_devs.h

+2 −1
Original line number Diff line number Diff line
@@ -877,7 +877,8 @@ UNUSUAL_DEV( 0x071b, 0x3203, 0x0000, 0x0000, 
		"RockChip",

		"MP3",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64),

		US_FL_NO_WP_DETECT | US_FL_MAX_SECTORS_64 |

		US_FL_NO_READ_CAPACITY_16),



/* Reported by Jean-Baptiste Onofre <jb@nanthrax.net>

 * Support the following product :

include/linux/usb_usual.h

+3 −1
Original line number Diff line number Diff line
@@ -60,7 +60,9 @@ 
	US_FLAG(BAD_SENSE,	0x00020000)			\

		/* Bad Sense (never more than 18 bytes) */	\

	US_FLAG(NO_READ_DISC_INFO,	0x00040000)		\

		/* cannot handle READ_DISC_INFO */

		/* cannot handle READ_DISC_INFO */		\

	US_FLAG(NO_READ_CAPACITY_16,	0x00080000)		\

		/* cannot handle READ_CAPACITY_16 */



#define US_FLAG(name, value)	US_FL_##name = value ,

enum { US_DO_ALL_FLAGS };