PM / Domains: defer dev_pm_domain_set() until genpd->attach_dev succeeds if present
commit975e83cfb8
upstream. If the genpd->attach_dev or genpd->power_on fails, genpd_dev_pm_attach may return -EPROBE_DEFER initially. However genpd_alloc_dev_data sets the PM domain for the device unconditionally. When subsequent attempts are made to call genpd_dev_pm_attach, it may return -EEXISTS checking dev->pm_domain without re-attempting to call attach_dev or power_on. platform_drv_probe then attempts to call drv->probe as the return value -EEXIST != -EPROBE_DEFER, which may end up in a situation where the device is accessed without it's power domain switched on. Fixes:f104e1e5ef
(PM / Domains: Re-order initialization of generic_pm_domain_data) Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Acked-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
69fbb44214
commit
7bd804a05e
|
@ -1029,8 +1029,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
|
||||||
|
|
||||||
spin_unlock_irq(&dev->power.lock);
|
spin_unlock_irq(&dev->power.lock);
|
||||||
|
|
||||||
dev_pm_domain_set(dev, &genpd->domain);
|
|
||||||
|
|
||||||
return gpd_data;
|
return gpd_data;
|
||||||
|
|
||||||
err_free:
|
err_free:
|
||||||
|
@ -1044,8 +1042,6 @@ static struct generic_pm_domain_data *genpd_alloc_dev_data(struct device *dev,
|
||||||
static void genpd_free_dev_data(struct device *dev,
|
static void genpd_free_dev_data(struct device *dev,
|
||||||
struct generic_pm_domain_data *gpd_data)
|
struct generic_pm_domain_data *gpd_data)
|
||||||
{
|
{
|
||||||
dev_pm_domain_set(dev, NULL);
|
|
||||||
|
|
||||||
spin_lock_irq(&dev->power.lock);
|
spin_lock_irq(&dev->power.lock);
|
||||||
|
|
||||||
dev->power.subsys_data->domain_data = NULL;
|
dev->power.subsys_data->domain_data = NULL;
|
||||||
|
@ -1082,6 +1078,8 @@ static int genpd_add_device(struct generic_pm_domain *genpd, struct device *dev,
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
dev_pm_domain_set(dev, &genpd->domain);
|
||||||
|
|
||||||
genpd->device_count++;
|
genpd->device_count++;
|
||||||
genpd->max_off_time_changed = true;
|
genpd->max_off_time_changed = true;
|
||||||
|
|
||||||
|
@ -1143,6 +1141,8 @@ static int genpd_remove_device(struct generic_pm_domain *genpd,
|
||||||
if (genpd->detach_dev)
|
if (genpd->detach_dev)
|
||||||
genpd->detach_dev(genpd, dev);
|
genpd->detach_dev(genpd, dev);
|
||||||
|
|
||||||
|
dev_pm_domain_set(dev, NULL);
|
||||||
|
|
||||||
list_del_init(&pdd->list_node);
|
list_del_init(&pdd->list_node);
|
||||||
|
|
||||||
mutex_unlock(&genpd->lock);
|
mutex_unlock(&genpd->lock);
|
||||||
|
|
Loading…
Reference in a new issue