evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "scsi: ufs: fix error handing during hibern8 enter"

Browse source
This commit is contained in:
Linux Build Service Account 2017-04-05 20:21:33 -07:00 • committed by Gerrit - the friendly Code Review server
commit 6728c13839
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/scsi/ufs/ufshcd.c
View file

@ -4289,15 +4289,25 @@ static int __ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
* mode hence full reinit is required to move link to HS speeds. * mode hence full reinit is required to move link to HS speeds.
*/ */
if (ret || hba->full_init_linereset) { if (ret || hba->full_init_linereset) {
int err;
hba->full_init_linereset = false; hba->full_init_linereset = false;
ufshcd_update_error_stats(hba, UFS_ERR_HIBERN8_ENTER); ufshcd_update_error_stats(hba, UFS_ERR_HIBERN8_ENTER);
dev_err(hba->dev, "%s: hibern8 enter failed. ret = %d", dev_err(hba->dev, "%s: hibern8 enter failed. ret = %d",
__func__, ret); __func__, ret);
/* /*
* If link recovery fails then return error so that caller * If link recovery fails then return error code (-ENOLINK)
* don't retry the hibern8 enter again. * returned ufshcd_link_recovery().
* If link recovery succeeds then return -EAGAIN to attempt
* hibern8 enter retry again.
*/ */
ret = ufshcd_link_recovery(hba); err = ufshcd_link_recovery(hba);
if (err) {
dev_err(hba->dev, "%s: link recovery failed", __func__);
ret = err;
} else {
ret = -EAGAIN;
}
} else { } else {
dev_dbg(hba->dev, "%s: Hibern8 Enter at %lld us", __func__, dev_dbg(hba->dev, "%s: Hibern8 Enter at %lld us", __func__,
ktime_to_us(ktime_get())); ktime_to_us(ktime_get()));
@ -4314,8 +4324,8 @@ int ufshcd_uic_hibern8_enter(struct ufs_hba *hba)
ret = __ufshcd_uic_hibern8_enter(hba); ret = __ufshcd_uic_hibern8_enter(hba);
if (!ret) if (!ret)
goto out; goto out;
else if (ret != -EAGAIN)
/* Unable to recover the link, so no point proceeding */ /* Unable to recover the link, so no point proceeding */
if (ret == -ENOLINK)
BUG(); BUG();
} }
out: out: