From 1ac4ae4ac4a981ddf53c543a39526d7820042f61 Mon Sep 17 00:00:00 2001 From: HeonGwang Chu Date: Wed, 5 Jul 2017 13:27:05 +0900 Subject: [PATCH] [COMMON] scsi: ufs: Fix problems in clock enable fail and hibern8 fail cases We delete the clearing of saved_err and saved_uic_err in hibern8 ctrl and add recovery method when ufs clock enable fail cases.These cases had happened in the previous soc versions. Change-Id: Ia8dc78c58cd89030075fb63cc29e015bdb8411fa Signed-off-by: HeonGwang Chu --- drivers/scsi/ufs/ufshcd.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index fbf2e95e2a85..06577599c515 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -4025,16 +4025,8 @@ static int ufshcd_link_hibern8_ctrl(struct ufs_hba *hba, bool en) else ret = ufshcd_uic_hibern8_exit(hba); - - if (ret || (hba->saved_err & INT_FATAL_ERRORS) || - ((hba->saved_err & UIC_ERROR) && - ((hba->saved_uic_err & UFSHCD_UIC_DL_PA_INIT_ERROR) || - (hba->saved_uic_err & UFSHCD_UIC_DL_ERROR)))) { - - if (!ret) - ret = hba->saved_err; + if (ret) goto out; - } if (hba->monitor.flag & UFSHCD_MONITOR_LEVEL2) { if (en) -- 2.20.1