Commit 4614e0cc authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-cpu', 'pm-cpuidle' and 'pm-domains' 

* pm-cpu:
  kernel/cpu_pm: fix cpu_cluster_pm_exit comment

* pm-cpuidle:
  cpuidle/coupled: Add sanity check for safe_state_index

* pm-domains:
  staging: board: Migrate away from __pm_genpd_name_add_device()
  PM / Domains: Ensure subdomain is not in use before removing
  PM / Domains: Try power off masters in error path of __pm_genpd_poweron()
parents 3e66c4b8 21dd33b0 abceaa9c f33b7740

drivers/base/power/domain.c

+25 −13
Original line number Diff line number Diff line
@@ -212,6 +212,18 @@ static int genpd_power_off(struct generic_pm_domain *genpd, bool timed) 
	return ret;

}



/**

 * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff().

 * @genpd: PM domait to power off.

 *

 * Queue up the execution of pm_genpd_poweroff() unless it's already been done

 * before.

 */

static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)

{

	queue_work(pm_wq, &genpd->power_off_work);

}



/**

 * __pm_genpd_poweron - Restore power to a given PM domain and its masters.

 * @genpd: PM domain to power up.
@@ -259,8 +271,12 @@ static int __pm_genpd_poweron(struct generic_pm_domain *genpd) 
	return 0;



 err:

	list_for_each_entry_continue_reverse(link, &genpd->slave_links, slave_node)

	list_for_each_entry_continue_reverse(link,

					&genpd->slave_links,

					slave_node) {

		genpd_sd_counter_dec(link->master);

		genpd_queue_power_off_work(link->master);

	}



	return ret;

}
@@ -348,18 +364,6 @@ static int genpd_dev_pm_qos_notifier(struct notifier_block *nb, 
	return NOTIFY_DONE;

}



/**

 * genpd_queue_power_off_work - Queue up the execution of pm_genpd_poweroff().

 * @genpd: PM domait to power off.

 *

 * Queue up the execution of pm_genpd_poweroff() unless it's already been done

 * before.

 */

static void genpd_queue_power_off_work(struct generic_pm_domain *genpd)

{

	queue_work(pm_wq, &genpd->power_off_work);

}



/**

 * pm_genpd_poweroff - Remove power from a given PM domain.

 * @genpd: PM domain to power down.
@@ -1469,6 +1473,13 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, 


	mutex_lock(&genpd->lock);



	if (!list_empty(&subdomain->slave_links) || subdomain->device_count) {

		pr_warn("%s: unable to remove subdomain %s\n", genpd->name,

			subdomain->name);

		ret = -EBUSY;

		goto out;

	}



	list_for_each_entry(link, &genpd->master_links, master_node) {

		if (link->slave != subdomain)

			continue;
@@ -1487,6 +1498,7 @@ int pm_genpd_remove_subdomain(struct generic_pm_domain *genpd, 
		break;

	}



out:

	mutex_unlock(&genpd->lock);



	return ret;

drivers/cpuidle/coupled.c

+22 −0
Original line number Diff line number Diff line
@@ -186,6 +186,28 @@ bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state) 
	return drv->states[state].flags & CPUIDLE_FLAG_COUPLED;

}



/**

 * cpuidle_coupled_state_verify - check if the coupled states are correctly set.

 * @drv: struct cpuidle_driver for the platform

 *

 * Returns 0 for valid state values, a negative error code otherwise:

 *  * -EINVAL if any coupled state(safe_state_index) is wrongly set.

 */

int cpuidle_coupled_state_verify(struct cpuidle_driver *drv)

{

	int i;



	for (i = drv->state_count - 1; i >= 0; i--) {

		if (cpuidle_state_is_coupled(drv, i) &&

		    (drv->safe_state_index == i ||

		     drv->safe_state_index < 0 ||

		     drv->safe_state_index >= drv->state_count))

			return -EINVAL;

	}



	return 0;

}



/**

 * cpuidle_coupled_set_ready - mark a cpu as ready

 * @coupled: the struct coupled that contains the current cpu

drivers/cpuidle/cpuidle.h

+6 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ extern void cpuidle_remove_sysfs(struct cpuidle_device *dev); 


#ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED

bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state);

int cpuidle_coupled_state_verify(struct cpuidle_driver *drv);

int cpuidle_enter_state_coupled(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int next_state);

int cpuidle_coupled_register_device(struct cpuidle_device *dev);
@@ -46,6 +47,11 @@ bool cpuidle_state_is_coupled(struct cpuidle_driver *drv, int state) 
	return false;

}



static inline int cpuidle_coupled_state_verify(struct cpuidle_driver *drv)

{

	return 0;

}



static inline int cpuidle_enter_state_coupled(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int next_state)

{

drivers/cpuidle/driver.c

+4 −0
Original line number Diff line number Diff line
@@ -227,6 +227,10 @@ static int __cpuidle_register_driver(struct cpuidle_driver *drv) 
	if (!drv || !drv->state_count)

		return -EINVAL;



	ret = cpuidle_coupled_state_verify(drv);

	if (ret)

		return ret;



	if (cpuidle_disabled())

		return -ENODEV;

drivers/staging/board/armadillo800eva.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static const struct board_staging_dev armadillo800eva_devices[] __initconst = { 
		.pdev		= &lcdc0_device,

		.clocks		= lcdc0_clocks,

		.nclocks	= ARRAY_SIZE(lcdc0_clocks),

		.domain		= "a4lc",

		.domain		= "/system-controller@e6180000/pm-domains/c5/a4lc@1"

	},

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE