This is a note to let you know that I've just added the patch titled
Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties"
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-scsi-sd-usb_storage-uas-access-media-prior-to-querying-device-properties.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 9050061d7acde071fee4c2c2c76196da873684a8 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Thu, 11 Apr 2024 09:24:48 +0200
Subject: Revert "scsi: sd: usb_storage: uas: Access media prior to querying device properties"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit b73dd5f9997279715cd450ee8ca599aaff2eabb9 which is
commit 321da3dc1f3c92a12e3c5da934090d2992a8814c upstream.
It is known to cause problems and has asked to be dropped.
Link: https://lore.kernel.org/r/yq1frvvpymp.fsf@xxxxxxxxxxxxxxxxxxxx
Cc: Tasos Sahanidis <tasos@xxxxxxxxxxxx>
Cc: Ewan D. Milne <emilne@xxxxxxxxxx>
Cc: Bart Van Assche <bvanassche@xxxxxxx>
Cc: Tasos Sahanidis <tasos@xxxxxxxxxxxx>
Cc: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Cc: James Bottomley <jejb@xxxxxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Reported-by: John David Anglin <dave.anglin@xxxxxxxx>
Reported-by: Cyril Brulebois <kibi@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/sd.c | 26 +-------------------------
drivers/usb/storage/scsiglue.c | 7 -------
drivers/usb/storage/uas.c | 7 -------
include/scsi/scsi_device.h | 1 -
4 files changed, 1 insertion(+), 40 deletions(-)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -3286,24 +3286,6 @@ static bool sd_validate_opt_xfer_size(st
return true;
}
-static void sd_read_block_zero(struct scsi_disk *sdkp)
-{
- unsigned int buf_len = sdkp->device->sector_size;
- char *buffer, cmd[10] = { };
-
- buffer = kmalloc(buf_len, GFP_KERNEL);
- if (!buffer)
- return;
-
- cmd[0] = READ_10;
- put_unaligned_be32(0, &cmd[2]); /* Logical block address 0 */
- put_unaligned_be16(1, &cmd[7]); /* Transfer 1 logical block */
-
- scsi_execute_cmd(sdkp->device, cmd, REQ_OP_DRV_IN, buffer, buf_len,
- SD_TIMEOUT, sdkp->max_retries, NULL);
- kfree(buffer);
-}
-
/**
* sd_revalidate_disk - called the first time a new disk is seen,
* performs disk spin up, read_capacity, etc.
@@ -3343,13 +3325,7 @@ static int sd_revalidate_disk(struct gen
*/
if (sdkp->media_present) {
sd_read_capacity(sdkp, buffer);
- /*
- * Some USB/UAS devices return generic values for mode pages
- * until the media has been accessed. Trigger a READ operation
- * to force the device to populate mode pages.
- */
- if (sdp->read_before_ms)
- sd_read_block_zero(sdkp);
+
/*
* set the default to rotational. All non-rotational devices
* support the block characteristics VPD page, which will
--- a/drivers/usb/storage/scsiglue.c
+++ b/drivers/usb/storage/scsiglue.c
@@ -180,13 +180,6 @@ static int slave_configure(struct scsi_d
sdev->use_192_bytes_for_3f = 1;
/*
- * Some devices report generic values until the media has been
- * accessed. Force a READ(10) prior to querying device
- * characteristics.
- */
- sdev->read_before_ms = 1;
-
- /*
* Some devices don't like MODE SENSE with page=0x3f,
* which is the command used for checking if a device
* is write-protected. Now that we tell the sd driver
--- a/drivers/usb/storage/uas.c
+++ b/drivers/usb/storage/uas.c
@@ -877,13 +877,6 @@ static int uas_slave_configure(struct sc
sdev->guess_capacity = 1;
/*
- * Some devices report generic values until the media has been
- * accessed. Force a READ(10) prior to querying device
- * characteristics.
- */
- sdev->read_before_ms = 1;
-
- /*
* Some devices don't like MODE SENSE with page=0x3f,
* which is the command used for checking if a device
* is write-protected. Now that we tell the sd driver
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -204,7 +204,6 @@ struct scsi_device {
unsigned use_10_for_rw:1; /* first try 10-byte read / write */
unsigned use_10_for_ms:1; /* first try 10-byte mode sense/select */
unsigned set_dbd_for_ms:1; /* Set "DBD" field in mode sense */
- unsigned read_before_ms:1; /* perform a READ before MODE SENSE */
unsigned no_report_opcodes:1; /* no REPORT SUPPORTED OPERATION CODES */
unsigned no_write_same:1; /* no WRITE SAME command */
unsigned use_16_for_rw:1; /* Use read/write(16) over read/write(10) */
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-6.1/revert-scsi-sd-usb_storage-uas-access-media-prior-to-querying-device-properties.patch
queue-6.1/scsi-sd-usb_storage-uas-access-media-prior-to-querying-device-properties.patch
queue-6.1/revert-scsi-core-add-struct-for-args-to-execution-functions.patch
queue-6.1/usb-typec-tcpci-add-generic-tcpci-fallback-compatibl.patch
queue-6.1/usb-sl811-hcd-only-defined-function-checkdone-if-qui.patch
queue-6.1/usb-gadget-uvc-mark-incomplete-frames-with-uvc_strea.patch
queue-6.1/gcc-plugins-stackleak-avoid-.head.text-section.patch
queue-6.1/tty-n_gsm-require-cap_net_admin-to-attach-n_gsm0710-ldisc.patch
