Messages in this thread | ![/](/images/icornerl.gif) | | Date | Fri, 13 Oct 2017 18:02:39 -0700 | From | Subhash Jadavani <> | Subject | Re: [PATCH v2 5/5] ufs/phy: qcom: Refactor to use phy_init call |
| |
On 2017-10-11 23:19, Vivek Gautam wrote: > Refactor ufs_qcom_power_up_sequence() to get rid of ugly > exported phy APIs and use the phy_init() and phy_power_on() > to do the phy initialization. > > Signed-off-by: Vivek Gautam <vivek.gautam@codeaurora.org> > --- > > Changes since v1: > - The UFS phy retain state in low power mode. The phy can > enter the low power state and come up without starting the > serdes again, unless we reprogram the phy. > So, added a check to start the serdes only once after phy > initialization. > > drivers/phy/qualcomm/phy-qcom-ufs-i.h | 3 +- > drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c | 15 ++++++++-- > drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c | 15 ++++++++-- > drivers/phy/qualcomm/phy-qcom-ufs.c | 42 > ++++++++++------------------ > drivers/scsi/ufs/ufs-qcom.c | 36 > ++++++++++-------------- > include/linux/phy/phy-qcom-ufs.h | 3 -- > 6 files changed, 55 insertions(+), 59 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-i.h > b/drivers/phy/qualcomm/phy-qcom-ufs-i.h > index 94326ed107c3..822c83b8efcd 100644 > --- a/drivers/phy/qualcomm/phy-qcom-ufs-i.h > +++ b/drivers/phy/qualcomm/phy-qcom-ufs-i.h > @@ -114,6 +114,7 @@ struct ufs_qcom_phy { > struct ufs_qcom_phy_calibration *cached_regs; > int cached_regs_table_size; > bool is_powered_on; > + bool is_started; > struct ufs_qcom_phy_specific_ops *phy_spec_ops; > > enum phy_mode mode; > @@ -123,7 +124,6 @@ struct ufs_qcom_phy { > * struct ufs_qcom_phy_specific_ops - set of pointers to functions > which have a > * specific implementation per phy. Each UFS phy, should implement > * those functions according to its spec and requirements > - * @calibrate_phy: pointer to a function that calibrate the phy > * @start_serdes: pointer to a function that starts the serdes > * @is_physical_coding_sublayer_ready: pointer to a function that > * checks pcs readiness. returns 0 for success and non-zero for error. > @@ -132,7 +132,6 @@ struct ufs_qcom_phy { > * and writes to QSERDES_RX_SIGDET_CNTRL attribute > */ > struct ufs_qcom_phy_specific_ops { > - int (*calibrate_phy)(struct ufs_qcom_phy *phy, bool is_rate_B); > void (*start_serdes)(struct ufs_qcom_phy *phy); > int (*is_physical_coding_sublayer_ready)(struct ufs_qcom_phy *phy); > void (*set_tx_lane_enable)(struct ufs_qcom_phy *phy, u32 val); > diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c > b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c > index af65785230b5..ba1895b76a5d 100644 > --- a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c > +++ b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c > @@ -44,7 +44,19 @@ void ufs_qcom_phy_qmp_14nm_advertise_quirks(struct > ufs_qcom_phy *phy_common) > > static int ufs_qcom_phy_qmp_14nm_init(struct phy *generic_phy) > { > - return 0; > + struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy); > + bool is_rate_B = false; > + int ret; > + > + if (phy_common->mode == PHY_MODE_UFS_HS_B) > + is_rate_B = true; > + > + ret = ufs_qcom_phy_qmp_14nm_phy_calibrate(phy_common, is_rate_B); > + if (!ret) > + /* phy calibrated, but yet to be started */ > + phy_common->is_started = false; > + > + return ret; > } > > static int ufs_qcom_phy_qmp_14nm_exit(struct phy *generic_phy) > @@ -120,7 +132,6 @@ static int > ufs_qcom_phy_qmp_14nm_is_pcs_ready(struct ufs_qcom_phy *phy_common) > }; > > static struct ufs_qcom_phy_specific_ops phy_14nm_ops = { > - .calibrate_phy = ufs_qcom_phy_qmp_14nm_phy_calibrate, > .start_serdes = ufs_qcom_phy_qmp_14nm_start_serdes, > .is_physical_coding_sublayer_ready = > ufs_qcom_phy_qmp_14nm_is_pcs_ready, > .set_tx_lane_enable = ufs_qcom_phy_qmp_14nm_set_tx_lane_enable, > diff --git a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c > b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c > index 5c18c41dbdb4..49f435c71147 100644 > --- a/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c > +++ b/drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c > @@ -63,7 +63,19 @@ void ufs_qcom_phy_qmp_20nm_advertise_quirks(struct > ufs_qcom_phy *phy_common) > > static int ufs_qcom_phy_qmp_20nm_init(struct phy *generic_phy) > { > - return 0; > + struct ufs_qcom_phy *phy_common = get_ufs_qcom_phy(generic_phy); > + bool is_rate_B = false; > + int ret; > + > + if (phy_common->mode == PHY_MODE_UFS_HS_B) > + is_rate_B = true; > + > + ret = ufs_qcom_phy_qmp_20nm_phy_calibrate(phy_common, is_rate_B); > + if (!ret) > + /* phy calibrated, but yet to be started */ > + phy_common->is_started = false; > + > + return ret; > } > > static int ufs_qcom_phy_qmp_20nm_exit(struct phy *generic_phy) > @@ -178,7 +190,6 @@ static int > ufs_qcom_phy_qmp_20nm_is_pcs_ready(struct ufs_qcom_phy *phy_common) > }; > > static struct ufs_qcom_phy_specific_ops phy_20nm_ops = { > - .calibrate_phy = ufs_qcom_phy_qmp_20nm_phy_calibrate, > .start_serdes = ufs_qcom_phy_qmp_20nm_start_serdes, > .is_physical_coding_sublayer_ready = > ufs_qcom_phy_qmp_20nm_is_pcs_ready, > .set_tx_lane_enable = ufs_qcom_phy_qmp_20nm_set_tx_lane_enable, > diff --git a/drivers/phy/qualcomm/phy-qcom-ufs.c > b/drivers/phy/qualcomm/phy-qcom-ufs.c > index 43865ef340e2..c5ff4525edef 100644 > --- a/drivers/phy/qualcomm/phy-qcom-ufs.c > +++ b/drivers/phy/qualcomm/phy-qcom-ufs.c > @@ -518,9 +518,8 @@ void ufs_qcom_phy_disable_iface_clk(struct > ufs_qcom_phy *phy) > } > } > > -int ufs_qcom_phy_start_serdes(struct phy *generic_phy) > +static int ufs_qcom_phy_start_serdes(struct ufs_qcom_phy > *ufs_qcom_phy) > { > - struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy); > int ret = 0; > > if (!ufs_qcom_phy->phy_spec_ops->start_serdes) { > @@ -533,7 +532,6 @@ int ufs_qcom_phy_start_serdes(struct phy > *generic_phy) > > return ret; > } > -EXPORT_SYMBOL_GPL(ufs_qcom_phy_start_serdes); > > int ufs_qcom_phy_set_tx_lane_enable(struct phy *generic_phy, u32 > tx_lanes) > { > @@ -564,31 +562,8 @@ void ufs_qcom_phy_save_controller_version(struct > phy *generic_phy, > } > EXPORT_SYMBOL_GPL(ufs_qcom_phy_save_controller_version); > > -int ufs_qcom_phy_calibrate_phy(struct phy *generic_phy, bool > is_rate_B) > -{ > - struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy); > - int ret = 0; > - > - if (!ufs_qcom_phy->phy_spec_ops->calibrate_phy) { > - dev_err(ufs_qcom_phy->dev, "%s: calibrate_phy() callback is not > supported\n", > - __func__); > - ret = -ENOTSUPP; > - } else { > - ret = ufs_qcom_phy->phy_spec_ops-> > - calibrate_phy(ufs_qcom_phy, is_rate_B); > - if (ret) > - dev_err(ufs_qcom_phy->dev, "%s: calibrate_phy() failed %d\n", > - __func__, ret); > - } > - > - return ret; > -} > -EXPORT_SYMBOL_GPL(ufs_qcom_phy_calibrate_phy); > - > -int ufs_qcom_phy_is_pcs_ready(struct phy *generic_phy) > +static int ufs_qcom_phy_is_pcs_ready(struct ufs_qcom_phy > *ufs_qcom_phy) > { > - struct ufs_qcom_phy *ufs_qcom_phy = get_ufs_qcom_phy(generic_phy); > - > if (!ufs_qcom_phy->phy_spec_ops->is_physical_coding_sublayer_ready) { > dev_err(ufs_qcom_phy->dev, "%s: is_physical_coding_sublayer_ready() > callback is not supported\n", > __func__); > @@ -598,7 +573,6 @@ int ufs_qcom_phy_is_pcs_ready(struct phy > *generic_phy) > return ufs_qcom_phy->phy_spec_ops-> > is_physical_coding_sublayer_ready(ufs_qcom_phy); > } > -EXPORT_SYMBOL_GPL(ufs_qcom_phy_is_pcs_ready); > > int ufs_qcom_phy_power_on(struct phy *generic_phy) > { > @@ -609,6 +583,18 @@ int ufs_qcom_phy_power_on(struct phy *generic_phy) > if (phy_common->is_powered_on) > return 0; > > + if (!phy_common->is_started) { > + err = ufs_qcom_phy_start_serdes(phy_common); > + if (err) > + return err; > + > + err = ufs_qcom_phy_is_pcs_ready(phy_common); > + if (err) > + return err; > + > + phy_common->is_started = true; > + } > + > err = ufs_qcom_phy_enable_vreg(dev, &phy_common->vdda_phy); > if (err) { > dev_err(dev, "%s enable vdda_phy failed, err=%d\n", > diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c > index 942e40c9eaf7..2b38db2eeafa 100644 > --- a/drivers/scsi/ufs/ufs-qcom.c > +++ b/drivers/scsi/ufs/ufs-qcom.c > @@ -281,10 +281,10 @@ static int ufs_qcom_power_up_sequence(struct > ufs_hba *hba) > /* provide 1ms delay to let the reset pulse propagate */ > usleep_range(1000, 1100); > > - ret = ufs_qcom_phy_calibrate_phy(phy, is_rate_B); > - > + /* phy initialization - calibrate the phy */ > + ret = phy_init(phy); > if (ret) { > - dev_err(hba->dev, "%s: ufs_qcom_phy_calibrate_phy() failed, ret = > %d\n", > + dev_err(hba->dev, "%s: phy init failed, ret = %d\n", > __func__, ret); > goto out; > } > @@ -297,21 +297,22 @@ static int ufs_qcom_power_up_sequence(struct > ufs_hba *hba) > * voltage, current to settle down before starting serdes. > */ > usleep_range(1000, 1100); > - ret = ufs_qcom_phy_start_serdes(phy); > + > + /* power on phy - start serdes and phy's power and clocks */ > + ret = phy_power_on(phy); > if (ret) { > - dev_err(hba->dev, "%s: ufs_qcom_phy_start_serdes() failed, ret = > %d\n", > + dev_err(hba->dev, "%s: phy power on failed, ret = %d\n", > __func__, ret); > - goto out; > + goto out_disable_phy; > } > > - ret = ufs_qcom_phy_is_pcs_ready(phy); > - if (ret) > - dev_err(hba->dev, > - "%s: is_physical_coding_sublayer_ready() failed, ret = %d\n", > - __func__, ret); > - > ufs_qcom_select_unipro_mode(host); > > + return 0; > + > +out_disable_phy: > + ufs_qcom_assert_reset(hba); > + phy_exit(phy); > out: > return ret; > } > @@ -1276,14 +1277,9 @@ static int ufs_qcom_init(struct ufs_hba *hba) > ufs_qcom_phy_save_controller_version(host->generic_phy, > host->hw_ver.major, host->hw_ver.minor, host->hw_ver.step); > > - phy_init(host->generic_phy); > - err = phy_power_on(host->generic_phy); > - if (err) > - goto out_unregister_bus; > - > err = ufs_qcom_init_lane_clks(host); > if (err) > - goto out_disable_phy; > + goto out_variant_clear; > > ufs_qcom_set_caps(hba); > ufs_qcom_advertise_quirks(hba); > @@ -1304,10 +1300,6 @@ static int ufs_qcom_init(struct ufs_hba *hba) > > goto out; > > -out_disable_phy: > - phy_power_off(host->generic_phy); > -out_unregister_bus: > - phy_exit(host->generic_phy); > out_variant_clear: > ufshcd_set_variant(hba, NULL); > out: > diff --git a/include/linux/phy/phy-qcom-ufs.h > b/include/linux/phy/phy-qcom-ufs.h > index 35c070ea6ea3..0a2c18a9771d 100644 > --- a/include/linux/phy/phy-qcom-ufs.h > +++ b/include/linux/phy/phy-qcom-ufs.h > @@ -31,10 +31,7 @@ > */ > void ufs_qcom_phy_disable_dev_ref_clk(struct phy *phy); > > -int ufs_qcom_phy_start_serdes(struct phy *phy); > int ufs_qcom_phy_set_tx_lane_enable(struct phy *phy, u32 tx_lanes); > -int ufs_qcom_phy_calibrate_phy(struct phy *phy, bool is_rate_B); > -int ufs_qcom_phy_is_pcs_ready(struct phy *phy); > void ufs_qcom_phy_save_controller_version(struct phy *phy, > u8 major, u16 minor, u16 step);
Looks good to me. Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org>
-- The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
| ![\](/images/icornerr.gif) |