linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Manikanta Maddireddy <mmaddireddy@nvidia.com>
To: <thierry.reding@gmail.com>, <bhelgaas@google.com>,
	<robh+dt@kernel.org>, <mark.rutland@arm.com>,
	<jonathanh@nvidia.com>, <lorenzo.pieralisi@arm.com>,
	<vidyas@nvidia.com>
Cc: <linux-tegra@vger.kernel.org>, <linux-pci@vger.kernel.org>,
	<devicetree@vger.kernel.org>,
	Manikanta Maddireddy <mmaddireddy@nvidia.com>
Subject: [PATCH V2 02/28] PCI: tegra: Handle failure cases in tegra_pcie_power_on()
Date: Tue, 23 Apr 2019 14:57:59 +0530	[thread overview]
Message-ID: <20190423092825.759-3-mmaddireddy@nvidia.com> (raw)
In-Reply-To: <20190423092825.759-1-mmaddireddy@nvidia.com>

Unroll the PCIe power on sequence if any one of the steps fail in
tegra_pcie_power_on().

Signed-off-by: Manikanta Maddireddy <mmaddireddy@nvidia.com>
---
V2: New patch to handle error cleanup in tegra_pcie_power_on().

 drivers/pci/controller/pci-tegra.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/drivers/pci/controller/pci-tegra.c b/drivers/pci/controller/pci-tegra.c
index f4f53d092e00..8235d937951b 100644
--- a/drivers/pci/controller/pci-tegra.c
+++ b/drivers/pci/controller/pci-tegra.c
@@ -1052,7 +1052,7 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)
 		err = clk_prepare_enable(pcie->pex_clk);
 		if (err) {
 			dev_err(dev, "failed to enable PEX clock: %d\n", err);
-			return err;
+			goto regulator_disable;
 		}
 		reset_control_deassert(pcie->pex_rst);
 	} else {
@@ -1061,7 +1061,7 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)
 							pcie->pex_rst);
 		if (err) {
 			dev_err(dev, "powerup sequence failed: %d\n", err);
-			return err;
+			goto regulator_disable;
 		}
 	}
 
@@ -1070,24 +1070,40 @@ static int tegra_pcie_power_on(struct tegra_pcie *pcie)
 	err = clk_prepare_enable(pcie->afi_clk);
 	if (err < 0) {
 		dev_err(dev, "failed to enable AFI clock: %d\n", err);
-		return err;
+		goto powergate;
 	}
 
 	if (soc->has_cml_clk) {
 		err = clk_prepare_enable(pcie->cml_clk);
 		if (err < 0) {
 			dev_err(dev, "failed to enable CML clock: %d\n", err);
-			return err;
+			goto disable_afi_clk;
 		}
 	}
 
 	err = clk_prepare_enable(pcie->pll_e);
 	if (err < 0) {
 		dev_err(dev, "failed to enable PLLE clock: %d\n", err);
-		return err;
+		goto disable_cml_clk;
 	}
 
 	return 0;
+
+disable_cml_clk:
+	if (soc->has_cml_clk)
+		clk_disable_unprepare(pcie->cml_clk);
+disable_afi_clk:
+	clk_disable_unprepare(pcie->afi_clk);
+powergate:
+	reset_control_assert(pcie->afi_rst);
+	reset_control_assert(pcie->pex_rst);
+	clk_disable_unprepare(pcie->pex_clk);
+	if (!dev->pm_domain)
+		tegra_powergate_power_off(TEGRA_POWERGATE_PCIE);
+regulator_disable:
+	regulator_bulk_disable(pcie->num_supplies, pcie->supplies);
+
+	return err;
 }
 
 static int tegra_pcie_clocks_get(struct tegra_pcie *pcie)
-- 
2.17.1


  parent reply	other threads:[~2019-04-23  9:28 UTC|newest]

Thread overview: 64+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23  9:27 [PATCH V2 00/28] Enable Tegra PCIe root port features Manikanta Maddireddy
2019-04-23  9:27 ` [PATCH V2 01/28] soc/tegra: pmc: Export tegra_powergate_power_on() Manikanta Maddireddy
2019-05-09 14:02   ` Thierry Reding
2019-04-23  9:27 ` Manikanta Maddireddy [this message]
2019-05-09 14:04   ` [PATCH V2 02/28] PCI: tegra: Handle failure cases in tegra_pcie_power_on() Thierry Reding
2019-04-23  9:28 ` [PATCH V2 03/28] PCI: tegra: Rearrange Tegra PCIe driver functions Manikanta Maddireddy
2019-05-09 14:05   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 04/28] PCI: tegra: Disable PCIe interrupts in runtime suspend Manikanta Maddireddy
2019-05-09 14:10   ` Thierry Reding
2019-05-09 15:57     ` Manikanta Maddireddy
2019-04-23  9:28 ` [PATCH V2 05/28] PCI: tegra: Fix PCIe host power up sequence Manikanta Maddireddy
2019-05-09 14:14   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 06/28] PCI: tegra: Add PCIe Gen2 link speed support Manikanta Maddireddy
2019-05-09 14:17   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 07/28] PCI: tegra: Advertise PCIe Advanced Error Reporting (AER) capability Manikanta Maddireddy
2019-05-09 14:17   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 08/28] PCI: tegra: Program UPHY electrical settings for Tegra210 Manikanta Maddireddy
2019-05-09 14:18   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 09/28] PCI: tegra: Enable opportunistic UpdateFC and ACK Manikanta Maddireddy
2019-04-23  9:28 ` [PATCH V2 10/28] PCI: tegra: Disable AFI dynamic clock gating Manikanta Maddireddy
2019-04-23  9:28 ` [PATCH V2 11/28] PCI: tegra: Process pending DLL transactions before entering L1 or L2 Manikanta Maddireddy
2019-04-23  9:28 ` [PATCH V2 12/28] PCI: tegra: Enable PCIe xclk clock clamping Manikanta Maddireddy
2019-05-09 14:20   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 13/28] PCI: tegra: Increase the deskew retry time Manikanta Maddireddy
2019-05-09 14:20   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 14/28] PCI: tegra: Add SW fixup for RAW violations Manikanta Maddireddy
2019-05-09 14:21   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 15/28] PCI: tegra: Update flow control timer frequency in Tegra210 Manikanta Maddireddy
2019-05-09 14:22   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 16/28] PCI: tegra: Set target speed as Gen1 before starting LTSSM Manikanta Maddireddy
2019-05-09 14:23   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 17/28] PCI: tegra: Fix PLLE power down issue due to CLKREQ# signal Manikanta Maddireddy
2019-05-09 14:24   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 18/28] PCI: tegra: Program AFI_CACHE* registers only for Tegra20 Manikanta Maddireddy
2019-04-26 15:32   ` Thierry Reding
2019-04-29  9:30     ` Manikanta Maddireddy
2019-05-09 14:25       ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 19/28] PCI: tegra: Change PRSNT_SENSE irq log to debug Manikanta Maddireddy
2019-05-09 14:27   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 20/28] PCI: tegra: Use legacy irq for port service drivers Manikanta Maddireddy
2019-05-09 14:29   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 21/28] PCI: tegra: Add AFI_PEX2_CTRL reg offset as part of soc struct Manikanta Maddireddy
2019-04-23  9:28 ` [PATCH V2 22/28] PCI: tegra: Access endpoint config only if PCIe link is up Manikanta Maddireddy
2019-04-23 20:24   ` Bjorn Helgaas
2019-04-24  3:51     ` Manikanta Maddireddy
2019-05-09 14:34       ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 23/28] dt-bindings: pci: tegra: Document PCIe DPD pinctrl optional prop Manikanta Maddireddy
2019-05-01 19:52   ` Rob Herring
2019-05-09 14:34   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 24/28] arm64: tegra: Add PEX DPD states as pinctrl properties Manikanta Maddireddy
2019-05-09 14:38   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 25/28] PCI: tegra: Put PEX CLK & BIAS pads in DPD mode Manikanta Maddireddy
2019-05-09 14:35   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 26/28] dt-bindings: pci: tegra: Document reset-gpio optional prop Manikanta Maddireddy
2019-05-01 19:58   ` Rob Herring
2019-05-09 14:37   ` Thierry Reding
2019-05-09 14:37     ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 27/28] PCI: tegra: Add support for GPIO based PCIe reset Manikanta Maddireddy
2019-05-09 14:45   ` Thierry Reding
2019-04-23  9:28 ` [PATCH V2 28/28] PCI: tegra: Change link retry log level to info Manikanta Maddireddy
2019-05-09 14:47   ` Thierry Reding
2019-04-26 13:22 ` [PATCH V2 00/28] Enable Tegra PCIe root port features Thierry Reding
2019-05-01 11:13   ` Lorenzo Pieralisi
2019-05-01 11:43     ` Manikanta Maddireddy

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=20190423092825.759-3-mmaddireddy@nvidia.com \
    --to=mmaddireddy@nvidia.com \
    --cc=bhelgaas@google.com \
    --cc=devicetree@vger.kernel.org \
    --cc=jonathanh@nvidia.com \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux-tegra@vger.kernel.org \
    --cc=lorenzo.pieralisi@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=robh+dt@kernel.org \
    --cc=thierry.reding@gmail.com \
    --cc=vidyas@nvidia.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: 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).