On Mon, Nov 06, 2023 at 08:46:09PM -0800, Can Guo wrote: > From: Can Guo <quic_cang@xxxxxxxxxxx> > > During host driver init, the phy_gear is set to the minimum supported gear > (HS_G2). Then, during the first power mode change, the negotiated gear, say > HS-G4, is updated to the phy_gear variable so that in the second init the > updated phy_gear can be used to program the PHY. > > But the current code only allows update the phy_gear to a higher value. If > one wants to start the first init with the maximum support gear, say HS-G4, > the phy_gear is not updated to HS-G3 if the device only supports HS-G3. > Can you elaborate when this can happen? AFAICS, there are 3 possibilities of initial phy gear with this series: 1. If ufshc is < 5.0, then G2 will be used. 2. If ufshc is >= 5.0 and if the version is populated in register, then that gear will be used. Most likely that gear can be G4/G5 depending on the device connected. 3. If ufshc is >=5.0 and version is not populated, then G4 will be used. In all the above cases, I do not see any necessity to switch the phy gear setting to lower one while scaling. Since the gears are backwards compatible, we always use one phy gear sequence. Moreover, we only have 2 init sequences. Please correct me if I'm missing anything. - Mani > The original check added there is intend to make sure the phy_gear won't be > updated when gear is scaled down (during clock scaling). Update the check > so that one can start the first init with the maximum support gear without > breaking the original fix by checking the ufshcd_state, that is, allow > update to phy_gear only if power mode change is invoked from > ufshcd_probe_hba(). > > This change is a preparation patch for the next patches in the same series. > > Signed-off-by: Can Guo <quic_cang@xxxxxxxxxxx> > --- > drivers/ufs/host/ufs-qcom.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c > index cc0eb37..60b35ca 100644 > --- a/drivers/ufs/host/ufs-qcom.c > +++ b/drivers/ufs/host/ufs-qcom.c > @@ -916,11 +916,12 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba, > } > > /* > - * Update phy_gear only when the gears are scaled to a higher value. This is > - * because, the PHY gear settings are backwards compatible and we only need to > - * change the PHY gear settings while scaling to higher gears. > + * During UFS driver probe, always update the PHY gear to match the negotiated > + * gear, so that, if quirk UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH is enabled, > + * the second init can program the optimal PHY settings. This allows one to start > + * the first init with either the minimum or the maximum support gear. > */ > - if (dev_req_params->gear_tx > host->phy_gear) > + if (hba->ufshcd_state == UFSHCD_STATE_RESET) > host->phy_gear = dev_req_params->gear_tx; > > /* enable the device ref clock before changing to HS mode */ > -- > 2.7.4 > -- மணிவண்ணன் சதாசிவம்
