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,
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 v15 13/17] PCI: imx6: Reduce resume time by only starting link if it was up before suspend
Date: Thu, 14 Jul 2022 15:31:05 +0800 [thread overview]
Message-ID: <1657783869-19194-14-git-send-email-hongxing.zhu@nxp.com> (raw)
In-Reply-To: <1657783869-19194-1-git-send-email-hongxing.zhu@nxp.com>
i.MX PCIe doesn't support hotplug. During resume, only start PCIe link
training when the link was up before system suspend to avoid the long
latency in the link training period.
[bhelgaas: imx6_pcie_start_link() return value check removal moved to
previous patch, pointed out by Lucas Stach <l.stach@pengutronix.de>]
Link: https://lore.kernel.org/r/1656645935-1370-14-git-send-email-hongxing.zhu@nxp.com
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/controller/dwc/pci-imx6.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index 3ac4f2aa91c5..ad0933c3dc70 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -67,6 +67,7 @@ struct imx6_pcie {
struct dw_pcie *pci;
int reset_gpio;
bool gpio_active_high;
+ bool link_is_up;
struct clk *pcie_bus;
struct clk *pcie_phy;
struct clk *pcie_inbound_axi;
@@ -881,11 +882,13 @@ static int imx6_pcie_start_link(struct dw_pcie *pci)
dev_info(dev, "Link: Gen2 disabled\n");
}
+ imx6_pcie->link_is_up = true;
tmp = dw_pcie_readw_dbi(pci, offset + PCI_EXP_LNKSTA);
dev_info(dev, "Link up, Gen%i\n", tmp & PCI_EXP_LNKSTA_CLS);
return 0;
err_reset_phy:
+ imx6_pcie->link_is_up = false;
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));
@@ -1032,7 +1035,9 @@ static int imx6_pcie_resume_noirq(struct device *dev)
return ret;
dw_pcie_setup_rc(pp);
- imx6_pcie_start_link(imx6_pcie->pci);
+ if (imx6_pcie->link_is_up)
+ imx6_pcie_start_link(imx6_pcie->pci);
+
return 0;
}
#endif
--
2.25.1
next prev parent reply other threads:[~2022-07-14 7:48 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-14 7:30 [PATCH v15 0/17] PCI: imx6: refine codes and add the error propagation Richard Zhu
2022-07-14 7:30 ` [PATCH v15 01/17] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Richard Zhu
2022-07-14 7:30 ` [PATCH v15 02/17] PCI: imx6: Move PHY management functions together Richard Zhu
2022-07-14 7:30 ` [PATCH v15 03/17] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Richard Zhu
2022-07-14 7:30 ` [PATCH v15 04/17] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu
2022-07-14 7:30 ` [PATCH v15 05/17] PCI: imx6: Factor out ref clock disable to match enable Richard Zhu
2022-07-14 7:30 ` [PATCH v15 06/17] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Richard Zhu
2022-07-14 7:30 ` [PATCH v15 07/17] PCI: imx6: Propagate .host_init() errors to caller Richard Zhu
2022-07-14 7:31 ` [PATCH v15 08/17] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Richard Zhu
2022-07-14 7:31 ` [PATCH v15 09/17] PCI: imx6: Call host init function directly in resume Richard Zhu
2022-07-14 7:31 ` [PATCH v15 10/17] PCI: imx6: Turn off regulator when system is in suspend mode Richard Zhu
2022-07-14 7:31 ` [PATCH v15 11/17] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset() Richard Zhu
2022-07-14 7:31 ` [PATCH v15 12/17] PCI: imx6: Mark the link down as non-fatal error Richard Zhu
2022-07-14 7:31 ` Richard Zhu [this message]
2022-07-14 7:31 ` [PATCH v15 14/17] PCI: imx6: Do not hide PHY driver callbacks and refine the error handling Richard Zhu
2022-07-14 7:31 ` [PATCH v15 15/17] PCI: imx6: Disable clocks in reverse order of enable Richard Zhu
2022-07-14 7:31 ` [PATCH v15 16/17] PCI: imx6: Move the imx6_pcie_ltssm_disable() earlier Richard Zhu
2022-07-14 7:31 ` [PATCH v15 17/17] PCI: imx6: Reformat suspend callback to keep symmetric with resume Richard Zhu
2022-07-18 13:19 ` Guenter Roeck
2022-07-19 23:10 ` Bjorn Helgaas
2022-07-14 17:10 ` [PATCH v15 0/17] PCI: imx6: refine codes and add the error propagation 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=1657783869-19194-14-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=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).