scsi: ufs: ufs-qcom: Set initial PHY gear to max HS gear for HW ver 4 and newer

Since HW ver 4, max HS gear can be get from UFS host controller's register,
use the max HS gear as the initial PHY gear instead of UFS_HS_G2, so that
we don't need to update the hard code for newer targets in future.

Reviewed-by: Nitin Rawat <quic_nitirawa@quicinc.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Signed-off-by: Can Guo <quic_cang@quicinc.com>
Link: https://lore.kernel.org/r/1701520577-31163-7-git-send-email-quic_cang@quicinc.com
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index aca619986c78419da978523f1e7f9a573069e980..543939c4c463a03164fe0b637ff4d7ac9a94b614 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1060,6 +1060,22 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
                hba->quirks |= UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;
 }
 
+static void ufs_qcom_set_phy_gear(struct ufs_qcom_host *host)
+{
+       struct ufs_host_params *host_params = &host->host_params;
+
+       host->phy_gear = host_params->hs_tx_gear;
+
+       /*
+        * For controllers whose major HW version is < 4, power up the PHY using
+        * minimum supported gear (UFS_HS_G2). Switching to max gear will be
+        * performed during reinit if supported. For newer controllers, whose
+        * major HW version is >= 4, power up the PHY using max supported gear.
+        */
+       if (host->hw_ver.major < 0x4)
+               host->phy_gear = UFS_HS_G2;
+}
+
 static void ufs_qcom_set_host_params(struct ufs_hba *hba)
 {
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
@@ -1296,6 +1312,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
        ufs_qcom_set_caps(hba);
        ufs_qcom_advertise_quirks(hba);
        ufs_qcom_set_host_params(hba);
+       ufs_qcom_set_phy_gear(host);
 
        err = ufs_qcom_ice_init(host);
        if (err)
@@ -1313,12 +1330,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
                dev_warn(dev, "%s: failed to configure the testbus %d\n",
                                __func__, err);
 
-       /*
-        * Power up the PHY using the minimum supported gear (UFS_HS_G2).
-        * Switching to max gear will be performed during reinit if supported.
-        */
-       host->phy_gear = UFS_HS_G2;
-
        return 0;
 
 out_variant_clear: