From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4A76AC433EF for ; Wed, 13 Jul 2022 08:42:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235523AbiGMImR (ORCPT ); Wed, 13 Jul 2022 04:42:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235740AbiGMIlf (ORCPT ); Wed, 13 Jul 2022 04:41:35 -0400 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 25321EB01E for ; Wed, 13 Jul 2022 01:41:19 -0700 (PDT) Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=[IPv6:::1]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oBXvg-0004GD-PG; Wed, 13 Jul 2022 10:41:08 +0200 Message-ID: <2cfe481fdbd074ef6ff7e95bf32b5c99e6a26aca.camel@pengutronix.de> Subject: Re: [PATCH v14 11/17] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset() From: Lucas Stach To: Richard Zhu , 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, linux-imx@nxp.com Date: Wed, 13 Jul 2022 10:41:07 +0200 In-Reply-To: <1656645935-1370-12-git-send-email-hongxing.zhu@nxp.com> References: <1656645935-1370-1-git-send-email-hongxing.zhu@nxp.com> <1656645935-1370-12-git-send-email-hongxing.zhu@nxp.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: l.stach@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Ah, so you are doing things in two steps. Disregard my first comment on the last patch then. > --- > 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. 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 = {