From: Bjorn Helgaas <helgaas@kernel.org> To: Richard Zhu <hongxing.zhu@nxp.com>, Lucas Stach <l.stach@pengutronix.de>, Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Fabio Estevam <festevam@gmail.com>, Francesco Dolcini <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, Bjorn Helgaas <bhelgaas@google.com> Subject: [PATCH v12 07/13] PCI: imx6: Propagate .host_init() errors to caller Date: Wed, 15 Jun 2022 18:15:45 -0500 [thread overview] Message-ID: <20220615231551.1054753-8-helgaas@kernel.org> (raw) In-Reply-To: <20220615231551.1054753-1-helgaas@kernel.org> From: Richard Zhu <hongxing.zhu@nxp.com> Since dw_pcie_host_init() checks for errors from ops->host_init(), check for errors when enabling power regulators and clocks and return them. [bhelgaas: commit log] Link: https://lore.kernel.org/r/1655189942-12678-3-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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index e36ca08a7c51..90ab9397a935 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -708,7 +708,7 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) imx6_pcie->gpio_active_high); } -static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) +static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) { struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; @@ -719,7 +719,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) if (ret) { dev_err(dev, "failed to enable vpcie regulator: %d\n", ret); - return; + return ret; } } @@ -785,7 +785,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) msleep(100); } - return; + return 0; err_clks: if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) { @@ -794,6 +794,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) dev_err(dev, "failed to disable vpcie regulator: %d\n", ret); } + return err; } static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) @@ -912,11 +913,18 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) static int imx6_pcie_host_init(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); + int ret; imx6_pcie_assert_core_reset(imx6_pcie); imx6_pcie_init_phy(imx6_pcie); - imx6_pcie_deassert_core_reset(imx6_pcie); + ret = imx6_pcie_deassert_core_reset(imx6_pcie); + if (ret < 0) { + dev_err(dev, "pcie host init failed: %d\n", ret); + return ret; + } + imx6_setup_phy_mpll(imx6_pcie); return 0; -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Bjorn Helgaas <helgaas@kernel.org> To: Richard Zhu <hongxing.zhu@nxp.com>, Lucas Stach <l.stach@pengutronix.de>, Rob Herring <robh+dt@kernel.org>, Mark Brown <broonie@kernel.org>, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Fabio Estevam <festevam@gmail.com>, Francesco Dolcini <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, Bjorn Helgaas <bhelgaas@google.com> Subject: [PATCH v12 07/13] PCI: imx6: Propagate .host_init() errors to caller Date: Wed, 15 Jun 2022 18:15:45 -0500 [thread overview] Message-ID: <20220615231551.1054753-8-helgaas@kernel.org> (raw) In-Reply-To: <20220615231551.1054753-1-helgaas@kernel.org> From: Richard Zhu <hongxing.zhu@nxp.com> Since dw_pcie_host_init() checks for errors from ops->host_init(), check for errors when enabling power regulators and clocks and return them. [bhelgaas: commit log] Link: https://lore.kernel.org/r/1655189942-12678-3-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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/pci/controller/dwc/pci-imx6.c b/drivers/pci/controller/dwc/pci-imx6.c index e36ca08a7c51..90ab9397a935 100644 --- a/drivers/pci/controller/dwc/pci-imx6.c +++ b/drivers/pci/controller/dwc/pci-imx6.c @@ -708,7 +708,7 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) imx6_pcie->gpio_active_high); } -static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) +static int imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) { struct dw_pcie *pci = imx6_pcie->pci; struct device *dev = pci->dev; @@ -719,7 +719,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) if (ret) { dev_err(dev, "failed to enable vpcie regulator: %d\n", ret); - return; + return ret; } } @@ -785,7 +785,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) msleep(100); } - return; + return 0; err_clks: if (imx6_pcie->vpcie && regulator_is_enabled(imx6_pcie->vpcie) > 0) { @@ -794,6 +794,7 @@ static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) dev_err(dev, "failed to disable vpcie regulator: %d\n", ret); } + return err; } static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) @@ -912,11 +913,18 @@ static int imx6_pcie_start_link(struct dw_pcie *pci) static int imx6_pcie_host_init(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); + int ret; imx6_pcie_assert_core_reset(imx6_pcie); imx6_pcie_init_phy(imx6_pcie); - imx6_pcie_deassert_core_reset(imx6_pcie); + ret = imx6_pcie_deassert_core_reset(imx6_pcie); + if (ret < 0) { + dev_err(dev, "pcie host init failed: %d\n", ret); + return ret; + } + imx6_setup_phy_mpll(imx6_pcie); return 0; -- 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-06-15 23:16 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-15 23:15 [PATCH v12 00/13] PCI: imx6: refine codes and add the error propagation Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 01/13] PCI: imx6: Move imx6_pcie_grp_offset(), imx6_pcie_configure_type() earlier Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` Hongxing Zhu 2022-06-15 23:15 ` [PATCH v12 02/13] PCI: imx6: Move PHY management functions together Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` Hongxing Zhu 2022-06-15 23:15 ` [PATCH v12 03/13] PCI: imx6: Move imx6_pcie_enable_ref_clk() earlier Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` Hongxing Zhu 2022-06-15 23:15 ` [PATCH v12 04/13] PCI: imx6: Move imx6_pcie_clk_disable() earlier Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 05/13] PCI: imx6: Factor out ref clock disable to match enable Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` Hongxing Zhu 2022-06-15 23:15 ` [PATCH v12 06/13] PCI: imx6: Collect clock enables in imx6_pcie_clk_enable() Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas [this message] 2022-06-15 23:15 ` [PATCH v12 07/13] PCI: imx6: Propagate .host_init() errors to caller Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 08/13] PCI: imx6: Disable i.MX6QDL clock when disabling ref clocks Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 09/13] PCI: imx6: Turn off regulator when system is in suspend mode Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:30 ` Bjorn Helgaas 2022-06-15 23:30 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 15:56 ` Bjorn Helgaas 2022-06-16 15:56 ` Bjorn Helgaas 2022-06-17 5:57 ` Hongxing Zhu 2022-06-17 5:57 ` Hongxing Zhu 2022-06-15 23:15 ` [PATCH v12 10/13] PCI: imx6: Mark the link down as non-fatal error Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 11/13] PCI: imx6: Reduce resume time by only starting link if it was up before suspend Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 12/13] PCI: imx6: Do not hide phy driver callbacks and refine the error handling Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:15 ` [PATCH v12 13/13] PCI: imx6: Disable clocks in reverse order of enable Bjorn Helgaas 2022-06-15 23:15 ` Bjorn Helgaas 2022-06-15 23:27 ` Bjorn Helgaas 2022-06-15 23:27 ` Bjorn Helgaas 2022-06-16 2:23 ` Hongxing Zhu 2022-06-16 2:23 ` 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=20220615231551.1054753-8-helgaas@kernel.org \ --to=helgaas@kernel.org \ --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=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.