From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, 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 v7 7/8] PCI: imx6: Disable enabled clocks and regulators after link is down Date: Wed, 16 Feb 2022 14:21:02 +0800 [thread overview] Message-ID: <1644992463-14467-8-git-send-email-hongxing.zhu@nxp.com> (raw) In-Reply-To: <1644992463-14467-1-git-send-email-hongxing.zhu@nxp.com> Since i.MX PCIe doesn't support the hot-plug, and to save power consumption as much as possible. Return error and disable the enabled clocks and regulators when link is down,. Add a new host_exit() callback for i.MX PCIe driver to disable the enabled clocks, regulators and so on in the error handling after host_init is finished. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 242d8ef73c1e..fe671e88ec93 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -848,7 +848,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_reset_phy; if (pci->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ @@ -884,7 +886,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) } /* 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_reset_phy; } else { dev_info(dev, "Link: Gen2 disabled\n"); } @@ -897,7 +901,6 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) 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); return ret; } @@ -921,8 +924,29 @@ static int imx6_pcie_host_init(struct pcie_port *pp) return 0; } +static void imx6_pcie_host_exit(struct pcie_port *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; + struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); + + imx6_pcie_reset_phy(imx6_pcie); + imx6_pcie_clk_disable(imx6_pcie); + switch (imx6_pcie->drvdata->variant) { + case IMX8MM: + if (phy_power_off(imx6_pcie->phy)) + dev_err(dev, "unable to power off phy\n"); + break; + default: + break; + } + if (imx6_pcie->vpcie) + regulator_disable(imx6_pcie->vpcie); +} + static const struct dw_pcie_host_ops imx6_pcie_host_ops = { .host_init = imx6_pcie_host_init, + .host_exit = imx6_pcie_host_exit, }; static const struct dw_pcie_ops dw_pcie_ops = { -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: Richard Zhu <hongxing.zhu@nxp.com> To: l.stach@pengutronix.de, bhelgaas@google.com, 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 v7 7/8] PCI: imx6: Disable enabled clocks and regulators after link is down Date: Wed, 16 Feb 2022 14:21:02 +0800 [thread overview] Message-ID: <1644992463-14467-8-git-send-email-hongxing.zhu@nxp.com> (raw) In-Reply-To: <1644992463-14467-1-git-send-email-hongxing.zhu@nxp.com> Since i.MX PCIe doesn't support the hot-plug, and to save power consumption as much as possible. Return error and disable the enabled clocks and regulators when link is down,. Add a new host_exit() callback for i.MX PCIe driver to disable the enabled clocks, regulators and so on in the error handling after host_init is finished. Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com> --- drivers/pci/controller/dwc/pci-imx6.c | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index 242d8ef73c1e..fe671e88ec93 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -848,7 +848,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_reset_phy; if (pci->link_gen == 2) { /* Allow Gen2 mode after the link is up. */ @@ -884,7 +886,9 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) } /* 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_reset_phy; } else { dev_info(dev, "Link: Gen2 disabled\n"); } @@ -897,7 +901,6 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) 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); return ret; } @@ -921,8 +924,29 @@ static int imx6_pcie_host_init(struct pcie_port *pp) return 0; } +static void imx6_pcie_host_exit(struct pcie_port *pp) +{ + struct dw_pcie *pci = to_dw_pcie_from_pp(pp); + struct device *dev = pci->dev; + struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci); + + imx6_pcie_reset_phy(imx6_pcie); + imx6_pcie_clk_disable(imx6_pcie); + switch (imx6_pcie->drvdata->variant) { + case IMX8MM: + if (phy_power_off(imx6_pcie->phy)) + dev_err(dev, "unable to power off phy\n"); + break; + default: + break; + } + if (imx6_pcie->vpcie) + regulator_disable(imx6_pcie->vpcie); +} + static const struct dw_pcie_host_ops imx6_pcie_host_ops = { .host_init = imx6_pcie_host_init, + .host_exit = imx6_pcie_host_exit, }; static const struct dw_pcie_ops dw_pcie_ops = { -- 2.25.1
next prev parent reply other threads:[~2022-02-16 6:55 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-02-16 6:20 [PATCH v7 0/8] PCI: imx6: refine codes and add compliance tests mode support Richard Zhu 2022-02-16 6:20 ` Richard Zhu 2022-02-16 6:20 ` [PATCH v7 1/8] PCI: imx6: Encapsulate the clock enable into one standalone function Richard Zhu 2022-02-16 6:20 ` Richard Zhu 2022-02-16 6:20 ` [PATCH v7 2/8] PCI: imx6: Add the error propagation from host_init Richard Zhu 2022-02-16 6:20 ` Richard Zhu 2022-02-16 6:20 ` [PATCH v7 3/8] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu 2022-02-16 6:20 ` Richard Zhu 2022-02-16 6:20 ` [PATCH v7 4/8] PCI: imx6: Disable iMX6QDL PCIe REF clock when disable PCIe clocks Richard Zhu 2022-02-16 6:20 ` Richard Zhu 2022-02-16 6:21 ` [PATCH v7 5/8] PCI: imx6: Refine the regulator usage Richard Zhu 2022-02-16 6:21 ` Richard Zhu 2022-02-16 6:21 ` [PATCH v7 6/8] PCI: dwc: Add dw_pcie_host_ops.host_exit() callback Richard Zhu 2022-02-16 6:21 ` Richard Zhu 2022-02-23 17:49 ` Bjorn Helgaas 2022-02-23 17:49 ` Bjorn Helgaas 2022-02-24 7:50 ` Hongxing Zhu 2022-02-24 7:50 ` Hongxing Zhu 2022-02-16 6:21 ` Richard Zhu [this message] 2022-02-16 6:21 ` [PATCH v7 7/8] PCI: imx6: Disable enabled clocks and regulators after link is down Richard Zhu 2022-02-23 17:50 ` Bjorn Helgaas 2022-02-23 17:50 ` Bjorn Helgaas 2022-02-24 7:51 ` Hongxing Zhu 2022-02-24 7:51 ` Hongxing Zhu 2022-02-16 6:21 ` [PATCH v7 8/8] PCI: imx6: Add the compliance tests mode support Richard Zhu 2022-02-16 6:21 ` Richard Zhu 2022-02-23 17:40 ` Bjorn Helgaas 2022-02-23 17:40 ` Bjorn Helgaas 2022-02-24 7:50 ` Hongxing Zhu 2022-02-24 7:50 ` Hongxing Zhu 2022-02-24 23:54 ` Bjorn Helgaas 2022-02-24 23:54 ` Bjorn Helgaas
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=1644992463-14467-8-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 \ /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.