Commit 621ecb93 authored Jan 03, 2019 by Icenowy Zheng Committed by Greg Kroah-Hartman Jan 16, 2019

USB: storage: don't insert sane sense for SPC3+ when bad sense specified



commit c5603d2fdb424849360fe7e3f8c1befc97571b8c upstream.

Currently the code will set US_FL_SANE_SENSE flag unconditionally if
device claims SPC3+, however we should allow US_FL_BAD_SENSE flag to
prevent this behavior, because SMI SM3350 UFS-USB bridge controller,
which claims SPC4, will show strange behavior with 96-byte sense
(put the chip into a wrong state that cannot read/write anything).

Check the presence of US_FL_BAD_SENSE when assuming US_FL_SANE_SENSE on
SPC4+ devices.

Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Cc: stable <stable@vger.kernel.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 51b2a8e2

drivers/usb/storage/scsiglue.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -235,8 +235,12 @@ static int slave_configure(struct scsi_device *sdev)
		if (!(us->fflags & US_FL_NEEDS_CAP16))
		sdev->try_rc_10_first = 1;

		/* assume SPC3 or latter devices support sense size > 18 */
		if (sdev->scsi_level > SCSI_SPC_2)
		/*
		* assume SPC3 or latter devices support sense size > 18
		* unless US_FL_BAD_SENSE quirk is specified.
		*/
		if (sdev->scsi_level > SCSI_SPC_2 &&
		!(us->fflags & US_FL_BAD_SENSE))
		us->fflags \|= US_FL_SANE_SENSE;

		/*