From: Lucas Stach <l.stach@pengutronix.de>
To: Richard Zhu <hongxing.zhu@nxp.com>,
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
Subject: Re: [PATCH v14 03/17] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier
Date: Wed, 13 Jul 2022 10:16:16 +0200 [thread overview]
Message-ID: <724610978fc8c1a5dbf23fa36e3f57c8df3fb326.camel@pengutronix.de> (raw)
In-Reply-To: <1656645935-1370-4-git-send-email-hongxing.zhu@nxp.com>
Am Freitag, dem 01.07.2022 um 11:25 +0800 schrieb Richard Zhu:
> From: Bjorn Helgaas <bhelgaas@google.com>
>
> Move imx6_pcie_enable_ref_clk() earlier so it's not in the middle between
> imx6_pcie_assert_core_reset() and imx6_pcie_deassert_core_reset(). No
> functional change intended.
>
> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
> Acked-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> ---
> drivers/pci/controller/dwc/pci-imx6.c | 96 +++++++++++++--------------
> 1 file changed, 48 insertions(+), 48 deletions(-)
>
> diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c
> index e63eb6380020..a6d2b907d42b 100644
> --- a/drivers/pci/controller/dwc/pci-imx6.c
> +++ b/drivers/pci/controller/dwc/pci-imx6.c
> @@ -520,54 +520,6 @@ static int imx6_pcie_attach_pd(struct device *dev)
> return 0;
> }
>
> -static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
> -{
> - struct device *dev = imx6_pcie->pci->dev;
> -
> - switch (imx6_pcie->drvdata->variant) {
> - case IMX7D:
> - case IMX8MQ:
> - reset_control_assert(imx6_pcie->pciephy_reset);
> - fallthrough;
> - case IMX8MM:
> - reset_control_assert(imx6_pcie->apps_reset);
> - break;
> - case IMX6SX:
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN,
> - IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> - /* Force PCIe PHY reset */
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR5,
> - IMX6SX_GPR5_PCIE_BTNRST_RESET,
> - IMX6SX_GPR5_PCIE_BTNRST_RESET);
> - break;
> - case IMX6QP:
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_SW_RST,
> - IMX6Q_GPR1_PCIE_SW_RST);
> - break;
> - case IMX6Q:
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18);
> - regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> - IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
> - break;
> - }
> -
> - if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
> - int ret = regulator_disable(imx6_pcie->vpcie);
> -
> - if (ret)
> - dev_err(dev, "failed to disable vpcie regulator: %d\n",
> - ret);
> - }
> -
> - /* Some boards don't have PCIe reset GPIO. */
> - if (gpio_is_valid(imx6_pcie->reset_gpio))
> - gpio_set_value_cansleep(imx6_pcie->reset_gpio,
> - imx6_pcie->gpio_active_high);
> -}
> -
> static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
> {
> struct dw_pcie *pci = imx6_pcie->pci;
> @@ -628,6 +580,54 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
> return ret;
> }
>
> +static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
> +{
> + struct device *dev = imx6_pcie->pci->dev;
> +
> + switch (imx6_pcie->drvdata->variant) {
> + case IMX7D:
> + case IMX8MQ:
> + reset_control_assert(imx6_pcie->pciephy_reset);
> + fallthrough;
> + case IMX8MM:
> + reset_control_assert(imx6_pcie->apps_reset);
> + break;
> + case IMX6SX:
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
> + IMX6SX_GPR12_PCIE_TEST_POWERDOWN,
> + IMX6SX_GPR12_PCIE_TEST_POWERDOWN);
> + /* Force PCIe PHY reset */
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR5,
> + IMX6SX_GPR5_PCIE_BTNRST_RESET,
> + IMX6SX_GPR5_PCIE_BTNRST_RESET);
> + break;
> + case IMX6QP:
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_SW_RST,
> + IMX6Q_GPR1_PCIE_SW_RST);
> + break;
> + case IMX6Q:
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_TEST_PD, 1 << 18);
> + regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR1,
> + IMX6Q_GPR1_PCIE_REF_CLK_EN, 0 << 16);
> + break;
> + }
> +
> + if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) {
> + int ret = regulator_disable(imx6_pcie->vpcie);
> +
> + if (ret)
> + dev_err(dev, "failed to disable vpcie regulator: %d\n",
> + ret);
> + }
> +
> + /* Some boards don't have PCIe reset GPIO. */
> + if (gpio_is_valid(imx6_pcie->reset_gpio))
> + gpio_set_value_cansleep(imx6_pcie->reset_gpio,
> + imx6_pcie->gpio_active_high);
> +}
> +
> static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
> {
> struct dw_pcie *pci = imx6_pcie->pci;
> --
> 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-07-13 8:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 3:25 [PATCH v14 0/17] PCI: imx6: refine codes and add the error propagation Richard Zhu
2022-07-01 3:25 ` [PATCH v14 01/17] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Richard Zhu
2022-07-13 8:13 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 02/17] PCI: imx6: Move PHY management functions together Richard Zhu
2022-07-13 8:15 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 03/17] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Richard Zhu
2022-07-13 8:16 ` Lucas Stach [this message]
2022-07-01 3:25 ` [PATCH v14 04/17] PCI: imx6: Move imx6_pcie_clk_disable() earlier Richard Zhu
2022-07-01 3:25 ` [PATCH v14 05/17] PCI: imx6: Factor out ref clock disable to match enable Richard Zhu
2022-07-13 8:17 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 06/17] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Richard Zhu
2022-07-01 3:25 ` [PATCH v14 07/17] PCI: imx6: Propagate .host_init() errors to caller Richard Zhu
2022-07-01 3:25 ` [PATCH v14 08/17] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Richard Zhu
2022-07-01 3:25 ` [PATCH v14 09/17] PCI: imx6: Call host init function directly in resume Richard Zhu
2022-07-13 8:26 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 10/17] PCI: imx6: Turn off regulator when system is in suspend mode Richard Zhu
2022-07-13 8:34 ` Lucas Stach
2022-07-13 10:56 ` Hongxing Zhu
2022-07-13 11:22 ` Lucas Stach
2022-07-13 12:55 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 11/17] PCI: imx6: Move regulator enable out of imx6_pcie_deassert_core_reset() Richard Zhu
2022-07-13 8:41 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 12/17] PCI: imx6: Mark the link down as non-fatal error Richard Zhu
2022-07-13 8:44 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 13/17] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Richard Zhu
2022-07-13 8:47 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 14/17] PCI: imx6: Do not hide phy driver callbacks and refine the error handling Richard Zhu
2022-07-13 8:58 ` Lucas Stach
2022-07-13 10:57 ` Hongxing Zhu
2022-07-13 11:17 ` Lucas Stach
2022-07-13 12:52 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 15/17] PCI: imx6: Disable clocks in reverse order of enable Richard Zhu
2022-07-13 8:59 ` Lucas Stach
2022-07-01 3:25 ` [PATCH v14 16/17] PCI: imx6: Move the imx6_pcie_ltssm_disable() earlier Richard Zhu
2022-07-13 9:04 ` Lucas Stach
2022-07-13 11:00 ` Hongxing Zhu
2022-07-01 3:25 ` [PATCH v14 17/17] PCI: imx6: Reformat suspend callback to keep symmetric with resume Richard Zhu
2022-07-13 9:07 ` Lucas Stach
2022-07-11 22:29 ` [PATCH v14 0/17] PCI: imx6: refine codes and add the error propagation Bjorn Helgaas
2022-07-13 16:45 ` Bjorn Helgaas
2022-07-14 4:15 ` 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=724610978fc8c1a5dbf23fa36e3f57c8df3fb326.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=bhelgaas@google.com \
--cc=broonie@kernel.org \
--cc=festevam@gmail.com \
--cc=francesco.dolcini@toradex.com \
--cc=hongxing.zhu@nxp.com \
--cc=kernel@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).