On Wed, 22 Nov 2023 at 11:31, Can Guo <quic_cang@xxxxxxxxxxx> wrote:
>
>
>
> On 11/22/2023 5:07 PM, Dmitry Baryshkov wrote:
> > On Wed, 22 Nov 2023 at 09:11, Can Guo <quic_cang@xxxxxxxxxxx> wrote:
> >>
> >> On SM8550, two sets of UFS PHY settings are provided, one set is to support
> >> HS-G5, another set is to support HS-G4 and lower gears. The two sets of PHY
> >> settings are programming different values to different registers, mixing
> >> the two sets and/or overwriting one set with another set is definitely not
> >> blessed by UFS PHY designers.
> >>
> >> To add HS-G5 support for SM8550, split the two sets of PHY settings into
> >> their dedicated tables, G5 specific settings are put into .tbls_hs_max,
> >> no-G5 settings are put into .tbls_hs_not_max. Only the common parts of the
> >> two sets of PHY settings are left in the .tbls.
> >>
> >> In this case, .tbls alone is not a complete set of PHY settings, so either
> >> tbls_hs_max or tbls_hs_not_max should be applied on top of the .tbls to
> >> become a complete set of PHY settings.
> >>
> >> Signed-off-by: Can Guo <quic_cang@xxxxxxxxxxx>
> >> ---
> >> drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 2 +
> >> drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 2 +
> >> .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 9 ++
> >> drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 102 +++++++++++++++++++--
> >> 4 files changed, 105 insertions(+), 10 deletions(-)
> >>
> >> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h b/drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h
> >> index c23d5e4..e563af5 100644
> >> --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h
> >> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h
> >> @@ -18,6 +18,7 @@
> >> #define QPHY_V6_PCS_UFS_BIST_FIXED_PAT_CTRL 0x060
> >> #define QPHY_V6_PCS_UFS_TX_HSGEAR_CAPABILITY 0x074
> >> #define QPHY_V6_PCS_UFS_RX_HSGEAR_CAPABILITY 0x0bc
> >> +#define QPHY_V6_PCS_UFS_RX_HS_G5_SYNC_LENGTH_CAPABILITY 0x12c
> >> #define QPHY_V6_PCS_UFS_DEBUG_BUS_CLKSEL 0x158
> >> #define QPHY_V6_PCS_UFS_LINECFG_DISABLE 0x17c
> >> #define QPHY_V6_PCS_UFS_RX_MIN_HIBERN8_TIME 0x184
> >> @@ -27,5 +28,6 @@
> >> #define QPHY_V6_PCS_UFS_READY_STATUS 0x1a8
> >> #define QPHY_V6_PCS_UFS_TX_MID_TERM_CTRL1 0x1f4
> >> #define QPHY_V6_PCS_UFS_MULTI_LANE_CTRL1 0x1fc
> >> +#define QPHY_V6_PCS_UFS_RX_HSG5_SYNC_WAIT_TIME 0x220
> >>
> >> #endif
> >> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h b/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h
> >> index f420f8f..ef392ce 100644
> >> --- a/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h
> >> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h
> >> @@ -56,6 +56,8 @@
> >> #define QSERDES_V6_COM_SYS_CLK_CTRL 0xe4
> >> #define QSERDES_V6_COM_SYSCLK_BUF_ENABLE 0xe8
> >> #define QSERDES_V6_COM_PLL_IVCO 0xf4
> >> +#define QSERDES_V6_COM_CMN_IETRIM 0xfc
> >> +#define QSERDES_V6_COM_CMN_IPTRIM 0x100
> >> #define QSERDES_V6_COM_SYSCLK_EN_SEL 0x110
> >> #define QSERDES_V6_COM_RESETSM_CNTRL 0x118
> >> #define QSERDES_V6_COM_LOCK_CMP_EN 0x120
> >> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h b/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h
> >> index 674f158..48f31c8 100644
> >> --- a/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h
> >> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h
> >> @@ -15,8 +15,15 @@
> >>
> >> #define QSERDES_UFS_V6_RX_UCDR_FASTLOCK_FO_GAIN_RATE2 0x08
> >> #define QSERDES_UFS_V6_RX_UCDR_FASTLOCK_FO_GAIN_RATE4 0x10
> >> +#define QSERDES_UFS_V6_RX_UCDR_FASTLOCK_SO_GAIN_RATE4 0x24
> >> +#define QSERDES_UFS_V6_RX_UCDR_FASTLOCK_COUNT_HIGH_RATE4 0x54
> >> #define QSERDES_UFS_V6_RX_UCDR_FO_GAIN_RATE2 0xd4
> >> +#define QSERDES_UFS_V6_RX_UCDR_FO_GAIN_RATE4 0xdc
> >> +#define QSERDES_UFS_V6_RX_UCDR_SO_GAIN_RATE4 0xf0
> >> +#define QSERDES_UFS_V6_RX_UCDR_PI_CONTROLS 0xf4
> >> #define QSERDES_UFS_V6_RX_VGA_CAL_MAN_VAL 0x178
> >> +#define QSERDES_UFS_V6_RX_EQ_OFFSET_ADAPTOR_CNTRL1 0x1bc
> >> +#define QSERDES_UFS_V6_RX_OFFSET_ADAPTOR_CNTRL3 0x1c4
> >> #define QSERDES_UFS_V6_RX_MODE_RATE_0_1_B0 0x208
> >> #define QSERDES_UFS_V6_RX_MODE_RATE_0_1_B1 0x20c
> >> #define QSERDES_UFS_V6_RX_MODE_RATE_0_1_B3 0x214
> >> @@ -28,6 +35,8 @@
> >> #define QSERDES_UFS_V6_RX_MODE_RATE3_B5 0x264
> >> #define QSERDES_UFS_V6_RX_MODE_RATE3_B8 0x270
> >> #define QSERDES_UFS_V6_RX_MODE_RATE4_B3 0x280
> >> +#define QSERDES_UFS_V6_RX_MODE_RATE4_B4 0x284
> >> #define QSERDES_UFS_V6_RX_MODE_RATE4_B6 0x28c
> >> +#define QSERDES_UFS_V6_RX_DLL0_FTUNE_CTRL 0x2f8
> >>
> >> #endif
> >> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> >> index cae27a9..7a382c4 100644
> >> --- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> >> +++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
> >> @@ -649,15 +649,22 @@ static const struct qmp_phy_init_tbl sm8550_ufsphy_serdes[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_HSCLK_SEL_1, 0x11),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_HSCLK_HS_SWITCH_SEL_1, 0x00),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_LOCK_CMP_EN, 0x01),
> >> - QMP_PHY_INIT_CFG(QSERDES_V6_COM_VCO_TUNE_MAP, 0x04),
> >> - QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_IVCO, 0x0f),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_VCO_TUNE_INITVAL2, 0x00),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_DEC_START_MODE0, 0x41),
> >> - QMP_PHY_INIT_CFG(QSERDES_V6_COM_CP_CTRL_MODE0, 0x0a),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_RCTRL_MODE0, 0x18),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_CCTRL_MODE0, 0x14),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_LOCK_CMP1_MODE0, 0x7f),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_LOCK_CMP2_MODE0, 0x06),
> >> +};
> >> +
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_hs_b_serdes[] = {
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_VCO_TUNE_MAP, 0x44),
> >> +};
> >> +
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g4_serdes[] = {
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_VCO_TUNE_MAP, 0x04),
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_IVCO, 0x0f),
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_CP_CTRL_MODE0, 0x0a),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_DEC_START_MODE1, 0x4c),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_CP_CTRL_MODE1, 0x0a),
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_RCTRL_MODE1, 0x18),
> >> @@ -666,19 +673,24 @@ static const struct qmp_phy_init_tbl sm8550_ufsphy_serdes[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_V6_COM_LOCK_CMP2_MODE1, 0x07),
> >> };
> >>
> >> -static const struct qmp_phy_init_tbl sm8550_ufsphy_hs_b_serdes[] = {
> >> - QMP_PHY_INIT_CFG(QSERDES_V6_COM_VCO_TUNE_MAP, 0x44),
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g5_serdes[] = {
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_PLL_IVCO, 0x1f),
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_CMN_IETRIM, 0x1b),
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_CMN_IPTRIM, 0x1c),
> >> + QMP_PHY_INIT_CFG(QSERDES_V6_COM_CP_CTRL_MODE0, 0x06),
> >> };
> >>
> >> static const struct qmp_phy_init_tbl sm8550_ufsphy_tx[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_TX_LANE_MODE_1, 0x05),
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_TX_RES_CODE_LANE_OFFSET_TX, 0x07),
> >> +};
> >> +
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g4_tx[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_TX_FR_DCC_CTRL, 0x4c),
> >> };
> >>
> >> static const struct qmp_phy_init_tbl sm8550_ufsphy_rx[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_FO_GAIN_RATE2, 0x0c),
> >> - QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_VGA_CAL_MAN_VAL, 0x0e),
> >>
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE_0_1_B0, 0xc2),
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE_0_1_B1, 0xc2),
> >> @@ -694,16 +706,45 @@ static const struct qmp_phy_init_tbl sm8550_ufsphy_rx[] = {
> >> QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE3_B8, 0x02),
> >> };
> >>
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g4_rx[] = {
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_VGA_CAL_MAN_VAL, 0x0e),
> >> +};
> >> +
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g5_rx[] = {
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_FO_GAIN_RATE4, 0x0c),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_SO_GAIN_RATE4, 0x04),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_EQ_OFFSET_ADAPTOR_CNTRL1, 0x14),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_PI_CONTROLS, 0x07),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_OFFSET_ADAPTOR_CNTRL3, 0x0e),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_FASTLOCK_COUNT_HIGH_RATE4, 0x02),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_FASTLOCK_FO_GAIN_RATE4, 0x1c),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_UCDR_FASTLOCK_SO_GAIN_RATE4, 0x06),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_VGA_CAL_MAN_VAL, 0x08),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE4_B3, 0xb9),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE4_B4, 0x4f),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_MODE_RATE4_B6, 0xff),
> >> + QMP_PHY_INIT_CFG(QSERDES_UFS_V6_RX_DLL0_FTUNE_CTRL, 0x30),
> >> +};
> >> +
> >> static const struct qmp_phy_init_tbl sm8550_ufsphy_pcs[] = {
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_RX_SIGDET_CTRL2, 0x69),
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_TX_LARGE_AMP_DRV_LVL, 0x0f),
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_TX_MID_TERM_CTRL1, 0x43),
> >> - QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_PLL_CNTL, 0x2b),
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_MULTI_LANE_CTRL1, 0x02),
> >> +};
> >> +
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g4_pcs[] = {
> >> + QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_PLL_CNTL, 0x2b),
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_TX_HSGEAR_CAPABILITY, 0x04),
> >> QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_RX_HSGEAR_CAPABILITY, 0x04),
> >> };
> >>
> >> +static const struct qmp_phy_init_tbl sm8550_ufsphy_g5_pcs[] = {
> >> + QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_PLL_CNTL, 0x33),
> >> + QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_RX_HS_G5_SYNC_LENGTH_CAPABILITY, 0x4f),
> >> + QMP_PHY_INIT_CFG(QPHY_V6_PCS_UFS_RX_HSG5_SYNC_WAIT_TIME, 0x9e),
> >> +};
> >> +
> >> struct qmp_ufs_offsets {
> >> u16 serdes;
> >> u16 pcs;
> >> @@ -735,6 +776,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 Gears which are lower than the maximum supported HS Gear */
> >> + const struct qmp_phy_cfg_tbls tbls_hs_not_max;
> >
> > I doubt that this is a good solution. What if at some point we want to
> > have a third option? Would we add no-so-max? Or tbls-hs-in-the-middle?
> > > If you want to make this configurable, you can implement the array of
> > gear-setting pairs and then loop over that array, selecting the
> > correct programming sequence.
>
> ok.
>
> >
> >> /* Additional sequence for maximum supported HS Gear */
> >> const struct qmp_phy_cfg_tbls tbls_hs_max;
> >>
> >> @@ -1155,7 +1198,7 @@ static const struct qmp_phy_cfg sm8550_ufsphy_cfg = {
> >> .lanes = 2,
> >>
> >> .offsets = &qmp_ufs_offsets_v6,
> >> - .max_hs_gear = UFS_HS_G4,
> >> + .max_hs_gear = UFS_HS_G5,
> >> .tbls = {
> >> .serdes = sm8550_ufsphy_serdes,
> >> .serdes_num = ARRAY_SIZE(sm8550_ufsphy_serdes),
> >> @@ -1170,6 +1213,24 @@ static const struct qmp_phy_cfg sm8550_ufsphy_cfg = {
> >> .serdes = sm8550_ufsphy_hs_b_serdes,
> >> .serdes_num = ARRAY_SIZE(sm8550_ufsphy_hs_b_serdes),
> >> },
> >> + .tbls_hs_not_max = {
> >> + .serdes = sm8550_ufsphy_g4_serdes,
> >> + .serdes_num = ARRAY_SIZE(sm8550_ufsphy_g4_serdes),
> >> + .tx = sm8550_ufsphy_g4_tx,
> >> + .tx_num = ARRAY_SIZE(sm8550_ufsphy_g4_tx),
> >> + .rx = sm8550_ufsphy_g4_rx,
> >> + .rx_num = ARRAY_SIZE(sm8550_ufsphy_g4_rx),
> >> + .pcs = sm8550_ufsphy_g4_pcs,
> >> + .pcs_num = ARRAY_SIZE(sm8550_ufsphy_g4_pcs),
> >> + },
> >> + .tbls_hs_max = {
> >> + .serdes = sm8550_ufsphy_g5_serdes,
> >> + .serdes_num = ARRAY_SIZE(sm8550_ufsphy_g5_serdes),
> >> + .rx = sm8550_ufsphy_g5_rx,
> >> + .rx_num = ARRAY_SIZE(sm8550_ufsphy_g5_rx),
> >> + .pcs = sm8550_ufsphy_g5_pcs,
> >> + .pcs_num = ARRAY_SIZE(sm8550_ufsphy_g5_pcs),
> >> + },
> >> .clk_list = sdm845_ufs_phy_clk_l,
> >> .num_clks = ARRAY_SIZE(sdm845_ufs_phy_clk_l),
> >> .vreg_list = qmp_phy_vreg_l,
> >> @@ -1232,17 +1293,36 @@ static void qmp_ufs_pcs_init(struct qmp_ufs *qmp, const struct qmp_phy_cfg_tbls
> >> qmp_ufs_configure(pcs, tbls->pcs, tbls->pcs_num);
> >> }
> >>
> >> -static void qmp_ufs_init_registers(struct qmp_ufs *qmp, const struct qmp_phy_cfg *cfg)
> >> +static int qmp_ufs_init_registers(struct qmp_ufs *qmp, const struct qmp_phy_cfg *cfg)
> >> {
> >> + if (qmp->submode > cfg->max_hs_gear) {
> >> + dev_err(qmp->dev, "PHY submode %u exceeds maximum supported gear %u\n",
> >> + qmp->submode, cfg->max_hs_gear);
> >> + return -EINVAL;
> >> + }
> >> +
> >> qmp_ufs_serdes_init(qmp, &cfg->tbls);
> >> + if (qmp->submode == cfg->max_hs_gear)
> >> + qmp_ufs_serdes_init(qmp, &cfg->tbls_hs_max);
> >> + else
> >> + qmp_ufs_serdes_init(qmp, &cfg->tbls_hs_not_max);
> >> +
> >> 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 == cfg->max_hs_gear)
> >> qmp_ufs_lanes_init(qmp, &cfg->tbls_hs_max);
> >> + else
> >> + qmp_ufs_lanes_init(qmp, &cfg->tbls_hs_not_max);
> >> +
> >> qmp_ufs_pcs_init(qmp, &cfg->tbls);
> >> if (qmp->submode == cfg->max_hs_gear)
> >> qmp_ufs_pcs_init(qmp, &cfg->tbls_hs_max);
> >> + else
> >> + qmp_ufs_pcs_init(qmp, &cfg->tbls_hs_not_max);
> >
> > Also, if I remember correctly from your and Mani's comments, the UFS
> > host will not set HS_G2 on this SoC. Is my understanding correct?
> > If so, I think, requesting the mode for which the driver doesn't have
> > correct settings should result in the error rather than silently using
> > the better gear.
> >
> > Note: I might be wrong here. If it is really fine to use e.g. HS_G4
> > settings as HS_G2, then it is fine.
>
> Use HS-G4 setting, and put the UFS in HS-G2 mode is OK, HS_G4 settings
> support HS-G4 and any lower gear modes, so it is fine.
>
> For any given platforms, our chipset validation team validate all
> possible gear modes with one set of settings, e.g., they validate
> G1/G2/G3/G4 modes with G4 settings and G1/G2/G3/G4/G5 modes with G5
> settings.
Ack.
>
> Thanks,
> Can Guo.
> >
> >> +
> >> + return 0;
> >> }
> >>
> >> static int qmp_ufs_com_init(struct qmp_ufs *qmp)
> >> @@ -1334,7 +1414,9 @@ static int qmp_ufs_power_on(struct phy *phy)
> >> unsigned int val;
> >> int ret;
> >>
> >> - qmp_ufs_init_registers(qmp, cfg);
> >> + ret = qmp_ufs_init_registers(qmp, cfg);
> >> + if (ret)
> >> + return ret;
> >>
> >> ret = reset_control_deassert(qmp->ufs_reset);
> >> if (ret)
> >> --
> >> 2.7.4
> >>
> >>
> >
> >
--
With best wishes
Dmitry
