Commit 637822e6 authored by Can Guo's avatar Can Guo Committed by Martin K. Petersen
Browse files

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: 51dd905b ("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>
parent 23043dd8

drivers/scsi/ufs/ufshcd.c

+2 −0
Original line number Diff line number Diff line
@@ -8975,6 +8975,8 @@ int ufshcd_system_suspend(struct ufs_hba *hba) 
	if (!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) ==