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 B0392C433EF for ; Wed, 13 Jul 2022 08:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235783AbiGMI66 (ORCPT ); Wed, 13 Jul 2022 04:58:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41822 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235268AbiGMI64 (ORCPT ); Wed, 13 Jul 2022 04:58:56 -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 5680931DCC for ; Wed, 13 Jul 2022 01:58:55 -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 1oBYCk-0007Nc-Iw; Wed, 13 Jul 2022 10:58:46 +0200 Message-ID: <4f49f28d15ad859e34aeeb714b5ddd5d6eba4b4a.camel@pengutronix.de> Subject: Re: [PATCH v14 14/17] PCI: imx6: Do not hide phy driver callbacks and refine the error handling 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:58:45 +0200 In-Reply-To: <1656645935-1370-15-git-send-email-hongxing.zhu@nxp.com> References: <1656645935-1370-1-git-send-email-hongxing.zhu@nxp.com> <1656645935-1370-15-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 the phy_power_on() to host_init from imx6_pcie_clk_enable(). > - Move the phy_init() to host_init from imx6_pcie_deassert_core_reset(). > > Refine the error handling in imx6_pcie_host_init() accordingly. > > Signed-off-by: Richard Zhu > Signed-off-by: Bjorn Helgaas > --- > drivers/pci/controller/dwc/pci-imx6.c | 34 +++++++++++++++++---------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 5a06fbca82d6..0b2a5256fb0d 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -639,14 +639,6 @@ static int imx6_pcie_clk_enable(struct imx6_pcie *imx6_pcie) > goto err_ref_clk; > } > > - switch (imx6_pcie->drvdata->variant) { > - case IMX8MM: > - if (phy_power_on(imx6_pcie->phy)) > - dev_err(dev, "unable to power on PHY\n"); > - break; > - default: > - break; > - } > /* allow the clocks to stabilize */ > usleep_range(200, 500); > return 0; > @@ -723,10 +715,6 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX8MQ: > reset_control_deassert(imx6_pcie->pciephy_reset); > break; > - case IMX8MM: > - if (phy_init(imx6_pcie->phy)) > - dev_err(dev, "waiting for phy ready timeout!\n"); > - break; > case IMX7D: > reset_control_deassert(imx6_pcie->pciephy_reset); > > @@ -762,6 +750,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > usleep_range(200, 500); > break; > case IMX6Q: /* Nothing to do */ > + case IMX8MM: > break; > } > > @@ -913,17 +902,36 @@ static int imx6_pcie_host_init(struct pcie_port *pp) > return ret; > } > } > + if (imx6_pcie->phy) { > + ret = phy_power_on(imx6_pcie->phy); > + if (ret) { > + dev_err(dev, "pcie phy power up failed.\n"); > + goto err_reg_disable; > + } > + } > > ret = imx6_pcie_deassert_core_reset(imx6_pcie); > if (ret < 0) { > dev_err(dev, "pcie deassert core reset failed: %d\n", ret); > - goto err_reg_disable; > + goto err_phy_off; > } > > + if (imx6_pcie->phy) { > + ret = phy_init(imx6_pcie->phy); > + if (ret) { > + dev_err(dev, "waiting for phy ready timeout!\n"); > + goto err_clk_disable; > + } > + } Wouldn't it be more logical to put this into imx6_pcie_init_phy()? Regards, Lucas > imx6_setup_phy_mpll(imx6_pcie); > > return 0; > > +err_clk_disable: > + imx6_pcie_clk_disable(imx6_pcie); > +err_phy_off: > + if (imx6_pcie->phy) > + phy_power_off(imx6_pcie->phy); > err_reg_disable: > if (imx6_pcie->vpcie) > regulator_disable(imx6_pcie->vpcie); 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 81910C43334 for ; Wed, 13 Jul 2022 08:59:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:Cc:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=54c689py0P+dR3ndeGHzEhUWoxESIihHFHhl1gtZaYk=; b=dPdgbWYKWY3AFL 0VksI2uM4kd/eY0gvuSK2rlnaWSSjVfkOA79ThakncPJ8NuCjd6KgKIKrp1vQ9Zm4PWrA6oYsoiET 8Prnn7ZJtuJn/ujjCanitcI8x/dhH3DIEOgaB8r9AlFer0Mf3BJv9Cv22IdKaylWCuryYhEEvorzg aAoHFa3ihMRLVKvEmCtvxEbGkrsdXCpHOans/Ll4FAjyZld0oB4mhRMhsoy85RuWZQUMPVIqZrU7Z Btl+19WukPMz1ncsVp3HC3aoUOWQJFULPpIkc68rlqNXg6FWGCtsS67aKPh7iWCziq5vBIvqZ2FaH OeBY9rmeFApauPvUREXw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBYCv-001vEi-3s; Wed, 13 Jul 2022 08:58:57 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oBYCr-001vBQ-9v for linux-arm-kernel@lists.infradead.org; Wed, 13 Jul 2022 08:58:54 +0000 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 1oBYCk-0007Nc-Iw; Wed, 13 Jul 2022 10:58:46 +0200 Message-ID: <4f49f28d15ad859e34aeeb714b5ddd5d6eba4b4a.camel@pengutronix.de> Subject: Re: [PATCH v14 14/17] PCI: imx6: Do not hide phy driver callbacks and refine the error handling 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:58:45 +0200 In-Reply-To: <1656645935-1370-15-git-send-email-hongxing.zhu@nxp.com> References: <1656645935-1370-1-git-send-email-hongxing.zhu@nxp.com> <1656645935-1370-15-git-send-email-hongxing.zhu@nxp.com> User-Agent: Evolution 3.40.4 (3.40.4-1.fc34) MIME-Version: 1.0 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-arm-kernel@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220713_015853_370965_B259D422 X-CRM114-Status: GOOD ( 18.97 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Am Freitag, dem 01.07.2022 um 11:25 +0800 schrieb Richard Zhu: > - Move the phy_power_on() to host_init from imx6_pcie_clk_enable(). > - Move the phy_init() to host_init from imx6_pcie_deassert_core_reset(). > > Refine the error handling in imx6_pcie_host_init() accordingly. > > Signed-off-by: Richard Zhu > Signed-off-by: Bjorn Helgaas > --- > drivers/pci/controller/dwc/pci-imx6.c | 34 +++++++++++++++++---------- > 1 file changed, 21 insertions(+), 13 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c > index 5a06fbca82d6..0b2a5256fb0d 100644 > --- a/drivers/pci/controller/dwc/pci-imx6.c > +++ b/drivers/pci/controller/dwc/pci-imx6.c > @@ -639,14 +639,6 @@ static int imx6_pcie_clk_enable(struct imx6_pcie *imx6_pcie) > goto err_ref_clk; > } > > - switch (imx6_pcie->drvdata->variant) { > - case IMX8MM: > - if (phy_power_on(imx6_pcie->phy)) > - dev_err(dev, "unable to power on PHY\n"); > - break; > - default: > - break; > - } > /* allow the clocks to stabilize */ > usleep_range(200, 500); > return 0; > @@ -723,10 +715,6 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > case IMX8MQ: > reset_control_deassert(imx6_pcie->pciephy_reset); > break; > - case IMX8MM: > - if (phy_init(imx6_pcie->phy)) > - dev_err(dev, "waiting for phy ready timeout!\n"); > - break; > case IMX7D: > reset_control_deassert(imx6_pcie->pciephy_reset); > > @@ -762,6 +750,7 @@ static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) > usleep_range(200, 500); > break; > case IMX6Q: /* Nothing to do */ > + case IMX8MM: > break; > } > > @@ -913,17 +902,36 @@ static int imx6_pcie_host_init(struct pcie_port *pp) > return ret; > } > } > + if (imx6_pcie->phy) { > + ret = phy_power_on(imx6_pcie->phy); > + if (ret) { > + dev_err(dev, "pcie phy power up failed.\n"); > + goto err_reg_disable; > + } > + } > > ret = imx6_pcie_deassert_core_reset(imx6_pcie); > if (ret < 0) { > dev_err(dev, "pcie deassert core reset failed: %d\n", ret); > - goto err_reg_disable; > + goto err_phy_off; > } > > + if (imx6_pcie->phy) { > + ret = phy_init(imx6_pcie->phy); > + if (ret) { > + dev_err(dev, "waiting for phy ready timeout!\n"); > + goto err_clk_disable; > + } > + } Wouldn't it be more logical to put this into imx6_pcie_init_phy()? Regards, Lucas > imx6_setup_phy_mpll(imx6_pcie); > > return 0; > > +err_clk_disable: > + imx6_pcie_clk_disable(imx6_pcie); > +err_phy_off: > + if (imx6_pcie->phy) > + phy_power_off(imx6_pcie->phy); > err_reg_disable: > if (imx6_pcie->vpcie) > regulator_disable(imx6_pcie->vpcie); _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel