From: Greg Kroah-Hartman Date: Thu, 13 Jun 2024 11:14:08 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v4.19.316~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e459708fa7c63aad148def9e8ce63894eb648108;p=thirdparty%2Fkernel%2Fstable-queue.git 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 index 00000000000..2a8b5ff0aa1 --- /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 +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 + +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 +Reviewed-by: Nitin Rawat +Signed-off-by: Neil Armstrong +Link: https://lore.kernel.org/r/20230821-topic-sm8x50-upstream-ufs-major-5-plus-v2-1-f42a4b712e58@linaro.org +Reviewed-by: "Bao D. Nguyen" +Signed-off-by: Martin K. Petersen +Signed-off-by: Greg Kroah-Hartman +--- + 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 5269ff654b3..db667f53ba1 100644 --- 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