Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b137340 authored by Jon Hunter's avatar Jon Hunter Committed by Thierry Reding
Browse files

soc/tegra: pmc: Remove genpd when adding provider fails 



Commit 3fe57710 ("PM / Domains: Add support for removing PM
domains") add support for removing PM domains. Update the Tegra PMC
driver to remove PM domains if we fail to add a provider for the PM
domain.

Please note that the code under 'power_on_cleanup' label does not
really belong in the clean-up error path for tegra_powergate_add().
To keep the error path simple, remove this label and move the
associated code to where it needs to be invoked.

Signed-off-by: default avatarJon Hunter <jonathanh@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent cd5ceda2

drivers/soc/tegra/pmc.c

+15 −8
Original line number Original line Diff line number Diff line
@@ -840,8 +840,12 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) 
		goto remove_clks;

		goto remove_clks;

	}

	}





	if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))

	if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS)) {

		goto power_on_cleanup;

		if (off)

			WARN_ON(tegra_powergate_power_up(pg, true));



		goto remove_resets;

	}





	/*

	/*

	 * FIXME: If XHCI is enabled for Tegra, then power-up the XUSB

	 * FIXME: If XHCI is enabled for Tegra, then power-up the XUSB
@@ -852,8 +856,12 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) 
	 * to be unused.

	 * to be unused.

	 */

	 */

	if (IS_ENABLED(CONFIG_USB_XHCI_TEGRA) &&

	if (IS_ENABLED(CONFIG_USB_XHCI_TEGRA) &&

	    (id == TEGRA_POWERGATE_XUSBA || id == TEGRA_POWERGATE_XUSBC))

	    (id == TEGRA_POWERGATE_XUSBA || id == TEGRA_POWERGATE_XUSBC)) {

		goto power_on_cleanup;

		if (off)

			WARN_ON(tegra_powergate_power_up(pg, true));



		goto remove_resets;

	}





	err = pm_genpd_init(&pg->genpd, NULL, off);

	err = pm_genpd_init(&pg->genpd, NULL, off);

	if (err < 0) {

	if (err < 0) {
@@ -866,16 +874,15 @@ static void tegra_powergate_add(struct tegra_pmc *pmc, struct device_node *np) 
	if (err < 0) {

	if (err < 0) {

		pr_err("failed to add genpd provider for %s: %d\n", np->name,

		pr_err("failed to add genpd provider for %s: %d\n", np->name,

		       err);

		       err);

		goto remove_resets;

		goto remove_genpd;

	}

	}





	pr_debug("added power domain %s\n", pg->genpd.name);

	pr_debug("added power domain %s\n", pg->genpd.name);





	return;

	return;





power_on_cleanup:

remove_genpd:

	if (off)

	pm_genpd_remove(&pg->genpd);

		WARN_ON(tegra_powergate_power_up(pg, true));





remove_resets:

remove_resets:

	while (pg->num_resets--)

	while (pg->num_resets--)