Revert "uas: bump hw_max_sectors to 2048 blocks for SS or faster drives"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Dec 2020 14:59:27 +0000 (15:59 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 4 Dec 2020 14:59:27 +0000 (15:59 +0100)
This reverts commit 5df7ef7d32fec1d6d1c34dbec019b461a12ce870 as Hans
reports it causes problems on some systems.  Until a "real" fix for this
can be found, revert this change to get normal functionality back.

Link: https://lore.kernel.org/r/70ca74c2-4a80-e25b-eca9-a63a75516673@redhat.com
Cc: Tom Yan <tom.ty89@gmail.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Tested-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/storage/uas.c

index c8a5773..9369c6d 100644 (file)
@@ -849,8 +849,6 @@ static int uas_slave_configure(struct scsi_device *sdev)
                blk_queue_max_hw_sectors(sdev->request_queue, 64);
        else if (devinfo->flags & US_FL_MAX_SECTORS_240)
                blk_queue_max_hw_sectors(sdev->request_queue, 240);
-       else if (devinfo->udev->speed >= USB_SPEED_SUPER)
-               blk_queue_max_hw_sectors(sdev->request_queue, 2048);
 
        blk_queue_max_hw_sectors(sdev->request_queue,
                min_t(size_t, queue_max_hw_sectors(sdev->request_queue),