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

Commit 6fef37c9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ACPI and power management fixes from Rafael Wysocki:
 "These are regression fixes (ACPI sysfs, ACPI video, suspend test),
  ACPI cpuidle deadlock fix, missing runtime validation of ACPI _DSD
  output, a fix and a new CPU ID for the RAPL driver, new blacklist
  entry for the ACPI EC driver and a couple of trivial cleanups
  (intel_pstate and generic PM domains).

  Specifics:

   - Fix for recently broken test_suspend= command line argument (Rafael
     Wysocki).

   - Fixes for regressions related to the ACPI video driver caused by
     switching the default to native backlight handling in 3.16 from
     Hans de Goede.

   - Fix for a sysfs attribute of ACPI device objects that returns stale
     values sometimes due to the fact that they are cached instead of
     executing the appropriate method (_SUN) every time (broken in
     3.14).  From Yasuaki Ishimatsu.

   - Fix for a deadlock between cpuidle_lock and cpu_hotplug.lock in the
     ACPI processor driver from Jiri Kosina.

   - Runtime output validation for the ACPI _DSD device configuration
     object missing from the support for it that has been introduced
     recently.  From Mika Westerberg.

   - Fix for an unuseful and misleading RAPL (Running Average Power
     Limit) domain detection message in the RAPL driver from Jacob Pan.

   - New Intel Haswell CPU ID for the RAPL driver from Jason Baron.

   - New Clevo W350etq blacklist entry for the ACPI EC driver from Lan
     Tianyu.

   - Cleanup for the intel_pstate driver and the core generic PM domains
     code from Gabriele Mazzotta and Geert Uytterhoeven"

* tag 'pm+acpi-3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / cpuidle: fix deadlock between cpuidle_lock and cpu_hotplug.lock
  ACPI / scan: not cache _SUN value in struct acpi_device_pnp
  cpufreq: intel_pstate: Remove unneeded variable
  powercap / RAPL: change domain detection message
  powercap / RAPL: add support for CPU model 0x3f
  PM / domains: Make generic_pm_domain.name const
  PM / sleep: Fix test_suspend= command line option
  ACPI / EC: Add msi quirk for Clevo W350etq
  ACPI / video: Disable native_backlight on HP ENVY 15 Notebook PC
  ACPI / video: Add a disable_native_backlight quirk
  ACPI / video: Fix use_native_backlight selection logic
  ACPICA: ACPI 5.1: Add support for runtime validation of _DSD package.
parents 9142eade 9aa4e2f6

drivers/acpi/acpica/nsprepkg.c

+39 −0
Original line number Diff line number Diff line
@@ -316,6 +316,45 @@ acpi_ns_check_package(struct acpi_evaluate_info *info, 
		    acpi_ns_check_package_list(info, package, elements, count);

		break;



	case ACPI_PTYPE2_UUID_PAIR:



		/* The package must contain pairs of (UUID + type) */



		if (count & 1) {

			expected_count = count + 1;

			goto package_too_small;

		}



		while (count > 0) {

			status = acpi_ns_check_object_type(info, elements,

							   package->ret_info.

							   object_type1, 0);

			if (ACPI_FAILURE(status)) {

				return (status);

			}



			/* Validate length of the UUID buffer */



			if ((*elements)->buffer.length != 16) {

				ACPI_WARN_PREDEFINED((AE_INFO,

						      info->full_pathname,

						      info->node_flags,

						      "Invalid length for UUID Buffer"));

				return (AE_AML_OPERAND_VALUE);

			}



			status = acpi_ns_check_object_type(info, elements + 1,

							   package->ret_info.

							   object_type2, 0);

			if (ACPI_FAILURE(status)) {

				return (status);

			}



			elements += 2;

			count -= 2;

		}

		break;



	default:



		/* Should not get here if predefined info table is correct */

drivers/acpi/ec.c

+4 −0
Original line number Diff line number Diff line
@@ -1030,6 +1030,10 @@ static struct dmi_system_id ec_dmi_table[] __initdata = { 
	DMI_MATCH(DMI_SYS_VENDOR, "Quanta"),

	DMI_MATCH(DMI_PRODUCT_NAME, "TW9/SW9"),}, NULL},

	{

	ec_flag_msi, "Clevo W350etq", {

	DMI_MATCH(DMI_SYS_VENDOR, "CLEVO CO."),

	DMI_MATCH(DMI_PRODUCT_NAME, "W35_37ET"),}, NULL},

	{

	ec_validate_ecdt, "ASUS hardware", {

	DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},

	{

drivers/acpi/processor_idle.c

+2 −2
Original line number Diff line number Diff line
@@ -1071,9 +1071,9 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) 


	if (pr->id == 0 && cpuidle_get_driver() == &acpi_idle_driver) {



		cpuidle_pause_and_lock();

		/* Protect against cpu-hotplug */

		get_online_cpus();

		cpuidle_pause_and_lock();



		/* Disable all cpuidle devices */

		for_each_online_cpu(cpu) {
@@ -1100,8 +1100,8 @@ int acpi_processor_cst_has_changed(struct acpi_processor *pr) 
				cpuidle_enable_device(dev);

			}

		}

		put_online_cpus();

		cpuidle_resume_and_unlock();

		put_online_cpus();

	}



	return 0;

drivers/acpi/scan.c

+8 −7
Original line number Diff line number Diff line
@@ -667,8 +667,14 @@ static ssize_t 
acpi_device_sun_show(struct device *dev, struct device_attribute *attr,

		     char *buf) {

	struct acpi_device *acpi_dev = to_acpi_device(dev);

	acpi_status status;

	unsigned long long sun;



	status = acpi_evaluate_integer(acpi_dev->handle, "_SUN", NULL, &sun);

	if (ACPI_FAILURE(status))

		return -ENODEV;



	return sprintf(buf, "%lu\n", acpi_dev->pnp.sun);

	return sprintf(buf, "%llu\n", sun);

}

static DEVICE_ATTR(sun, 0444, acpi_device_sun_show, NULL);
@@ -690,7 +696,6 @@ static int acpi_device_setup_files(struct acpi_device *dev) 
{

	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};

	acpi_status status;

	unsigned long long sun;

	int result = 0;



	/*
@@ -731,14 +736,10 @@ static int acpi_device_setup_files(struct acpi_device *dev) 
	if (dev->pnp.unique_id)

		result = device_create_file(&dev->dev, &dev_attr_uid);



	status = acpi_evaluate_integer(dev->handle, "_SUN", NULL, &sun);

	if (ACPI_SUCCESS(status)) {

		dev->pnp.sun = (unsigned long)sun;

	if (acpi_has_method(dev->handle, "_SUN")) {

		result = device_create_file(&dev->dev, &dev_attr_sun);

		if (result)

			goto end;

	} else {

		dev->pnp.sun = (unsigned long)-1;

	}



	if (acpi_has_method(dev->handle, "_STA")) {

drivers/acpi/video.c

+43 −2
Original line number Diff line number Diff line
@@ -82,9 +82,9 @@ module_param(allow_duplicates, bool, 0644); 
 * For Windows 8 systems: used to decide if video module

 * should skip registering backlight interface of its own.

 */

static int use_native_backlight_param = 1;

static int use_native_backlight_param = -1;

module_param_named(use_native_backlight, use_native_backlight_param, int, 0444);

static bool use_native_backlight_dmi = false;

static bool use_native_backlight_dmi = true;



static int register_count;

static struct mutex video_list_lock;
@@ -417,6 +417,12 @@ static int __init video_set_use_native_backlight(const struct dmi_system_id *d) 
	return 0;

}



static int __init video_disable_native_backlight(const struct dmi_system_id *d)

{

	use_native_backlight_dmi = false;

	return 0;

}



static struct dmi_system_id video_dmi_table[] __initdata = {

	/*

	 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
@@ -720,6 +726,41 @@ static struct dmi_system_id video_dmi_table[] __initdata = { 
		DMI_MATCH(DMI_PRODUCT_NAME, "HP EliteBook 8780w"),

		},

	},



	/*

	 * These models have a working acpi_video backlight control, and using

	 * native backlight causes a regression where backlight does not work

	 * when userspace is not handling brightness key events. Disable

	 * native_backlight on these to fix this:

	 * https://bugzilla.kernel.org/show_bug.cgi?id=81691

	 */

	{

	 .callback = video_disable_native_backlight,

	 .ident = "ThinkPad T420",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T420"),

		},

	},

	{

	 .callback = video_disable_native_backlight,

	 .ident = "ThinkPad T520",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T520"),

		},

	},



	/* The native backlight controls do not work on some older machines */

	{

	 /* https://bugs.freedesktop.org/show_bug.cgi?id=81515 */

	 .callback = video_disable_native_backlight,

	 .ident = "HP ENVY 15 Notebook",

	 .matches = {

		DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),

		DMI_MATCH(DMI_PRODUCT_NAME, "HP ENVY 15 Notebook PC"),

		},

	},

	{}

};