This is a note to let you know that I've just added the patch titled
scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit 9b3c0b3afae88c0255330d557bf8e30e9f0798a7
Author: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Date: Mon Aug 21 14:11:21 2023 +0200
scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
[ Upstream commit c422fbd5cb58c9a078172ae1e9750971b738a197 ]
The qunipro_g4_sel clear is also needed for new platforms with major
version > 5. Fix the version check to take this into account.
Fixes: 9c02aa24bf40 ("scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5")
Acked-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
Reviewed-by: Nitin Rawat <quic_nitirawa@xxxxxxxxxxx>
Signed-off-by: Neil Armstrong <neil.armstrong@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230821-topic-sm8x50-upstream-ufs-major-5-plus-v2-1-f42a4b712e58@xxxxxxxxxx
Reviewed-by: "Bao D. Nguyen" <quic_nguyenb@xxxxxxxxxxx>
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 337c0ef0fab6d..ecd5939f4c9a6 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -227,7 +227,7 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host)
ufs_qcom_cap_qunipro(host) ? QUNIPRO_SEL : 0,
REG_UFS_CFG1);
- if (host->hw_ver.major == 0x05)
+ if (host->hw_ver.major >= 0x05)
ufshcd_rmwl(host->hba, QUNIPRO_G4_SEL, 0, REG_UFS_CFG0);
}
