Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit df90dcd1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 346eef2f 651c3293

drivers/acpi/processor_idle.c

+0 −2
Original line number Diff line number Diff line
@@ -985,8 +985,6 @@ static int acpi_processor_setup_cpuidle_states(struct acpi_processor *pr) 
		state->flags = 0;

		switch (cx->type) {

			case ACPI_STATE_C1:

			if (cx->entry_method != ACPI_CSTATE_FFH)

				state->flags |= CPUIDLE_FLAG_TIME_INVALID;



			state->enter = acpi_idle_enter_c1;

			state->enter_dead = acpi_idle_play_dead;

drivers/acpi/video.c

+17 −0
Original line number Diff line number Diff line
@@ -505,6 +505,23 @@ static struct dmi_system_id video_dmi_table[] __initdata = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),

		},

	},



	{

	 .callback = video_disable_native_backlight,

	 .ident = "SAMSUNG 870Z5E/880Z5E/680Z5E",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

		DMI_MATCH(DMI_PRODUCT_NAME, "870Z5E/880Z5E/680Z5E"),

		},

	},

	{

	 .callback = video_disable_native_backlight,

	 .ident = "SAMSUNG 370R4E/370R4V/370R5E/3570RE/370R5V",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "SAMSUNG ELECTRONICS CO., LTD."),

		DMI_MATCH(DMI_PRODUCT_NAME, "370R4E/370R4V/370R5E/3570RE/370R5V"),

		},

	},

	{}

};

drivers/base/power/domain.c

+2 −1
Original line number Diff line number Diff line
@@ -2088,7 +2088,7 @@ EXPORT_SYMBOL_GPL(of_genpd_del_provider); 
 * 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);
@@ -2108,6 +2108,7 @@ static struct generic_pm_domain *of_genpd_get_from_provider( 


	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
Original line number Diff line number Diff line
@@ -108,6 +108,14 @@ static LIST_HEAD(dev_opp_list); 
/* 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
@@ -208,9 +216,7 @@ EXPORT_SYMBOL_GPL(dev_pm_opp_get_freq); 
 * 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

 * internally references two RCU protected structures: device_opp and opp which

 * are safe as long as we are under a common RCU locked section.

 * Locking: This function takes rcu_read_lock().

 */

int dev_pm_opp_get_opp_count(struct device *dev)

{
@@ -218,11 +224,14 @@ 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);

		dev_err(dev, "%s: device OPP not found (%d)\n", __func__, r);

		return r;

		count = PTR_ERR(dev_opp);

		dev_err(dev, "%s: device OPP not found (%d)\n",

			__func__, count);

		goto out_unlock;

	}



	list_for_each_entry_rcu(temp_opp, &dev_opp->opp_list, node) {
@@ -230,6 +239,8 @@ int dev_pm_opp_get_opp_count(struct device *dev) 
			count++;

	}



out_unlock:

	rcu_read_unlock();

	return count;

}

EXPORT_SYMBOL_GPL(dev_pm_opp_get_opp_count);
@@ -267,6 +278,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_exact(struct device *dev, 
	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);
@@ -313,6 +326,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_ceil(struct device *dev, 
	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);
@@ -361,6 +376,8 @@ struct dev_pm_opp *dev_pm_opp_find_freq_floor(struct device *dev, 
	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);
@@ -783,9 +800,15 @@ void of_free_opp_table(struct device *dev) 


	/* 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),

		 PTR_ERR(dev_opp)))

	if (IS_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
Original line number Diff line number Diff line
@@ -211,6 +211,17 @@ static int cpufreq_init(struct cpufreq_policy *policy) 
	/* OPPs might be populated at runtime, don't check for error here */

	of_init_opp_table(cpu_dev);



	/*

	 * But we need OPP table to function so if it is not there let's

	 * give platform code chance to provide it for us.

	 */

	ret = dev_pm_opp_get_opp_count(cpu_dev);

	if (ret <= 0) {

		pr_debug("OPP table is not ready, deferring probe\n");

		ret = -EPROBE_DEFER;

		goto out_free_opp;

	}



	priv = kzalloc(sizeof(*priv), GFP_KERNEL);

	if (!priv) {

		ret = -ENOMEM;