scsi: ufs: Recheck bkops level if bkops is disabled

bkops level should be rechecked upon receiving an exception.  Currently the
level is being cached and never updated.

Update bkops each time the level is checked.  Also do not use the cached
bkops level value if it is disabled and then enabled.

Fixes: afdfff59a0 (scsi: ufs: handle non spec compliant bkops behaviour by device)
Link: https://lore.kernel.org/r/1574751214-8321-2-git-send-email-cang@qti.qualcomm.com
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Alim Akhtar <alim.akhtar@samsung.com>
Tested-by: Alim Akhtar <alim.akhtar@samsung.com>
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>
Signed-off-by: Can Guo <cang@codeaurora.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Asutosh Das 2019-11-25 22:53:30 -08:00 committed by Martin K. Petersen
parent 69a6c269c0
commit 24366c2afb

View File

@ -4986,6 +4986,7 @@ static int ufshcd_disable_auto_bkops(struct ufs_hba *hba)
hba->auto_bkops_enabled = false; hba->auto_bkops_enabled = false;
trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Disabled"); trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Disabled");
hba->is_urgent_bkops_lvl_checked = false;
out: out:
return err; return err;
} }
@ -5010,6 +5011,7 @@ static void ufshcd_force_reset_auto_bkops(struct ufs_hba *hba)
hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS; hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS;
ufshcd_disable_auto_bkops(hba); ufshcd_disable_auto_bkops(hba);
} }
hba->is_urgent_bkops_lvl_checked = false;
} }
static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status) static inline int ufshcd_get_bkops_status(struct ufs_hba *hba, u32 *status)
@ -5056,6 +5058,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
err = ufshcd_enable_auto_bkops(hba); err = ufshcd_enable_auto_bkops(hba);
else else
err = ufshcd_disable_auto_bkops(hba); err = ufshcd_disable_auto_bkops(hba);
hba->urgent_bkops_lvl = curr_status;
out: out:
return err; return err;
} }