linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 09/17] PCI: imx6: Call host init function directly in resume
Date: Thu, 14 Jul 2022 15:31:01 +0800	[thread overview]
Message-ID: <1657783869-19194-10-git-send-email-hongxing.zhu@nxp.com> (raw)
In-Reply-To: <1657783869-19194-1-git-send-email-hongxing.zhu@nxp.com>

Call imx6_pcie_host_init() instead of duplicating codes in resume.  Note
that this also means we do MPLL setup again during resume, which we didn't
do before.

[bhelgaas: add MPLL setup note, pointed out by Lucas]
Link: https://lore.kernel.org/r/1656645935-1370-10-git-send-email-hongxing.zhu@nxp.com
Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
---
 drivers/pci/controller/dwc/pci-imx6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
index eaae144db4f3..2b42c37f1617 100644
--- a/drivers/pci/controller/dwc/pci-imx6.c
+++ b/drivers/pci/controller/dwc/pci-imx6.c
@@ -1034,9 +1034,9 @@ static int imx6_pcie_resume_noirq(struct device *dev)
 	if (!(imx6_pcie->drvdata->flags & IMX6_PCIE_FLAG_SUPPORTS_SUSPEND))
 		return 0;
 
-	imx6_pcie_assert_core_reset(imx6_pcie);
-	imx6_pcie_init_phy(imx6_pcie);
-	imx6_pcie_deassert_core_reset(imx6_pcie);
+	ret = imx6_pcie_host_init(pp);
+	if (ret)
+		return ret;
 	dw_pcie_setup_rc(pp);
 
 	ret = imx6_pcie_start_link(imx6_pcie->pci);
-- 
2.25.1


  parent reply	other threads:[~2022-07-14  7:47 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 ` Richard Zhu [this message]
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 ` [PATCH v15 13/17] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Richard Zhu
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-10-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).