From: Hongxing Zhu <hongxing.zhu@nxp.com>
To: Lucas Stach <l.stach@pengutronix.de>,
"bhelgaas@google.com" <bhelgaas@google.com>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"broonie@kernel.org" <broonie@kernel.org>,
"lorenzo.pieralisi@arm.com" <lorenzo.pieralisi@arm.com>,
"festevam@gmail.com" <festevam@gmail.com>,
"francesco.dolcini@toradex.com" <francesco.dolcini@toradex.com>
Cc: "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"kernel@pengutronix.de" <kernel@pengutronix.de>,
dl-linux-imx <linux-imx@nxp.com>
Subject: RE: [PATCH v14 11/17] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset()
Date: Wed, 13 Jul 2022 10:57:10 +0000 [thread overview]
Message-ID: <AS8PR04MB86769857515B8B199F4F3F578C899@AS8PR04MB8676.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <2cfe481fdbd074ef6ff7e95bf32b5c99e6a26aca.camel@pengutronix.de>
> -----Original Message-----
> From: Lucas Stach <l.stach@pengutronix.de>
> Sent: 2022年7月13日 16:41
> To: Hongxing Zhu <hongxing.zhu@nxp.com>; bhelgaas@google.com;
> robh+dt@kernel.org; broonie@kernel.org; lorenzo.pieralisi@arm.com;
> festevam@gmail.com; francesco.dolcini@toradex.com
> Cc: linux-pci@vger.kernel.org; linux-arm-kernel@lists.infradead.org;
> linux-kernel@vger.kernel.org; kernel@pengutronix.de; dl-linux-imx
> <linux-imx@nxp.com>
> Subject: Re: [PATCH v14 11/17] PCI: imx6: Move regulator enable out of
> imx6_pcie_deassert_core_reset()
>
> Am Freitag, dem 01.07.2022 um 11:25 +0800 schrieb Richard Zhu:
> > Move regulator enable out of imx6_pcie_deassert_core_reset(), since
> > the
> > regulator_enable() has nothing to do in with
> > imx6_pcie_deassert_core_reset().
> >
> > Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
>
> Ah, so you are doing things in two steps. Disregard my first comment on the
> last patch then.
Thanks.
>
> > ---
> > drivers/pci/controller/dwc/pci-imx6.c | 36
> > ++++++++++++---------------
> > 1 file changed, 16 insertions(+), 20 deletions(-)
> >
> > diff --git a/drivers/pci/controller/dwc/pci-imx6.c
> > b/drivers/pci/controller/dwc/pci-imx6.c
> > index f72eb609769b..0b168f0d57b8 100644
> > --- a/drivers/pci/controller/dwc/pci-imx6.c
> > +++ b/drivers/pci/controller/dwc/pci-imx6.c
> > @@ -712,19 +712,10 @@ static int imx6_pcie_deassert_core_reset(struct
> imx6_pcie *imx6_pcie)
> > struct device *dev = pci->dev;
> > int ret;
> >
> > - if (imx6_pcie->vpcie) {
> > - ret = regulator_enable(imx6_pcie->vpcie);
> > - if (ret) {
> > - dev_err(dev, "failed to enable vpcie regulator: %d\n",
> > - ret);
> > - return ret;
> > - }
> > - }
> > -
> > ret = imx6_pcie_clk_enable(imx6_pcie);
> > if (ret) {
> > dev_err(dev, "unable to enable pcie clocks: %d\n", ret);
> > - goto err_clks;
> > + return ret;
> > }
> >
> > switch (imx6_pcie->drvdata->variant) { @@ -783,15 +774,6 @@ static
> > int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
> > }
> >
> > return 0;
> > -
> > -err_clks:
> > - if (imx6_pcie->vpcie) {
> > - ret = regulator_disable(imx6_pcie->vpcie);
> > - if (ret)
> > - dev_err(dev, "failed to disable vpcie regulator: %d\n",
> > - ret);
> > - }
> > - return ret;
> > }
> >
> > static int imx6_pcie_wait_for_speed_change(struct imx6_pcie
> > *imx6_pcie) @@ -916,15 +898,29 @@ static int
> > imx6_pcie_host_init(struct pcie_port *pp)
> >
> > imx6_pcie_assert_core_reset(imx6_pcie);
> > imx6_pcie_init_phy(imx6_pcie);
> > + if (imx6_pcie->vpcie) {
> > + ret = regulator_enable(imx6_pcie->vpcie);
> > + if (ret) {
> > + dev_err(dev, "failed to enable vpcie regulator: %d\n",
> > + ret);
> > + return ret;
>
> If the regulator enable fails, you don't roll back the PHY init and core reset. This
> seems harmless now, but might have unintended consequences if the PHY
> code changes. I think it should be safe to move the regulator enable before the
> PHY init and core reset assert to avoid introducing more failure cleanup paths
> here.
To keep the same behavior, I just place the regulator_enable() in front of
imx6_pcie_deassert_core_reset().
It makes sense to move it earlier to avoid the possible failure cleanup of
imx6_pcie_assert_core_reset() and imx6_pcie_init_phy() in future.
Best Regards
Richard
>
> Regards,
> Lucas
>
> > + }
> > + }
> > +
> > ret = imx6_pcie_deassert_core_reset(imx6_pcie);
> > if (ret < 0) {
> > dev_err(dev, "pcie deassert core reset failed: %d\n", ret);
> > - return ret;
> > + goto err_reg_disable;
> > }
> >
> > imx6_setup_phy_mpll(imx6_pcie);
> >
> > return 0;
> > +
> > +err_reg_disable:
> > + if (imx6_pcie->vpcie)
> > + regulator_disable(imx6_pcie->vpcie);
> > + return ret;
> > }
> >
> > static const struct dw_pcie_host_ops imx6_pcie_host_ops = {
>
next prev parent reply other threads:[~2022-07-13 10:57 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 3:25 [PATCH v14 0/17] PCI: imx6: refine codes and add the error propagation Richard Zhu
2022-07-01 3:25 ` [PATCH v14 01/17] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Richard Zhu
2022-07-13 8:13 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 02/17] PCI: imx6: Move PHY management functions together Richard Zhu
2022-07-13 8:15 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 03/17] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Richard Zhu
2022-07-13 8:16 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 04/17] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu
2022-07-01 3:25 ` [PATCH v14 05/17] PCI: imx6: Factor out ref clock disable to match enable Richard Zhu
2022-07-13 8:17 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 06/17] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Richard Zhu
2022-07-01 3:25 ` [PATCH v14 07/17] PCI: imx6: Propagate .host_init() errors to caller Richard Zhu
2022-07-01 3:25 ` [PATCH v14 08/17] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Richard Zhu
2022-07-01 3:25 ` [PATCH v14 09/17] PCI: imx6: Call host init function directly in resume Richard Zhu
2022-07-13 8:26 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 10/17] PCI: imx6: Turn off regulator when system is in suspend mode Richard Zhu
2022-07-13 8:34 ` Lucas Stach
2022-07-13 10:56 ` Hongxing Zhu
2022-07-13 11:22 ` Lucas Stach
2022-07-13 12:55 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 11/17] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset() Richard Zhu
2022-07-13 8:41 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu [this message]
2022-07-01 3:25 ` [PATCH v14 12/17] PCI: imx6: Mark the link down as non-fatal error Richard Zhu
2022-07-13 8:44 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 13/17] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Richard Zhu
2022-07-13 8:47 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 14/17] PCI: imx6: Do not hide phy driver callbacks and refine the error handling Richard Zhu
2022-07-13 8:58 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu
2022-07-13 11:17 ` Lucas Stach
2022-07-13 12:52 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 15/17] PCI: imx6: Disable clocks in reverse order of enable Richard Zhu
2022-07-13 8:59 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 16/17] PCI: imx6: Move the imx6_pcie_ltssm_disable() earlier Richard Zhu
2022-07-13 9:04 ` Lucas Stach
2022-07-13 11:00 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 17/17] PCI: imx6: Reformat suspend callback to keep symmetric with resume Richard Zhu
2022-07-13 9:07 ` Lucas Stach
2022-07-11 22:29 ` [PATCH v14 0/17] PCI: imx6: refine codes and add the error propagation Bjorn Helgaas
2022-07-13 16:45 ` Bjorn Helgaas
2022-07-14 4:15 ` Hongxing Zhu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AS8PR04MB86769857515B8B199F4F3F578C899@AS8PR04MB8676.eurprd04.prod.outlook.com \
--to=hongxing.zhu@nxp.com \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=francesco.dolcini@toradex.com \
--cc=kernel@pengutronix.de \
--cc=l.stach@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).