From 0c64f7a00edbbef92c1b9af864b8757c744e842e Mon Sep 17 00:00:00 2001 From: Jaegeuk Kim Date: Thu, 17 Dec 2020 02:53:33 +0000 Subject: [PATCH] Revert "FROMLIST: scsi: ufs: fix livelock on ufshcd_clear_ua_wlun" This reverts commit 4643b9f16ba21f19a650b44a0c163e53679ec9e4. Reason for revert: No need to fix this in mainline, since 5.10-rc1 should have the fix already. Signed-off-by: Jaegeuk Kim Change-Id: I080dd929e04d3a9cd509296b86a760f37690e78e --- drivers/scsi/ufs/ufshcd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index e70fcbab8acb..15fd0b7789c0 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -1585,7 +1585,6 @@ static void ufshcd_ungate_work(struct work_struct *work) } unblock_reqs: ufshcd_scsi_unblock_requests(hba); - ufshcd_clear_ua_wluns(hba); } /** @@ -6912,7 +6911,7 @@ static int ufshcd_host_reset_and_restore(struct ufs_hba *hba) /* Establish the link again and restore the device */ err = ufshcd_probe_hba(hba, false); - if (!err && !hba->clk_gating.is_suspended) + if (!err) ufshcd_clear_ua_wluns(hba); out: if (err) @@ -8735,7 +8734,6 @@ enable_gating: ufshcd_resume_clkscaling(hba); hba->clk_gating.is_suspended = false; hba->dev_info.b_rpm_dev_flush_capable = false; - ufshcd_clear_ua_wluns(hba); ufshcd_release(hba); out: if (hba->dev_info.b_rpm_dev_flush_capable) { @@ -8841,8 +8839,6 @@ static int ufshcd_resume(struct ufs_hba *hba, enum ufs_pm_op pm_op) cancel_delayed_work(&hba->rpm_dev_flush_recheck_work); } - ufshcd_clear_ua_wluns(hba); - /* Schedule clock gating in case of no access to UFS device yet */ ufshcd_release(hba);