2021-07-04 07:55:53

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH v6 0/3] fix runtime PM for SD card readers

hi,

(According to Alan Stern, "as far as I know, all") SD card readers send
MEDIA_CHANGED unit attention notification on (runtime) resume. We cannot
use runtime PM with these devices as I/O always fails in that case.

This fixes runtime PM for SD cardreaders. I'd appreciate any feedback.

To enable runtime PM for an SD cardreader number 0:0:0:0, do:

echo 0 > /sys/module/block/parameters/events_dfl_poll_msecs
echo 1000 > /sys/bus/scsi/devices/0:0:0:0/power/autosuspend_delay_ms
echo auto > /sys/bus/scsi/devices/0:0:0:0/power/control

thank you,
martin

revision history
----------------
v6: (thank you Bart and Christoph)
* fix scsi command timeout for sense request
* add reviewed-by tag

v5: (thank you Bart)
* simplify the sense request itself and remove unnecessary code
https://lore.kernel.org/linux-scsi/[email protected]/T/#t

v4: (thank you Bart and Alan)
* send SENSE REQUEST in sd instead of adding a global scsi error flag.
https://lore.kernel.org/linux-scsi/[email protected]/T/#t

v3: (thank you Bart)
* create a new BLIST entry to mark affected devices instead of the
sysfs module parameter for sd only. still, only sd implements handling
the flag for now.
* cc linux-pm list
https://lore.kernel.org/linux-scsi/[email protected]/

v2:
https://lore.kernel.org/linux-scsi/[email protected]/
* move module parameter to sd
* add Documentation
v1:
https://lore.kernel.org/linux-scsi/[email protected]/T/

For the full background, the discussion started in June 2020 here:
https://lore.kernel.org/linux-scsi/[email protected]/



Martin Kepplinger (3):
scsi: devinfo: add new flag BLIST_MEDIA_CHANGE
scsi: sd: send REQUEST SENSE for BLIST_MEDIA_CHANGE devices in
runtime_resume()
scsi: devinfo: add BLIST_MEDIA_CHANGE for Ultra HS-SD/MMC usb
cardreaders

drivers/scsi/scsi_devinfo.c | 1 +
drivers/scsi/sd.c | 23 ++++++++++++++++++++++-
include/scsi/scsi_devinfo.h | 6 +++---
3 files changed, 26 insertions(+), 4 deletions(-)

--
2.30.2


2021-07-04 07:56:28

by Martin Kepplinger

[permalink] [raw]
Subject: [PATCH v6 2/3] scsi: sd: send REQUEST SENSE for BLIST_MEDIA_CHANGE devices in runtime_resume()

For SD cardreader devices that have the BLIST_MEDIA_CHANGE flag set,
a MEDIA CHANGE unit attention is received after resuming from runtime
suspend. Send a REQUEST SENSE to avoid that.

The "downside" is that for these devices we now rely on users not to
really change the medium (SD card) *during* a runtime suspend/resume
cycle, i.e. when not unmounting.

To enable runtime PM for an SD cardreader (device number 0:0:0:0), do:

echo 0 > /sys/module/block/parameters/events_dfl_poll_msecs
echo 1000 > /sys/bus/scsi/devices/0:0:0:0/power/autosuspend_delay_ms
echo auto > /sys/bus/scsi/devices/0:0:0:0/power/control

Signed-off-by: Martin Kepplinger <[email protected]>
Reviewed-by: Bart Van Assche <[email protected]>
---
drivers/scsi/sd.c | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 6d2d63629a90..34554224b89a 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -63,6 +63,7 @@
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_dbg.h>
#include <scsi/scsi_device.h>
+#include <scsi/scsi_devinfo.h>
#include <scsi/scsi_driver.h>
#include <scsi/scsi_eh.h>
#include <scsi/scsi_host.h>
@@ -114,6 +115,7 @@ static void sd_shutdown(struct device *);
static int sd_suspend_system(struct device *);
static int sd_suspend_runtime(struct device *);
static int sd_resume(struct device *);
+static int sd_resume_runtime(struct device *);
static void sd_rescan(struct device *);
static blk_status_t sd_init_command(struct scsi_cmnd *SCpnt);
static void sd_uninit_command(struct scsi_cmnd *SCpnt);
@@ -608,7 +610,7 @@ static const struct dev_pm_ops sd_pm_ops = {
.poweroff = sd_suspend_system,
.restore = sd_resume,
.runtime_suspend = sd_suspend_runtime,
- .runtime_resume = sd_resume,
+ .runtime_resume = sd_resume_runtime,
};

static struct scsi_driver sd_template = {
@@ -3720,6 +3722,25 @@ static int sd_resume(struct device *dev)
return ret;
}

+static int sd_resume_runtime(struct device *dev)
+{
+ struct scsi_disk *sdkp = dev_get_drvdata(dev);
+ struct scsi_device *sdp = sdkp->device;
+
+ if (sdp->sdev_bflags & BLIST_MEDIA_CHANGE) {
+ /* clear the devices' sense data */
+ static const u8 cmd[10] = { REQUEST_SENSE };
+
+ if (scsi_execute(sdp, cmd, DMA_NONE, NULL, 0, NULL,
+ NULL, sdp->request_queue->rq_timeout, 1, 0,
+ RQF_PM, NULL))
+ sd_printk(KERN_NOTICE, sdkp,
+ "Failed to clear sense data\n");
+ }
+
+ return sd_resume(dev);
+}
+
/**
* init_sd - entry point for this driver (both when built in or when
* a module).
--
2.30.2

2021-07-22 04:01:34

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH v6 0/3] fix runtime PM for SD card readers


Martin,

> (According to Alan Stern, "as far as I know, all") SD card readers
> send MEDIA_CHANGED unit attention notification on (runtime) resume. We
> cannot use runtime PM with these devices as I/O always fails in that
> case.

Made a few changes (added "ignore" to clarify what the flag does and
twiddled how the workaround is triggered in sd.c). Applied to
5.15/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2021-07-27 04:18:10

by Martin K. Petersen

[permalink] [raw]
Subject: Re: [PATCH v6 0/3] fix runtime PM for SD card readers

On Sun, 4 Jul 2021 09:54:00 +0200, Martin Kepplinger wrote:

> (According to Alan Stern, "as far as I know, all") SD card readers send
> MEDIA_CHANGED unit attention notification on (runtime) resume. We cannot
> use runtime PM with these devices as I/O always fails in that case.
>
> This fixes runtime PM for SD cardreaders. I'd appreciate any feedback.
>
> To enable runtime PM for an SD cardreader number 0:0:0:0, do:
>
> [...]

Applied to 5.15/scsi-queue, thanks!

[1/3] scsi: devinfo: add new flag BLIST_MEDIA_CHANGE
https://git.kernel.org/mkp/scsi/c/f591a2e0548d
[2/3] scsi: sd: send REQUEST SENSE for BLIST_MEDIA_CHANGE devices in runtime_resume()
https://git.kernel.org/mkp/scsi/c/ed4246d37f3b
[3/3] scsi: devinfo: add BLIST_MEDIA_CHANGE for Ultra HS-SD/MMC usb cardreaders
https://git.kernel.org/mkp/scsi/c/9abe677951d1

--
Martin K. Petersen Oracle Linux Engineering