scsi: ufs: ufs-qcom: Clear qunipro_g4_sel for HW version major 5

[ Upstream commit 9c02aa24bf404a39ec509d9f50539056b9b128f7 ]

On SM8550, depending on the Qunipro, we can run with G5 or G4.  For now,
when the major version is 5 or above, we go with G5.  Therefore, we need to
specifically tell UFS HC that.

Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Stable-dep-of: 823150ecf04f ("scsi: ufs: qcom: Perform read back after writing unipro mode")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
index 45d21cb80289defda7209057ca09efbab69220ce..ef8d721022da5728746f846d1f4c98e5adf40c96 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.c
+++ b/drivers/scsi/ufs/ufs-qcom.c
@@ -242,6 +242,10 @@ static void ufs_qcom_select_unipro_mode(struct ufs_qcom_host *host)
        ufshcd_rmwl(host->hba, QUNIPRO_SEL,
                   ufs_qcom_cap_qunipro(host) ? QUNIPRO_SEL : 0,
                   REG_UFS_CFG1);
+
+       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 */
        mb();
 }
@@ -515,9 +519,9 @@ static int ufs_qcom_cfg_timers(struct ufs_hba *hba, u32 gear,
                mb();
        }
 
-       if (update_link_startup_timer) {
+       if (update_link_startup_timer && host->hw_ver.major != 0x5) {
                ufshcd_writel(hba, ((core_clk_rate / MSEC_PER_SEC) * 100),
-                             REG_UFS_PA_LINK_STARTUP_TIMER);
+                             REG_UFS_CFG0);
                /*
                 * make sure that this configuration is applied before
                 * we return

diff --git a/drivers/scsi/ufs/ufs-qcom.h b/drivers/scsi/ufs/ufs-qcom.h
index 70bee1d1f1139e203343b36068d3b66f07816677..742f752d01d6134d3cc5adc3594947b637d73f44 100644 (file)
--- a/drivers/scsi/ufs/ufs-qcom.h
+++ b/drivers/scsi/ufs/ufs-qcom.h
@@ -48,7 +48,8 @@ enum {
        REG_UFS_PA_ERR_CODE                 = 0xCC,
        /* On older UFS revisions, this register is called "RETRY_TIMER_REG" */
        REG_UFS_PARAM0                      = 0xD0,
-       REG_UFS_PA_LINK_STARTUP_TIMER       = 0xD8,
+       /* On older UFS revisions, this register is called "REG_UFS_PA_LINK_STARTUP_TIMER" */
+       REG_UFS_CFG0                        = 0xD8,
        REG_UFS_CFG1                        = 0xDC,
        REG_UFS_CFG2                        = 0xE0,
        REG_UFS_HW_VERSION                  = 0xE4,
@@ -86,6 +87,9 @@ enum {
 #define UFS_CNTLR_2_x_x_VEN_REGS_OFFSET(x)     (0x000 + x)
 #define UFS_CNTLR_3_x_x_VEN_REGS_OFFSET(x)     (0x400 + x)
 
+/* bit definitions for REG_UFS_CFG0 register */
+#define QUNIPRO_G4_SEL         BIT(5)
+
 /* bit definitions for REG_UFS_CFG1 register */
 #define QUNIPRO_SEL            0x1
 #define UTP_DBG_RAMS_EN                0x20000