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

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

USB: uas: Add a new NO_REPORT_LUNS quirk 



Add a new NO_REPORT_LUNS quirk and set it for Seagate drives with
an usb-id of: 0bc2:331a, as these will fail to respond to a
REPORT_LUNS command.

Cc: stable@vger.kernel.org
Reported-and-tested-by: default avatarDavid Webb <djw@noc.ac.uk>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 198de51d

Documentation/kernel-parameters.txt

+2 −0
Original line number Diff line number Diff line
@@ -4077,6 +4077,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
					sector if the number is odd);

				i = IGNORE_DEVICE (don't bind to this

					device);

				j = NO_REPORT_LUNS (don't use report luns

					command, uas only);

				l = NOT_LOCKABLE (don't try to lock and

					unlock ejectable media);

				m = MAX_SECTORS_64 (don't transfer more

drivers/usb/storage/uas.c

+13 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 * USB Attached SCSI

 * Note that this is not the same as the USB Mass Storage driver

 *

 * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2014

 * Copyright Hans de Goede <hdegoede@redhat.com> for Red Hat, Inc. 2013 - 2016

 * Copyright Matthew Wilcox for Intel Corp, 2010

 * Copyright Sarah Sharp for Intel Corp, 2010

 *
@@ -781,6 +781,17 @@ static int uas_eh_bus_reset_handler(struct scsi_cmnd *cmnd) 
	return SUCCESS;

}



static int uas_target_alloc(struct scsi_target *starget)

{

	struct uas_dev_info *devinfo = (struct uas_dev_info *)

			dev_to_shost(starget->dev.parent)->hostdata;



	if (devinfo->flags & US_FL_NO_REPORT_LUNS)

		starget->no_report_luns = 1;



	return 0;

}



static int uas_slave_alloc(struct scsi_device *sdev)

{

	struct uas_dev_info *devinfo =
@@ -831,6 +842,7 @@ static struct scsi_host_template uas_host_template = { 
	.module = THIS_MODULE,

	.name = "uas",

	.queuecommand = uas_queuecommand,

	.target_alloc = uas_target_alloc,

	.slave_alloc = uas_slave_alloc,

	.slave_configure = uas_slave_configure,

	.eh_abort_handler = uas_eh_abort_handler,

drivers/usb/storage/unusual_uas.h

+7 −0
Original line number Diff line number Diff line
@@ -64,6 +64,13 @@ UNUSUAL_DEV(0x0bc2, 0x3312, 0x0000, 0x9999, 
		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NO_ATA_1X),



/* Reported-by: David Webb <djw@noc.ac.uk> */

UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999,

		"Seagate",

		"Expansion Desk",

		USB_SC_DEVICE, USB_PR_DEVICE, NULL,

		US_FL_NO_REPORT_LUNS),



/* Reported-by: Hans de Goede <hdegoede@redhat.com> */

UNUSUAL_DEV(0x0bc2, 0x3320, 0x0000, 0x9999,

		"Seagate",

drivers/usb/storage/usb.c

+4 −1
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags) 
			US_FL_NO_READ_DISC_INFO | US_FL_NO_READ_CAPACITY_16 |

			US_FL_INITIAL_READ10 | US_FL_WRITE_CACHE |

			US_FL_NO_ATA_1X | US_FL_NO_REPORT_OPCODES |

			US_FL_MAX_SECTORS_240);

			US_FL_MAX_SECTORS_240 | US_FL_NO_REPORT_LUNS);



	p = quirks;

	while (*p) {
@@ -532,6 +532,9 @@ void usb_stor_adjust_quirks(struct usb_device *udev, unsigned long *fflags) 
		case 'i':

			f |= US_FL_IGNORE_DEVICE;

			break;

		case 'j':

			f |= US_FL_NO_REPORT_LUNS;

			break;

		case 'l':

			f |= US_FL_NOT_LOCKABLE;

			break;

include/linux/usb_usual.h

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ 
		/* Cannot handle MI_REPORT_SUPPORTED_OPERATION_CODES */	\

	US_FLAG(MAX_SECTORS_240,	0x08000000)		\

		/* Sets max_sectors to 240 */			\

	US_FLAG(NO_REPORT_LUNS,	0x10000000)			\

		/* Cannot handle REPORT_LUNS */			\



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

enum { US_DO_ALL_FLAGS };