Commit dc5ccc2d authored Apr 25, 2021 by Can Guo Committed by Connor O'Brien Oct 01, 2021

UPSTREAM: scsi: ufs: core: Do not put UFS power into LPM if link is broken

During resume, if link is broken due to AH8 failure, make sure
ufshcd_resume() does not put UFS power back into LPM.

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


Fixes: 4db7a2360597 ("scsi: ufs: Fix concurrency of error handler and other error recovery paths")
Reviewed-by: Daejun Park <daejun7.park@samsung.com>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 23043dd87b153d02eaf676e752d32429be5e5126)
Bug: 187129171
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I4a278b53ca70a5a55a410b1552e7e05751df847c

parent 5576e5e4

drivers/scsi/ufs/ufshcd.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -8470,7 +8470,7 @@ static void ufshcd_vreg_set_lpm(struct ufs_hba *hba)
		} else if (!ufshcd_is_ufs_dev_active(hba)) {
		ufshcd_toggle_vreg(hba->dev, hba->vreg_info.vcc, false);
		vcc_off = true;
		if (!ufshcd_is_link_active(hba)) {
		if (ufshcd_is_link_hibern8(hba) \|\| ufshcd_is_link_off(hba)) {
		ufshcd_config_vreg_lpm(hba, hba->vreg_info.vccq);
		ufshcd_config_vreg_lpm(hba, hba->vreg_info.vccq2);
		}
		@@ -8492,7 +8492,7 @@ static int ufshcd_vreg_set_hpm(struct ufs_hba *hba)
		!hba->dev_info.is_lu_power_on_wp) {
		ret = ufshcd_setup_vreg(hba, true);
		} else if (!ufshcd_is_ufs_dev_active(hba)) {
		if (!ret && !ufshcd_is_link_active(hba)) {
		if (!ufshcd_is_link_active(hba)) {
		ret = ufshcd_config_vreg_hpm(hba, hba->vreg_info.vccq);
		if (ret)
		goto vcc_disable;