phy: qcom-qmp-ufs: Add support for configuring PHY in HS G4 mode

Add separate tables_hs_g4 instance to allow the PHY driver to configure the
PHY in HS G4 mode. The individual SoC configs need to supply the Rx, Tx and
PCS register setting in tables_hs_g4 and the UFS driver can request the
Hs G4 mode by calling phy_set_mode_ext() with submode set to UFS_HS_G4.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Andrew Halaney <ahalaney@redhat.com> # Qdrive3/sa8540p-ride
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20230114071009.88102-6-manivannan.sadhasivam@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
index 91285ddd663efc52b3e151efdeefe23f5fa8bb33..bb329cfbb96ddc154a4be0a8fd36ce6ae1711513 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
@@ -20,6 +20,7 @@
 #include <linux/reset.h>
 #include <linux/slab.h>
 
+#include <ufs/unipro.h>
 #include "phy-qcom-qmp.h"
 #include "phy-qcom-qmp-pcs-ufs-v2.h"
 #include "phy-qcom-qmp-pcs-ufs-v3.h"
@@ -554,6 +555,8 @@ struct qmp_phy_cfg {
        const struct qmp_phy_cfg_tbls tbls;
        /* Additional sequence for HS Series B */
        const struct qmp_phy_cfg_tbls tbls_hs_b;
+       /* Additional sequence for HS G4 */
+       const struct qmp_phy_cfg_tbls tbls_hs_g4;
 
        /* clock ids to be requested */
        const char * const *clk_list;
@@ -588,6 +591,7 @@ struct qmp_ufs {
 
        struct phy *phy;
        u32 mode;
+       u32 submode;
 };
 
 static inline void qphy_setbits(void __iomem *base, u32 offset, u32 val)
@@ -854,7 +858,11 @@ static void qmp_ufs_init_registers(struct qmp_ufs *qmp, const struct qmp_phy_cfg
        if (qmp->mode == PHY_MODE_UFS_HS_B)
                qmp_ufs_serdes_init(qmp, &cfg->tbls_hs_b);
        qmp_ufs_lanes_init(qmp, &cfg->tbls);
+       if (qmp->submode == UFS_HS_G4)
+               qmp_ufs_lanes_init(qmp, &cfg->tbls_hs_g4);
        qmp_ufs_pcs_init(qmp, &cfg->tbls);
+       if (qmp->submode == UFS_HS_G4)
+               qmp_ufs_pcs_init(qmp, &cfg->tbls_hs_g4);
 }
 
 static int qmp_ufs_com_init(struct qmp_ufs *qmp)
@@ -1028,6 +1036,7 @@ static int qmp_ufs_set_mode(struct phy *phy, enum phy_mode mode, int submode)
        struct qmp_ufs *qmp = phy_get_drvdata(phy);
 
        qmp->mode = mode;
+       qmp->submode = submode;
 
        return 0;
 }