The qunipro_g4_sel clear is also needed for new platforms with
major version > 5, fix the version check to take this in account.

Fixes: 9c02aa24bf40 ("scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5")
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
Reviewed-by: Nitin Rawat <quic_nitirawa@quicinc.com>
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
Changes in v2:
- Added Fixes tag as suggested by Mani
- Added Acked-by and Reviewed-by tags
- Link to v1: https://lore.kernel.org/r/20230821-topic-sm8x50-upstream-ufs-major-5-plus-v1-1-c14cce209f21@linaro.org
---
 drivers/ufs/host/ufs-qcom.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index f88febb23123..d1149b1c3ed5 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -365,7 +365,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);
 
 	/* make sure above configuration is applied before we return */

---
base-commit: 47d9bb711707d15b19fad18c8e2b4b027a264a3a
change-id: 20230821-topic-sm8x50-upstream-ufs-major-5-plus-4eaad3f3d857

Best regards,
-- 
Neil Armstrong <neil.armstrong@linaro.org>

On Mon, 21 Aug 2023 14:11:21 +0200, Neil Armstrong wrote:

> The qunipro_g4_sel clear is also needed for new platforms with
> major version > 5, fix the version check to take this in account.
> 
> 

Applied to 6.5/scsi-fixes, thanks!

[1/1] scsi: ufs: ufs-qcom: clear qunipro_g4_sel for HW major version > 5
      https://git.kernel.org/mkp/scsi/c/c422fbd5cb58

-- 
Martin K. Petersen	Oracle Linux Engineering

On 8/21/2023 5:11 AM, Neil Armstrong wrote:
> The qunipro_g4_sel clear is also needed for new platforms with
> major version > 5, fix the version check to take this in account.
> 
Change "version > 5, fix.." to "version > 5. Fix..."
"into account."? Anyway..

Reviewed-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>