Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ace71bcb authored by Can Guo's avatar Can Guo Committed by Connor O'Brien
Browse files

UPSTREAM: scsi: ufs: core: Cancel rpm_dev_flush_recheck_work during system suspend 

During ufs system suspend, leaving rpm_dev_flush_recheck_work running or
pending is risky because concurrency may happen between system
suspend/resume and runtime resume routine. Fix this by cancelling
rpm_dev_flush_recheck_work synchronously during system suspend.

Link: https://lore.kernel.org/r/1619408921-30426-3-git-send-email-cang@codeaurora.org


Fixes: 51dd905bd2f6 ("scsi: ufs: Fix WriteBooster flush during runtime suspend")
Reviewed-by: default avatarDaejun Park <daejun7.park@samsung.com>
Signed-off-by: default avatarCan Guo <cang@codeaurora.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 637822e63b79ee8a729f7ba2645a26cf5a524ee4)
Bug: 187129171
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
Change-Id: Ib808d3d52921fa36142e39a05710d85fec9be053
parent dc5ccc2d

drivers/scsi/ufs/ufshcd.c

+2 −0
Original line number Diff line number Diff line
@@ -8844,6 +8844,8 @@ int ufshcd_system_suspend(struct ufs_hba *hba) 
	if (!hba || !hba->is_powered)

		return 0;



	cancel_delayed_work_sync(&hba->rpm_dev_flush_recheck_work);



	if ((ufs_get_pm_lvl_to_dev_pwr_mode(hba->spm_lvl) ==

	     hba->curr_dev_pwr_mode) &&

	    (ufs_get_pm_lvl_to_link_pwr_state(hba->spm_lvl) ==