Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit 8d5aebf

Browse files
jhovoldgregkh
authored andcommitted
scsi: Revert "scsi: sd: Do not repeat the starting disk message"
commit da3e19e upstream. This reverts commit 7a6bbc2. The offending commit tried to suppress a double "Starting disk" message for some drivers, but instead started spamming the log with bogus messages every five seconds: [ 311.798956] sd 0:0:0:0: [sda] Starting disk [ 316.919103] sd 0:0:0:0: [sda] Starting disk [ 322.040775] sd 0:0:0:0: [sda] Starting disk [ 327.161140] sd 0:0:0:0: [sda] Starting disk [ 332.281352] sd 0:0:0:0: [sda] Starting disk [ 337.401878] sd 0:0:0:0: [sda] Starting disk [ 342.521527] sd 0:0:0:0: [sda] Starting disk [ 345.850401] sd 0:0:0:0: [sda] Starting disk [ 350.967132] sd 0:0:0:0: [sda] Starting disk [ 356.090454] sd 0:0:0:0: [sda] Starting disk ... on machines that do not actually stop the disk on runtime suspend (e.g. the Qualcomm sc8280xp CRD with UFS). Let's just revert for now to address the regression. Fixes: 7a6bbc2 ("scsi: sd: Do not repeat the starting disk message") Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20240716161101.30692-1-johan+linaro@kernel.org Reviewed-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Damien Le Moal <dlemoal@kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e6fc67c commit 8d5aebf

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

drivers/scsi/sd.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -3955,6 +3955,8 @@ static int sd_resume(struct device *dev)
39553955
{
39563956
struct scsi_disk *sdkp = dev_get_drvdata(dev);
39573957

3958+
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
3959+
39583960
if (opal_unlock_from_suspend(sdkp->opal_dev)) {
39593961
sd_printk(KERN_NOTICE, sdkp, "OPAL unlock failed\n");
39603962
return -EIO;
@@ -3971,13 +3973,12 @@ static int sd_resume_common(struct device *dev, bool runtime)
39713973
if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */
39723974
return 0;
39733975

3974-
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
3975-
39763976
if (!sd_do_start_stop(sdkp->device, runtime)) {
39773977
sdkp->suspended = false;
39783978
return 0;
39793979
}
39803980

3981+
sd_printk(KERN_NOTICE, sdkp, "Starting disk\n");
39813982
ret = sd_start_stop_device(sdkp, 1);
39823983
if (!ret) {
39833984
sd_resume(dev);

0 commit comments

Comments
 (0)