From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 394122D2391; Tue, 12 Aug 2025 19:24:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026659; cv=none; b=reOUSLXL7Yl++bJgex91j5QtAOpzCm234r3CNCnIzIewhwj6kYtEd6gouVs3Bo3NdvRXYAqJEyOF4KUmIoD3adnGTp497lLCYUlS2rlmRwLzjDVm9B2EnK8mVo0DdwckLylCXGDYvuNaK/w6kxsYqnimVo+bc+vqD5vxjtHNQKE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755026659; c=relaxed/simple; bh=S80Wbfo/cKymt5FWD/oe05cc7Eg5ZELUosz2ngV/L/I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gxu+cn8hOtEC1frXuouzRTHmWCTdKexInZG0gf0CgaZzOtF4QKpYXeueTOS1zHR4M4+JzEbFTe+MJ8uFo8OXfI28MLhor8Bq2ZBzQk8z7LRE3g/ZBUy0APNsmbn936ijZczvdBdlUgjjKBG+TeF1vcuSMxnNA1rllbuwWDysQIk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=tBMjHl6X; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="tBMjHl6X" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE7DBC4CEF0; Tue, 12 Aug 2025 19:24:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755026659; bh=S80Wbfo/cKymt5FWD/oe05cc7Eg5ZELUosz2ngV/L/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tBMjHl6XuE92xoh3zaII76lygbSMJXAUOhTx2bG/9LlwUL3Dl2qTlowBranqSrWlg ad3jIYgVU574MwHOUC/zw8T9kKinQJ33Cn8hVYld2Lb+wMiZJ9dmT4Qd52DpcjGaYx AGmMY7/sKppE8Cd6zGBJgvhvuFL72VPecbuC79LE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Salomon Dushimirimana , Damien Le Moal , "Martin K. Petersen" , Sasha Levin Subject: [PATCH 6.15 369/480] scsi: sd: Make sd shutdown issue START STOP UNIT appropriately Date: Tue, 12 Aug 2025 19:49:37 +0200 Message-ID: <20250812174412.649826651@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250812174357.281828096@linuxfoundation.org> References: <20250812174357.281828096@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Salomon Dushimirimana [ Upstream commit 8e48727c26c4d839ff9b4b73d1cae486bea7fe19 ] Commit aa3998dbeb3a ("ata: libata-scsi: Disable scsi device manage_system_start_stop") enabled libata EH to manage device power mode trasitions for system suspend/resume and removed the flag from ata_scsi_dev_config. However, since the sd_shutdown() function still relies on the manage_system_start_stop flag, a spin-down command is not issued to the disk with command "echo 1 > /sys/block/sdb/device/delete" sd_shutdown() can be called for both system/runtime start stop operations, so utilize the manage_run_time_start_stop flag set in the ata_scsi_dev_config and issue a spin-down command during disk removal when the system is running. This is in addition to when the system is powering off and manage_shutdown flag is set. The manage_system_start_stop flag will still be used for drivers that still set the flag. Fixes: aa3998dbeb3a ("ata: libata-scsi: Disable scsi device manage_system_start_stop") Signed-off-by: Salomon Dushimirimana Link: https://lore.kernel.org/r/20250724214520.112927-1-salomondush@google.com Tested-by: Damien Le Moal Reviewed-by: Damien Le Moal Signed-off-by: Martin K. Petersen Signed-off-by: Sasha Levin --- drivers/scsi/sd.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 89d5c4b17bc4..2f64caa3b253 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -4173,7 +4173,9 @@ static void sd_shutdown(struct device *dev) if ((system_state != SYSTEM_RESTART && sdkp->device->manage_system_start_stop) || (system_state == SYSTEM_POWER_OFF && - sdkp->device->manage_shutdown)) { + sdkp->device->manage_shutdown) || + (system_state == SYSTEM_RUNNING && + sdkp->device->manage_runtime_start_stop)) { sd_printk(KERN_NOTICE, sdkp, "Stopping disk\n"); sd_start_stop_device(sdkp, 0); } -- 2.39.5