moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "FROMGIT: scsi: ufs: ufs-qcom: Add support for finding max gear on new platforms"

Browse Source 
This reverts commit ac7823b077.

UFS G4 patchseries broke RB5 (sm8250). Reverting a minimal
set of patches to get the device booting again.

Bug: 146449535
Change-Id: I33155982effdcedcbf836e5355fbed646236ea48
Suggested-by: Bart Van Assche <bvanassche@google.com>
Suggested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
This commit is contained in:
Amit Pundir
2023-02-07 22:34:17 +05:30
committed by Treehugger Robot
parent a1cdb3fe0e
commit 5a84915a10
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ufs/host/ufs-qcom.c
View File

@@ -288,8 +288,6 @@ static u32 ufs_qcom_get_hs_gear(struct ufs_hba *hba)
* Hence downgrade the maximum supported gear to HS-G2. * Hence downgrade the maximum supported gear to HS-G2.
*/ */
return UFS_HS_G2; return UFS_HS_G2;
} else if (host->hw_ver.major >= 0x4) {
return UFS_QCOM_MAX_GEAR(ufshcd_readl(hba, REG_UFS_PARAM0));
} }
/* Default is HS-G3 */ /* Default is HS-G3 */

4
drivers/ufs/host/ufs-qcom.h
View File

@@ -99,10 +99,6 @@ enum {
#define TMRLUT_HW_CGC_EN BIT(6) #define TMRLUT_HW_CGC_EN BIT(6)
#define OCSC_HW_CGC_EN BIT(7) #define OCSC_HW_CGC_EN BIT(7)
/* bit definitions for REG_UFS_PARAM0 */
#define MAX_HS_GEAR_MASK GENMASK(6, 4)
#define UFS_QCOM_MAX_GEAR(x) FIELD_GET(MAX_HS_GEAR_MASK, (x))
/* bit definition for UFS_UFS_TEST_BUS_CTRL_n */ /* bit definition for UFS_UFS_TEST_BUS_CTRL_n */
#define TEST_BUS_SUB_SEL_MASK GENMASK(4, 0) /* All XXX_SEL fields are 5 bits wide */ #define TEST_BUS_SUB_SEL_MASK GENMASK(4, 0) /* All XXX_SEL fields are 5 bits wide */