diff mbox series

[v5] ufs: core: correct ufshcd_shutdown flow

Message ID 20220727030526.31022-1-peter.wang@mediatek.com (mailing list archive)
State Accepted
Headers show
Series [v5] ufs: core: correct ufshcd_shutdown flow | expand

Commit Message

Peter Wang (王信友) July 27, 2022, 3:05 a.m. UTC 
From: Peter Wang <peter.wang@mediatek.com>

After ufshcd_wl_shutdown set device power off and link off,
ufshcd_shutdown could turn off clock/power.

Also remove pm_runtime_get_sync.
The reason why here can remove pm_runtime_get_sync is because,
(1) ufshcd_wl_shutdown -> pm_runtime_get_sync, will resume hba->dev too.
(2) device resume(turn on clk/power) is not required, even if device is in RPM_SUSPENDED.

Fixes: b294ff3e3449 ("scsi: ufs: core: Enable power management for wlun")
Cc: <stable@vger.kernel.org> # 5.15.x
Signed-off-by: Peter Wang <peter.wang@mediatek.com>
---
 drivers/ufs/core/ufshcd.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

Stanley Jhu July 27, 2022, 3:11 a.m. UTC | #1 
On Wed, Jul 27, 2022 at 11:10 AM <peter.wang@mediatek.com> wrote:
>
> From: Peter Wang <peter.wang@mediatek.com>
>
> After ufshcd_wl_shutdown set device power off and link off,
> ufshcd_shutdown could turn off clock/power.
>
> Also remove pm_runtime_get_sync.
> The reason why here can remove pm_runtime_get_sync is because,
> (1) ufshcd_wl_shutdown -> pm_runtime_get_sync, will resume hba->dev too.
> (2) device resume(turn on clk/power) is not required, even if device is in RPM_SUSPENDED.
>
> Fixes: b294ff3e3449 ("scsi: ufs: core: Enable power management for wlun")
> Cc: <stable@vger.kernel.org> # 5.15.x
> Signed-off-by: Peter Wang <peter.wang@mediatek.com>

Reviewed-by: Stanley Chu <stanley.chu@mediatek.com>
Martin K. Petersen Aug. 1, 2022, 11:33 p.m. UTC | #2 
> After ufshcd_wl_shutdown set device power off and link off,
> ufshcd_shutdown could turn off clock/power.

Applied to 5.20/scsi-staging, thanks!
diff mbox series

Patch

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index c7b337480e3e..d13c76983555 100644
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -9462,12 +9462,8 @@  EXPORT_SYMBOL(ufshcd_runtime_resume);
 int ufshcd_shutdown(struct ufs_hba *hba)
 {
 	if (ufshcd_is_ufs_dev_poweroff(hba) && ufshcd_is_link_off(hba))
-		goto out;
-
-	pm_runtime_get_sync(hba->dev);
+		ufshcd_suspend(hba);
 
-	ufshcd_suspend(hba);
-out:
 	hba->is_powered = false;
 	/* allow force shutdown even in case of errors */
 	return 0;