Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754564AbeALI1M (ORCPT + 1 other); Fri, 12 Jan 2018 03:27:12 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:34336 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754377AbeALI1J (ORCPT ); Fri, 12 Jan 2018 03:27:09 -0500 DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 98AEB60214 Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=vivek.gautam@codeaurora.org X-Google-Smtp-Source: ACJfBovNm4rSVFXvH2ZKFGpMJ4Ct9M6nWpAnKEIem7fHg+wk/mjc8QbTF5SyF1dUROdtdJctNHo9hMhlFt+SCUSkdIY= MIME-Version: 1.0 In-Reply-To: <1514978930-31341-4-git-send-email-mgautam@codeaurora.org> References: <1514978930-31341-1-git-send-email-mgautam@codeaurora.org> <1514978930-31341-4-git-send-email-mgautam@codeaurora.org> From: Vivek Gautam Date: Fri, 12 Jan 2018 13:57:07 +0530 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v4 03/16] phy: qcom-qmp: Power-on PHY before initialization To: Manu Gautam Cc: Kishon Vijay Abraham I , Felipe Balbi , linux-arm-msm , Linux USB Mailing List , Varadarajan Narayanan , Yoshihiro Shimoda , Fengguang Wu , Wei Yongjun , "open list:GENERIC PHY FRAMEWORK" , Subhash Jadavani Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On Wed, Jan 3, 2018 at 4:58 PM, Manu Gautam wrote: > PHY regulators which are enabled from power_on() must be ON > before turning-on clocks and initializing it as part of init(). > As most of the core drivers perform power_on() after init(), move > PHY regulators enable to com_init() and use power_on() to > only enable pipe_clk. This pipe_clk is output from PHY and some > core drivers e.g. PCIe follow specific sequence after phy_init() > that mandates pipe_clk to be enabled from power_on() only. > On similar lines move clk_enable from init() to com_init() which > executes once for multi lane PHYs. > > Signed-off-by: Manu Gautam > --- Adding Subhash Jadvani to look at this change from UFS perspective. > drivers/phy/qualcomm/phy-qcom-qmp.c | 61 +++++++++++++++---------------------- > 1 file changed, 24 insertions(+), 37 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c > index 5fed1ae..1b82cea 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -724,36 +724,13 @@ static int qcom_qmp_phy_poweron(struct phy *phy) > { > struct qmp_phy *qphy = phy_get_drvdata(phy); > struct qcom_qmp *qmp = qphy->qmp; > - int num = qmp->cfg->num_vregs; > int ret; > > - dev_vdbg(&phy->dev, "Powering on QMP phy\n"); > - > - /* turn on regulator supplies */ > - ret = regulator_bulk_enable(num, qmp->vregs); > - if (ret) { > - dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret); > - return ret; > - } > - > ret = clk_prepare_enable(qphy->pipe_clk); > - if (ret) { > + if (ret) > dev_err(qmp->dev, "pipe_clk enable failed, err=%d\n", ret); > - regulator_bulk_disable(num, qmp->vregs); > - return ret; > - } > > - return 0; > -} > - > -static int qcom_qmp_phy_poweroff(struct phy *phy) > -{ > - struct qmp_phy *qphy = phy_get_drvdata(phy); > - struct qcom_qmp *qmp = qphy->qmp; > - > - regulator_bulk_disable(qmp->cfg->num_vregs, qmp->vregs); > - > - return 0; > + return ret; > } > > static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp) > @@ -768,6 +745,19 @@ static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp) > return 0; > } > > + /* turn on regulator supplies */ > + ret = regulator_bulk_enable(cfg->num_vregs, qmp->vregs); > + if (ret) { > + dev_err(qmp->dev, "failed to enable regulators, err=%d\n", ret); > + goto err_reg_enable; > + } > + > + ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks); > + if (ret) { > + dev_err(qmp->dev, "failed to enable clks, err=%d\n", ret); > + goto err_clk_enable; > + } > + > for (i = 0; i < cfg->num_resets; i++) { > ret = reset_control_deassert(qmp->resets[i]); > if (ret) { > @@ -812,6 +802,10 @@ static int qcom_qmp_phy_com_init(struct qcom_qmp *qmp) > err_rst: > while (--i >= 0) > reset_control_assert(qmp->resets[i]); > + clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks); > +err_clk_enable: > + regulator_bulk_disable(cfg->num_vregs, qmp->vregs); > +err_reg_enable: > mutex_unlock(&qmp->phy_mutex); > > return ret; > @@ -841,6 +835,10 @@ static int qcom_qmp_phy_com_exit(struct qcom_qmp *qmp) > while (--i >= 0) > reset_control_assert(qmp->resets[i]); > > + clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks); > + > + regulator_bulk_disable(cfg->num_vregs, qmp->vregs); > + > mutex_unlock(&qmp->phy_mutex); > > return 0; > @@ -861,15 +859,9 @@ static int qcom_qmp_phy_init(struct phy *phy) > > dev_vdbg(qmp->dev, "Initializing QMP phy\n"); > > - ret = clk_bulk_prepare_enable(cfg->num_clks, qmp->clks); > - if (ret) { > - dev_err(qmp->dev, "failed to enable clks, err=%d\n", ret); > - return ret; > - } > - > ret = qcom_qmp_phy_com_init(qmp); > if (ret) > - goto err_com_init; > + return ret; > > if (cfg->has_lane_rst) { > ret = reset_control_deassert(qphy->lane_rst); > @@ -917,8 +909,6 @@ static int qcom_qmp_phy_init(struct phy *phy) > reset_control_assert(qphy->lane_rst); > err_lane_rst: > qcom_qmp_phy_com_exit(qmp); > -err_com_init: > - clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks); > > return ret; > } > @@ -945,8 +935,6 @@ static int qcom_qmp_phy_exit(struct phy *phy) > > qcom_qmp_phy_com_exit(qmp); > > - clk_bulk_disable_unprepare(cfg->num_clks, qmp->clks); > - > return 0; > } > > @@ -1060,7 +1048,6 @@ static int phy_pipe_clk_register(struct qcom_qmp *qmp, struct device_node *np) > .init = qcom_qmp_phy_init, > .exit = qcom_qmp_phy_exit, > .power_on = qcom_qmp_phy_poweron, > - .power_off = qcom_qmp_phy_poweroff, > .owner = THIS_MODULE, > }; > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project > > -- > To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation