From: Greg Kroah-Hartman Date: Wed, 17 Jul 2024 06:32:08 +0000 (+0200) Subject: drop queue-6.9/scsi-sd-do-not-repeat-the-starting-disk-message.patch X-Git-Tag: v4.19.318~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15f54ce0238a99bd75857ddc11e0989213fe091e;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.9/scsi-sd-do-not-repeat-the-starting-disk-message.patch --- diff --git a/queue-6.9/scsi-sd-do-not-repeat-the-starting-disk-message.patch b/queue-6.9/scsi-sd-do-not-repeat-the-starting-disk-message.patch deleted file mode 100644 index 77517da3651..00000000000 --- a/queue-6.9/scsi-sd-do-not-repeat-the-starting-disk-message.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 7a6bbc2829d4ab592c7e440a6f6f5deb3cd95db4 Mon Sep 17 00:00:00 2001 -From: Damien Le Moal -Date: Tue, 2 Jul 2024 06:53:26 +0900 -Subject: scsi: sd: Do not repeat the starting disk message - -From: Damien Le Moal - -commit 7a6bbc2829d4ab592c7e440a6f6f5deb3cd95db4 upstream. - -The SCSI disk message "Starting disk" to signal resuming of a suspended -disk is printed in both sd_resume() and sd_resume_common() which results -in this message being printed twice when resuming from e.g. autosuspend: - -$ echo 5000 > /sys/block/sda/device/power/autosuspend_delay_ms -$ echo auto > /sys/block/sda/device/power/control - -[ 4962.438293] sd 0:0:0:0: [sda] Synchronizing SCSI cache -[ 4962.501121] sd 0:0:0:0: [sda] Stopping disk - -$ echo on > /sys/block/sda/device/power/control - -[ 4972.805851] sd 0:0:0:0: [sda] Starting disk -[ 4980.558806] sd 0:0:0:0: [sda] Starting disk - -Fix this double print by removing the call to sd_printk() from sd_resume() -and moving the call to sd_printk() in sd_resume_common() earlier in the -function, before the check using sd_do_start_stop(). Doing so, the message -is printed once regardless if sd_resume_common() actually executes -sd_start_stop_device() (i.e. SCSI device case) or not (libsas and libata -managed ATA devices case). - -Fixes: 0c76106cb975 ("scsi: sd: Fix TCG OPAL unlock on system resume") -Cc: stable@vger.kernel.org -Signed-off-by: Damien Le Moal -Link: https://lore.kernel.org/r/20240701215326.128067-1-dlemoal@kernel.org -Reviewed-by: Bart Van Assche -Reviewed-by: John Garry -Signed-off-by: Martin K. Petersen -Signed-off-by: Greg Kroah-Hartman ---- - drivers/scsi/sd.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/drivers/scsi/sd.c -+++ b/drivers/scsi/sd.c -@@ -4127,8 +4127,6 @@ static int sd_resume(struct device *dev) - { - struct scsi_disk *sdkp = dev_get_drvdata(dev); - -- sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); -- - if (opal_unlock_from_suspend(sdkp->opal_dev)) { - sd_printk(KERN_NOTICE, sdkp, "OPAL unlock failed\n"); - return -EIO; -@@ -4145,12 +4143,13 @@ static int sd_resume_common(struct devic - if (!sdkp) /* E.g.: runtime resume at the start of sd_probe() */ - return 0; - -+ sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); -+ - if (!sd_do_start_stop(sdkp->device, runtime)) { - sdkp->suspended = false; - return 0; - } - -- sd_printk(KERN_NOTICE, sdkp, "Starting disk\n"); - ret = sd_start_stop_device(sdkp, 1); - if (!ret) { - sd_resume(dev); diff --git a/queue-6.9/series b/queue-6.9/series index ff7ef117174..18bd1abdbcd 100644 --- a/queue-6.9/series +++ b/queue-6.9/series @@ -90,7 +90,6 @@ filemap-replace-pte_offset_map-with-pte_offset_map_nolock.patch mm-filemap-skip-to-create-pmd-sized-page-cache-if-needed.patch mm-filemap-make-max_pagecache_order-acceptable-to-xarray.patch ksmbd-discard-write-access-to-the-directory-open.patch -scsi-sd-do-not-repeat-the-starting-disk-message.patch iio-trigger-fix-condition-for-own-trigger.patch arm64-dts-qcom-sa8775p-correct-irq-number-of-el2-non-secure-physical-timer.patch arm64-dts-qcom-sc8280xp-x13s-fix-touchscreen-power-on.patch