Merge tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management and ACPI material from Rafael J Wysocki: "These are fixes (operating performance points library, cpufreq-dt driver, cpufreq core, ACPI backlight, cpupower tool), cleanups (cpuidle), new processor IDs for the RAPL (Running Average Power Limit) power capping driver, and a modification of the generic power domains framework allowing modular drivers to call one of its helper functions. Specifics: - Fix for a potential NULL pointer dereference in the cpufreq core due to an initialization race condition (Ethan Zhao). - Fixes for abuse of the OPP (Operating Performance Points) API related to RCU and other minor issues in the OPP library and the cpufreq-dt driver (Dmitry Torokhov). - cpuidle governors cleanup making them measure idle duration in a better way without using the CPUIDLE_FLAG_TIME_INVALID flag which allows that flag to be dropped from the ACPI cpuidle driver and from the core too (Len Brown). - New ACPI backlight blacklist entries for Samsung machines without a working native backlight interface that need to use the ACPI backlight instead (Aaron Lu). - New CPU IDs of future Intel Xeon CPUs for the Intel RAPL power capping driver (Jacob Pan). - Generic power domains framework modification to export the of_genpd_get_from_provider() function to modular drivers that will allow future driver modifications to be based on the mainline (Amit Daniel Kachhap). - Two fixes for the cpupower tool (Michal Privoznik, Prarit Bhargava)" * tag 'pm+acpi-3.19-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: ACPI / video: Add some Samsung models to disable_native_backlight list tools / cpupower: Fix no idle state information return value tools / cpupower: Correctly detect if running as root cpufreq: fix a NULL pointer dereference in __cpufreq_governor() cpufreq-dt: defer probing if OPP table is not ready PM / OPP: take RCU lock in dev_pm_opp_get_opp_count PM / OPP: fix warning in of_free_opp_table() PM / OPP: add some lockdep annotations powercap / RAPL: add IDs for future Xeon CPUs PM / Domains: Export of_genpd_get_from_provider function cpuidle / ACPI: remove unused CPUIDLE_FLAG_TIME_INVALID cpuidle: ladder: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID cpuidle: menu: Better idle duration measurement without using CPUIDLE_FLAG_TIME_INVALID

Linus Torvalds committed 11 years ago

Commit df90dcd2 parents 346eef2 651c32913 files · +89 −37Browse files

Unified · Split

13 files

drivers/acpi/processor_idle.c +0 −2
drivers/acpi/video.c +17 −0
drivers/base/power/domain.c +2 −1
drivers/base/power/opp.c +31 −8
drivers/cpufreq/cpufreq-dt.c +11 −0
drivers/cpufreq/cpufreq.c +6 −0
drivers/cpuidle/governors/ladder.c +1 −6
drivers/cpuidle/governors/menu.c +10 −15
drivers/powercap/intel_rapl.c +1 −0
include/linux/cpuidle.h +0 −3
include/linux/pm_domain.h +8 −0
tools/power/cpupower/utils/cpupower.c +1 −1
tools/power/cpupower/utils/helpers/sysfs.c +1 −1

drivers/acpi/processor_idle.c+0−2

@@ -985,8 +985,6 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) · 984 unmodified lines
985	state->flags = 0;	985	state->flags = 0;
986	switch (cx->type) {	986	switch (cx->type) {
987	case ACPI_STATE_C1:	987	case ACPI_STATE_C1:
988	if (cx->entry_method != ACPI_CSTATE_FFH)
989	state->flags \|= CPUIDLE_FLAG_TIME_INVALID;
990		988
991	state->enter = acpi_idle_enter_c1;	989	state->enter = acpi_idle_enter_c1;
992	state->enter_dead = acpi_idle_play_dead;	990	state->enter_dead = acpi_idle_play_dead;

drivers/acpi/video.c+17−0

@@ -505,6 +505,23 @@ static struct dmi_system_id video_dmi_table[] __initdata = { · 504 unmodified lines
505	DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),	505	DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),
506	},	506	},
507	},	507	},
		508
		509	{
		510	.callback = video_disable_native_backlight,
		511	.ident = "SAMSUNG 870Z5E/880Z5E/680Z5E",
		512	.matches = {
		513	DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
		514	DMI_MATCH(DMI_PRODUCT_NAME, "870Z5E/880Z5E/680Z5E"),
		515	},
		516	},
		517	{
		518	.callback = video_disable_native_backlight,
		519	.ident = "SAMSUNG 370R4E/370R4V/370R5E/3570RE/370R5V",
		520	.matches = {
		521	DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),
		522	DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"),
		523	},
		524	},
508	{}	525	{}
509	};	526	};
510		527

drivers/base/power/domain.c+2−1

  * Returns a valid pointer to struct generic_pm_domain on success or ERR_PTR()
  * on failure.
  */
-static struct generic_pm_domain *of_genpd_get_from_provider(
+struct generic_pm_domain *of_genpd_get_from_provider(
 					struct of_phandle_args *genpdspec)
 {
 	struct generic_pm_domain *genpd = ERR_PTR(-ENOENT);
 	return genpd;
 }
+EXPORT_SYMBOL_GPL(of_genpd_get_from_provider);
 /**
  * genpd_dev_pm_detach - Detach a device from its PM domain.

drivers/base/power/opp.c+31−8

 /* Lock to allow exclusive modification to the device and opp lists */
 static DEFINE_MUTEX(dev_opp_list_lock);
+#define opp_rcu_lockdep_assert()					\
+do {									\
+	rcu_lockdep_assert(rcu_read_lock_held() ||			\
+				lockdep_is_held(&dev_opp_list_lock),	\
+			   "Missing rcu_read_lock() or "		\
+			   "dev_opp_list_lock protection");		\
+} while (0)
 /**
  * find_device_opp() - find device_opp struct using device pointer
  * @dev:	device pointer used to lookup device OPPs
  * This function returns the number of available opps if there are any,
  * else returns 0 if none or the corresponding error value.
  *
- * Locking: This function must be called under rcu_read_lock(). This function
+ * Locking: This function takes rcu_read_lock().
- * internally references two RCU protected structures: device_opp and opp which
- * are safe as long as we are under a common RCU locked section.
  */
 int dev_pm_opp_get_opp_count(struct device *dev)
 {
 	struct dev_pm_opp *temp_opp;
 	int count = 0;
+	rcu_read_lock();
 	dev_opp = find_device_opp(dev);
 	if (IS_ERR(dev_opp)) {
-		int r = PTR_ERR(dev_opp);
+		count = PTR_ERR(dev_opp);
-		dev_err(dev, "%s: device OPP not found (%d)\n", __func__, r);
+		dev_err(dev, "%s: device OPP not found (%d)\n",
-		return r;
+			__func__, count);
+		goto out_unlock;
 	}
 	list_for_each_entry_rcu(temp_opp, &dev_opp->opp_list, node) {
 			count++;
 	}
+out_unlock:
+	rcu_read_unlock();
 	return count;
 }
 EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_count);
 	struct device_opp *dev_opp;
 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+	opp_rcu_lockdep_assert();
 	dev_opp = find_device_opp(dev);
 	if (IS_ERR(dev_opp)) {
 		int r = PTR_ERR(dev_opp);
 	struct device_opp *dev_opp;
 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+	opp_rcu_lockdep_assert();
 	if (!dev || !freq) {
 		dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);
 		return ERR_PTR(-EINVAL);
 	struct device_opp *dev_opp;
 	struct dev_pm_opp *temp_opp, *opp = ERR_PTR(-ERANGE);
+	opp_rcu_lockdep_assert();
 	if (!dev || !freq) {
 		dev_err(dev, "%s: Invalid argument freq=%p\n", __func__, freq);
 		return ERR_PTR(-EINVAL);
 	/* Check for existing list for 'dev' */
 	dev_opp = find_device_opp(dev);
-	if (WARN(IS_ERR(dev_opp), "%s: dev_opp: %ld\n", dev_name(dev),
+	if (IS_ERR(dev_opp)) {
-		 PTR_ERR(dev_opp)))
+		int error = PTR_ERR(dev_opp);
+		if (error != -ENODEV)
+			WARN(1, "%s: dev_opp: %d\n",
+			     IS_ERR_OR_NULL(dev) ?
+					"Invalid device" : dev_name(dev),
+			     error);
 		return;
+	}
 	/* Hold our list modification lock here */
 	mutex_lock(&dev_opp_list_lock);

drivers/cpufreq/cpufreq-dt.c+11−0

@@ -211,6 +211,17 @@ static int cpufreq_init(struct cpufreq_policy *policy) · 210 unmodified lines
211	/* OPPs might be populated at runtime, don't check for error here */	211	/* OPPs might be populated at runtime, don't check for error here */
212	of_init_opp_table(cpu_dev);	212	of_init_opp_table(cpu_dev);
213		213
		214	/*
		215	* But we need OPP table to function so if it is not there let's
		216	* give platform code chance to provide it for us.
		217	*/
		218	ret = dev_pm_opp_get_opp_count(cpu_dev);
		219	if (ret <= 0) {
		220	pr_debug("OPP table is not ready, deferring probe\n");
		221	ret = -EPROBE_DEFER;
		222	goto out_free_opp;
		223	}
		224
214	priv = kzalloc(sizeof(*priv), GFP_KERNEL);	225	priv = kzalloc(sizeof(*priv), GFP_KERNEL);
215	if (!priv) {	226	if (!priv) {
216	ret = -ENOMEM;	227	ret = -ENOMEM;

drivers/cpufreq/cpufreq.c+6−0

 	/* Don't start any governor operations if we are entering suspend */
 	if (cpufreq_suspended)
 		return 0;
+	/*
+	 * Governor might not be initiated here if ACPI _PPC changed
+	 * notification happened, so check it.
+	 */
+	if (!policy->governor)
+		return -EINVAL;
 	if (policy->governor->max_transition_latency &&
 	    policy->cpuinfo.transition_latency >

drivers/cpuidle/governors/ladder.c+1−6

 	last_state = &ldev->states[last_idx];
-	if (!(drv->states[last_idx].flags & CPUIDLE_FLAG_TIME_INVALID)) {
+	last_residency = cpuidle_get_last_residency(dev) - drv->states[last_idx].exit_latency;
-		last_residency = cpuidle_get_last_residency(dev) - \
-					 drv->states[last_idx].exit_latency;
-	}
-	else
-		last_residency = last_state->threshold.promotion_time + 1;
 	/* consider promotion */
 	if (last_idx < drv->state_count - 1 &&

drivers/cpuidle/governors/menu.c+10−15

 	 * power state and occurrence of the wakeup event.
 	 *
 	 * If the entered idle state didn't support residency measurements,
-	 * we are basically lost in the dark how much time passed.
+	 * we use them anyway if they are short, and if long,
-	 * As a compromise, assume we slept for the whole expected time.
+	 * truncate to the whole expected time.
 	 *
 	 * Any measured amount of time will include the exit latency.
 	 * Since we are interested in when the wakeup begun, not when it
 	 * the measured amount of time is less than the exit latency,
 	 * assume the state was never reached and the exit latency is 0.
 	 */
-	if (unlikely(target->flags & CPUIDLE_FLAG_TIME_INVALID)) {
-		/* Use timer value as is */
-		measured_us = data->next_timer_us;
-	} else {
+	/* measured value */
-		/* Use measured value */
+	measured_us = cpuidle_get_last_residency(dev);
-		measured_us = cpuidle_get_last_residency(dev);
-		/* Deduct exit latency */
+	/* Deduct exit latency */
-		if (measured_us > target->exit_latency)
+	if (measured_us > target->exit_latency)
-			measured_us -= target->exit_latency;
+		measured_us -= target->exit_latency;
-		/* Make sure our coefficients do not exceed unity */
+	/* Make sure our coefficients do not exceed unity */
-		if (measured_us > data->next_timer_us)
+	if (measured_us > data->next_timer_us)
-			measured_us = data->next_timer_us;
+		measured_us = data->next_timer_us;
-	}
 	/* Update our correction ratio */
 	new_factor = data->correction_factor[data->bucket];

drivers/powercap/intel_rapl.c+1−0

@@ -1041,6 +1041,7 @@ static const struct x86_cpu_id rapl_ids[] = { · 1040 unmodified lines
1041	RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */	1041	RAPL_CPU(0x45, rapl_defaults_core),/* Haswell ULT */
1042	RAPL_CPU(0x4C, rapl_defaults_atom),/* Braswell */	1042	RAPL_CPU(0x4C, rapl_defaults_atom),/* Braswell */
1043	RAPL_CPU(0x4A, rapl_defaults_atom),/* Tangier */	1043	RAPL_CPU(0x4A, rapl_defaults_atom),/* Tangier */
		1044	RAPL_CPU(0x56, rapl_defaults_core),/* Future Xeon */
1044	RAPL_CPU(0x5A, rapl_defaults_atom),/* Annidale */	1045	RAPL_CPU(0x5A, rapl_defaults_atom),/* Annidale */
1045	{}	1046	{}
1046	};	1047	};

include/linux/cpuidle.h+0−3

 };
 /* Idle State Flags */
-#define CPUIDLE_FLAG_TIME_INVALID	(0x01) /* is residency time measurable? */
 #define CPUIDLE_FLAG_COUPLED	(0x02) /* state applies to multiple cpus */
 #define CPUIDLE_FLAG_TIMER_STOP (0x04)  /* timer is stopped on this state */
 /**
  * cpuidle_get_last_residency - retrieves the last state's residency time
  * @dev: the target CPU
- *
- * NOTE: this value is invalid if CPUIDLE_FLAG_TIME_INVALID is set
  */
 static inline int cpuidle_get_last_residency(struct cpuidle_device *dev)
 {

include/linux/pm_domain.h+8−0

 int __of_genpd_add_provider(struct device_node *np, genpd_xlate_t xlate,
 			void *data);
 void of_genpd_del_provider(struct device_node *np);
+struct generic_pm_domain *of_genpd_get_from_provider(
+			struct of_phandle_args *genpdspec);
 struct generic_pm_domain *__of_genpd_xlate_simple(
 					struct of_phandle_args *genpdspec,
 }
 static inline void of_genpd_del_provider(struct device_node *np) {}
+static inline struct generic_pm_domain *of_genpd_get_from_provider(
+			struct of_phandle_args *genpdspec)
+{
+	return NULL;
+}
 #define __of_genpd_xlate_simple		NULL
 #define __of_genpd_xlate_onecell	NULL

tools/power/cpupower/utils/cpupower.c+1−1

@@ -199,7 +199,7 @@ int main(int argc, const char *argv[]) · 198 unmodified lines
199	}	199	}
200		200
201	get_cpu_info(0, &cpupower_cpu_info);	201	get_cpu_info(0, &cpupower_cpu_info);
202	run_as_root = !getuid();	202	run_as_root = !geteuid();
203	if (run_as_root) {	203	if (run_as_root) {
204	ret = uname(&uts);	204	ret = uname(&uts);
205	if (!ret && !strcmp(uts.machine, "x86_64") &&	205	if (!ret && !strcmp(uts.machine, "x86_64") &&

tools/power/cpupower/utils/helpers/sysfs.c+1−1

@@ -361,7 +361,7 @@ unsigned int sysfs_get_idlestate_count(unsigned int cpu) · 360 unmodified lines
361		361
362	snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpuidle");	362	snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpuidle");
363	if (stat(file, &statbuf) != 0 \|\| !S_ISDIR(statbuf.st_mode))	363	if (stat(file, &statbuf) != 0 \|\| !S_ISDIR(statbuf.st_mode))
364	return -ENODEV;	364	return 0;
365		365
366	snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpu%u/cpuidle/state0", cpu);	366	snprintf(file, SYSFS_PATH_MAX, PATH_TO_CPU "cpu%u/cpuidle/state0", cpu);
367	if (stat(file, &statbuf) != 0 \|\| !S_ISDIR(statbuf.st_mode))	367	if (stat(file, &statbuf) != 0 \|\| !S_ISDIR(statbuf.st_mode))