[RFC PATCH 6/8] PM / Domains: Remove a provider by referencing the data pointer
From: jonathanh@nvidia.com (Jon Hunter)
Date: 2016-03-04 11:23:52
Also in:
linux-pm, linux-tegra
Subsystem:
driver core, kobjects, debugfs and sysfs, generic pm domains, hibernation (aka software suspend, aka swsusp), power management core, suspend to ram, the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Ulf Hansson, Linus Torvalds
To remove a PM domain from the system, it is necessary to ensure that any PM domain providers associated with the PM domain have been removed. Otherwise it could be possible to obtain a pointer to a PM domain structure that has been removed. PM domains now have a reference to the pointer for the PM domain provider's data variable. Add a function so that a PM domain can remove a PM domain provider by referencing the data pointer. Signed-off-by: Jon Hunter <jonathanh@nvidia.com> --- drivers/base/power/domain.c | 24 ++++++++++++++++++++++++ include/linux/pm_domain.h | 2 ++ 2 files changed, 26 insertions(+)
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
index 72055fef6256..438885f2455f 100644
--- a/drivers/base/power/domain.c
+++ b/drivers/base/power/domain.c@@ -1738,6 +1738,30 @@ void of_genpd_del_provider(struct device_node *np) EXPORT_SYMBOL_GPL(of_genpd_del_provider); /** + * of_genpd_del_provider_by_data() - Remove a registered PM domain provider + * @data: Pointer to the data associated with the PM domain provider + * + * Look up a PM domain provider based upon a pointer to it's data and + * remove the PM domain provider from the list of providers. + */ +void of_genpd_del_provider_by_data(void *data) +{ + struct of_genpd_provider *c, *cp; + + mutex_lock(&of_genpd_mutex); + list_for_each_entry_safe(cp, c, &of_genpd_providers, link) { + if (cp->data == data) { + list_del(&cp->link); + of_node_put(cp->node); + kfree(cp); + break; + } + } + mutex_unlock(&of_genpd_mutex); +} +EXPORT_SYMBOL_GPL(of_genpd_del_provider_by_data); + +/** * of_genpd_get_from_provider() - Look-up PM domain * @genpdspec: OF phandle args to use for look-up *
diff --git a/include/linux/pm_domain.h b/include/linux/pm_domain.h
index bed84413546f..7b7921a65cb0 100644
--- a/include/linux/pm_domain.h
+++ b/include/linux/pm_domain.h@@ -199,6 +199,7 @@ int of_genpd_add_provider_simple(struct device_node *np, int of_genpd_add_provider_onecell(struct device_node *np, struct genpd_onecell_data *data); void of_genpd_del_provider(struct device_node *np); +void of_genpd_del_provider_by_data(void *data); struct generic_pm_domain *__of_genpd_xlate_simple( struct of_phandle_args *genpdspec, void *data);
@@ -218,6 +219,7 @@ static inline int __of_genpd_add_provider(struct device_node *np, return 0; } static inline void of_genpd_del_provider(struct device_node *np) {} +static inline void of_genpd_del_provider_by_data(void *data) {} #define __of_genpd_xlate_simple NULL #define __of_genpd_xlate_onecell NULL
--
2.1.4