From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, robh+dt@kernel.org, broonie@kernel.org, lorenzo.pieralisi@arm.com, jingoohan1@gmail.com, festevam@gmail.com, francesco.dolcini@toradex.com Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v9 6/8] PCI: imx6: Disable clocks and regulators after link is down Date: Fri, 6 May 2022 09:47:07 +0800 [thread overview] Message-ID: <1651801629-30223-7-git-send-email-hongxing.zhu@nxp.com> (raw) In-Reply-To: <1651801629-30223-1-git-send-email-hongxing.zhu@nxp.com> Since i.MX PCIe doesn't support hot-plug, reduce power consumption as much as possible by disabling clocks and regulators and returning error when the link is down. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 3ce3993d5797..d122c12193a6 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -845,7 +845,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) /* Start LTSSM. */ imx6_pcie_ltssm_enable(dev); - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_out; if (pci->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ @@ -876,12 +878,14 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) ret = imx6_pcie_wait_for_speed_change(imx6_pcie); if (ret) { dev_err(dev, "Failed to bring link up!\n"); - goto err_reset_phy; + goto err_out; } } /* Make sure link training is finished as well! */ - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_out; } else { dev_info(dev, "Link: Gen2 disabled\n"); } @@ -890,11 +894,18 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) dev_info(dev, "Link up, Gen%i\n", tmp & PCI_EXP_LNKSTA_CLS); return 0; -err_reset_phy: +err_out: dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n", dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0), dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1)); imx6_pcie_reset_phy(imx6_pcie); + imx6_pcie_clk_disable(imx6_pcie); + if (imx6_pcie->phy != NULL) { + phy_power_off(imx6_pcie->phy); + phy_exit(imx6_pcie->phy); + } + if (imx6_pcie->vpcie) + regulator_disable(imx6_pcie->vpcie); return ret; } -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, robh+dt@kernel.org, broonie@kernel.org, lorenzo.pieralisi@arm.com, jingoohan1@gmail.com, festevam@gmail.com, francesco.dolcini@toradex.com Cc: hongxing.zhu@nxp.com, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, linux-imx@nxp.com Subject: [PATCH v9 6/8] PCI: imx6: Disable clocks and regulators after link is down Date: Fri, 6 May 2022 09:47:07 +0800 [thread overview] Message-ID: <1651801629-30223-7-git-send-email-hongxing.zhu@nxp.com> (raw) In-Reply-To: <1651801629-30223-1-git-send-email-hongxing.zhu@nxp.com> Since i.MX PCIe doesn't support hot-plug, reduce power consumption as much as possible by disabling clocks and regulators and returning error when the link is down. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 3ce3993d5797..d122c12193a6 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -845,7 +845,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) /* Start LTSSM. */ imx6_pcie_ltssm_enable(dev); - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_out; if (pci->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ @@ -876,12 +878,14 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) ret = imx6_pcie_wait_for_speed_change(imx6_pcie); if (ret) { dev_err(dev, "Failed to bring link up!\n"); - goto err_reset_phy; + goto err_out; } } /* Make sure link training is finished as well! */ - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret) + goto err_out; } else { dev_info(dev, "Link: Gen2 disabled\n"); } @@ -890,11 +894,18 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) dev_info(dev, "Link up, Gen%i\n", tmp & PCI_EXP_LNKSTA_CLS); return 0; -err_reset_phy: +err_out: dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n", dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG0), dw_pcie_readl_dbi(pci, PCIE_PORT_DEBUG1)); imx6_pcie_reset_phy(imx6_pcie); + imx6_pcie_clk_disable(imx6_pcie); + if (imx6_pcie->phy != NULL) { + phy_power_off(imx6_pcie->phy); + phy_exit(imx6_pcie->phy); + } + if (imx6_pcie->vpcie) + regulator_disable(imx6_pcie->vpcie); return ret; } -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-05-06 1:59 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-06 1:47 [PATCH v9 0/8] PCI: imx6: refine codes and add compliance tests mode support Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-05-06 1:47 ` [PATCH v9 1/8] PCI: imx6: Encapsulate the clock enable into one standalone function Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 18:51 ` Bjorn Helgaas 2022-06-08 18:51 ` Bjorn Helgaas 2022-06-09 6:18 ` Hongxing Zhu 2022-06-09 6:18 ` Hongxing Zhu 2022-05-06 1:47 ` [PATCH v9 2/8] PCI: imx6: Add the error propagation from host_init Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 18:53 ` Bjorn Helgaas 2022-06-08 18:53 ` Bjorn Helgaas 2022-06-09 6:19 ` Hongxing Zhu 2022-06-09 6:19 ` Hongxing Zhu 2022-05-06 1:47 ` [PATCH v9 3/8] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 7:14 ` Lucas Stach 2022-06-08 7:14 ` Lucas Stach 2022-05-06 1:47 ` [PATCH v9 4/8] PCI: imx6: Disable iMX6QDL PCIe REF clock when disable PCIe clocks Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 7:18 ` Lucas Stach 2022-06-08 7:18 ` Lucas Stach 2022-05-06 1:47 ` [PATCH v9 5/8] PCI: imx6: Refine the regulator usage Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 7:26 ` Lucas Stach 2022-06-08 7:26 ` Lucas Stach 2022-06-09 6:17 ` Hongxing Zhu 2022-06-09 6:17 ` Hongxing Zhu 2022-06-09 7:47 ` Lucas Stach 2022-06-09 7:47 ` Lucas Stach 2022-06-09 7:54 ` Hongxing Zhu 2022-06-09 7:54 ` Hongxing Zhu 2022-06-08 18:54 ` Bjorn Helgaas 2022-06-08 18:54 ` Bjorn Helgaas 2022-06-09 6:19 ` Hongxing Zhu 2022-06-09 6:19 ` Hongxing Zhu 2022-06-09 17:20 ` Bjorn Helgaas 2022-06-09 17:20 ` Bjorn Helgaas 2022-06-10 7:09 ` Hongxing Zhu 2022-06-10 7:09 ` Hongxing Zhu 2022-05-06 1:47 ` Richard Zhu [this message] 2022-05-06 1:47 ` [PATCH v9 6/8] PCI: imx6: Disable clocks and regulators after link is down Richard Zhu 2022-06-08 7:35 ` Lucas Stach 2022-06-08 7:35 ` Lucas Stach 2022-06-09 6:17 ` Hongxing Zhu 2022-06-09 6:17 ` Hongxing Zhu 2022-06-09 7:53 ` Francesco Dolcini 2022-06-09 7:53 ` Francesco Dolcini 2022-06-09 8:36 ` Hongxing Zhu 2022-06-09 8:36 ` Hongxing Zhu 2022-06-09 7:55 ` Lucas Stach 2022-06-09 7:55 ` Lucas Stach 2022-06-09 8:30 ` Hongxing Zhu 2022-06-09 8:30 ` Hongxing Zhu 2022-05-06 1:47 ` [PATCH v9 7/8] PCI: imx6: Move the phy driver callbacks to the proper places Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 7:44 ` Lucas Stach 2022-06-08 7:44 ` Lucas Stach 2022-06-09 6:18 ` Hongxing Zhu 2022-06-09 6:18 ` Hongxing Zhu 2022-06-08 18:57 ` Bjorn Helgaas 2022-06-08 18:57 ` Bjorn Helgaas 2022-06-09 6:20 ` Hongxing Zhu 2022-06-09 6:20 ` Hongxing Zhu 2022-06-09 16:25 ` Bjorn Helgaas 2022-06-09 16:25 ` Bjorn Helgaas 2022-06-10 6:51 ` Hongxing Zhu 2022-06-10 6:51 ` Hongxing Zhu 2022-05-06 1:47 ` [PATCH v9 8/8] PCI: imx6: Add compliance tests mode support Richard Zhu 2022-05-06 1:47 ` Richard Zhu 2022-06-08 7:48 ` Lucas Stach 2022-06-08 7:48 ` Lucas Stach 2022-06-09 6:18 ` Hongxing Zhu 2022-06-09 6:18 ` 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=1651801629-30223-7-git-send-email-hongxing.zhu@nxp.com \ --to=hongxing.zhu@nxp.com \ --cc=bhelgaas@google.com \ --cc=broonie@kernel.org \ --cc=festevam@gmail.com \ --cc=francesco.dolcini@toradex.com \ --cc=jingoohan1@gmail.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.