5.10-stable patches

added patches:
	scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-version-5.patch

diff --git a/queue-5.10/scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-version-5.patch b/queue-5.10/scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-version-5.patch
new file mode 100644 (file)
index 0000000..2a8b5ff
--- /dev/null
+++ b/queue-5.10/scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-version-5.patch
@@ -0,0 +1,35 @@
+From c422fbd5cb58c9a078172ae1e9750971b738a197 Mon Sep 17 00:00:00 2001
+From: Neil Armstrong <neil.armstrong@linaro.org>
+Date: Mon, 21 Aug 2023 14:11:21 +0200
+Subject: scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW major version > 5
+
+From: Neil Armstrong <neil.armstrong@linaro.org>
+
+commit c422fbd5cb58c9a078172ae1e9750971b738a197 upstream.
+
+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@kernel.org>
+Reviewed-by: Nitin Rawat <quic_nitirawa@quicinc.com>
+Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
+Link: https://lore.kernel.org/r/20230821-topic-sm8x50-upstream-ufs-major-5-plus-v2-1-f42a4b712e58@linaro.org
+Reviewed-by: "Bao D. Nguyen" <quic_nguyenb@quicinc.com>
+Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/scsi/ufs/ufs-qcom.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/scsi/ufs/ufs-qcom.c
++++ b/drivers/scsi/ufs/ufs-qcom.c
+@@ -243,7 +243,7 @@ static void ufs_qcom_select_unipro_mode(
+                  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);
+ }
+ 

diff --git a/queue-5.10/series b/queue-5.10/series
index 5269ff654b35b3ed01f4d11b9a664a6fc13f25c4..db667f53ba13ce8b0ec5d78295bff338c4bde978 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -311,3 +311,4 @@ ext4-fix-mb_cache_entry-s-e_refcnt-leak-in-ext4_xattr_block_cache_find.patch
 s390-ap-fix-crash-in-ap-internal-function-modify_bitmap.patch
 nfs-fix-undefined-behavior-in-nfs_block_bits.patch
 nfs-fix-read_plus-when-server-doesn-t-support-op_read_plus.patch
+scsi-ufs-ufs-qcom-clear-qunipro_g4_sel-for-hw-major-version-5.patch