On 16 August 2016 at 11:49, Jon Hunter <jonathanh@xxxxxxxxxx> wrote:
> When a PM domain provider is added, there is currently no way to tell if
> any PM domains associated with the provider are present. Naturally, the
> PM domain provider should not be registered if the PM domains have not
> been added. Nonetheless, verify that the PM domain(s) associated with a
> provider are present when registering the PM domain provider.
>
> This change adds a dependency on the function pm_genpd_present() when
> CONFIG_PM_GENERIC_DOMAINS_OF is enabled and so ensure this function is
> available when CONFIG_PM_GENERIC_DOMAINS_OF selected.
>
> Signed-off-by: Jon Hunter <jonathanh@xxxxxxxxxx>
> ---
> drivers/base/power/domain.c | 45 ++++++++++++++++++++++++++++++++++++++++++---
> 1 file changed, 42 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c
> index d09e45145a3d..50223ae0c9a7 100644
> --- a/drivers/base/power/domain.c
> +++ b/drivers/base/power/domain.c
> @@ -586,7 +586,7 @@ static int __init genpd_poweroff_unused(void)
> }
> late_initcall(genpd_poweroff_unused);
>
> -#ifdef CONFIG_PM_SLEEP
> +#if defined(CONFIG_PM_SLEEP) || defined(CONFIG_PM_GENERIC_DOMAINS_OF)
>
> /**
> * pm_genpd_present - Check if the given PM domain has been initialized.
> @@ -606,6 +606,10 @@ static bool pm_genpd_present(const struct generic_pm_domain *genpd)
> return false;
> }
>
> +#endif
> +
> +#ifdef CONFIG_PM_SLEEP
> +
> static bool genpd_dev_active_wakeup(struct generic_pm_domain *genpd,
> struct device *dev)
> {
> @@ -1453,7 +1457,23 @@ static int genpd_add_provider(struct device_node *np, genpd_xlate_t xlate,
> int of_genpd_add_provider_simple(struct device_node *np,
> struct generic_pm_domain *genpd)
> {
> - return genpd_add_provider(np, genpd_xlate_simple, genpd);
> + int ret;
> +
> + if (!np || !genpd)
> + return -EINVAL;
> +
> + mutex_lock(&gpd_list_lock);
> +
> + if (!pm_genpd_present(genpd)) {
> + mutex_unlock(&gpd_list_lock);
> + return -EINVAL;
> + }
> +
> + ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
You could simplify this, by assigning ret and initial value of
-EINVAL, then do like this:
if (pm_genpd_present(genpd))
ret = genpd_add_provider(np, genpd_xlate_simple, genpd);
> +
> + mutex_unlock(&gpd_list_lock);
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(of_genpd_add_provider_simple);
>
> @@ -1465,7 +1485,26 @@ EXPORT_SYMBOL_GPL(of_genpd_add_provider_simple);
> int of_genpd_add_provider_onecell(struct device_node *np,
> struct genpd_onecell_data *data)
> {
> - return genpd_add_provider(np, genpd_xlate_onecell, data);
> + unsigned int i;
> + int ret;
> +
> + if (!np || !data)
> + return -EINVAL;
> +
> + mutex_lock(&gpd_list_lock);
> +
> + for (i = 0; i < data->num_domains; i++) {
> + if (!pm_genpd_present(data->domains[i])) {
> + mutex_unlock(&gpd_list_lock);
> + return -EINVAL;
> + }
> + }
> +
> + ret = genpd_add_provider(np, genpd_xlate_onecell, data);
> +
> + mutex_unlock(&gpd_list_lock);
> +
> + return ret;
> }
> EXPORT_SYMBOL_GPL(of_genpd_add_provider_onecell);
>
> --
> 2.1.4
>
Besides the minor nitpick above, you may add my ack.
Acked-by: Ulf Hansson <ulf.hansson@xxxxxxxxxx>
Kind regards
Uffe
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
