Commit a49516da authored Nov 25, 2019 by Asutosh Das Committed by Todd Kjos Dec 12, 2019

FROMGIT: 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.

Bug: 143632303
(cherry picked from commit dc2ec810907431865ad3f2a17f2aac192e7f54f3
https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git 5.6/scsi-queue)
Fixes: afdfff59 (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>

Change-Id: I033548b380d49b3f3e941c86f7e7221586613535
Signed-off-by: Asutosh Das <asutoshd@codeaurora.org>

parent b9cf3098

drivers/scsi/ufs/ufshcd.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -5060,6 +5060,7 @@ static int ufshcd_disable_auto_bkops(struct ufs_hba *hba)

		hba->auto_bkops_enabled = false;
		trace_ufshcd_auto_bkops_state(dev_name(hba->dev), "Disabled");
		hba->is_urgent_bkops_lvl_checked = false;
		out:
		return err;
		}
		@@ -5084,6 +5085,7 @@ static void ufshcd_force_reset_auto_bkops(struct ufs_hba *hba)
		hba->ee_ctrl_mask &= ~MASK_EE_URGENT_BKOPS;
		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)
		@@ -5130,6 +5132,7 @@ static int ufshcd_bkops_ctrl(struct ufs_hba *hba,
		err = ufshcd_enable_auto_bkops(hba);
		else
		err = ufshcd_disable_auto_bkops(hba);
		hba->urgent_bkops_lvl = curr_status;
		out:
		return err;
		}