Commit 2e4ab937 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull more power management updates from Rafael Wysocki:
 "These add new CPU IDs to a couple of drivers, fix a possible NULL
  pointer dereference in the cpuidle core, update DT-related things in
  the generic power domains framework and finally update the
  suspend/resume infrastructure to improve the handling of wakeups from
  suspend-to-idle.

  Specifics:

   - Add Intel Gemini Lake CPU IDs to the intel_idle and intel_rapl
     drivers (David Box).

   - Add a NULL pointer check to the cpuidle core to prevent it from
     crashing on platforms with incomplete cpuidle configuration (Fei
     Li).

   - Fix DT-related documentation in the generic power domains (genpd)
     framework and add a MAINTAINERS entry for DT-related material in
     genpd (Viresh Kumar).

   - Update the system suspend/resume infrastructure to improve the
     handling of aborts of suspend transitions in progress in the wakeup
     framework and rework the suspend-to-idle core loop to make it
     possible to filter out spurious wakeup events (specifically the
     ones coming from ACPI) without resuming all the way up to user
     space every time (Rafael Wysocki)"

* tag 'pm-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / sleep: Ignore spurious SCI wakeups from suspend-to-idle
  PM / wakeup: Integrate mechanism to abort transitions in progress
  x86/intel_idle: add Gemini Lake support
  cpuidle: check dev before usage in cpuidle_use_deepest_state()
  powercap: intel_rapl: Add support for Gemini Lake
  PM / Domains: Add DT file to MAINTAINERS
  PM / Domains: Fix DT example
parents b948abf5 80449d89

Documentation/devicetree/bindings/power/power_domain.txt

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ Example 3: 
	child: power-controller@12341000 {

		compatible = "foo,power-controller";

		reg = <0x12341000 0x1000>;

		power-domains = <&parent 0>;

		power-domains = <&parent>;

		#power-domain-cells = <0>;

		domain-idle-states = <&DOMAIN_PWR_DN>;

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5590,6 +5590,7 @@ L: linux-pm@vger.kernel.org 
S:	Supported

F:	drivers/base/power/domain*.c

F:	include/linux/pm_domain.h

F:	Documentation/devicetree/bindings/power/power_domain.txt



GENERIC UIO DRIVER FOR PCI DEVICES

M:	"Michael S. Tsirkin" <mst@redhat.com>

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -782,7 +782,7 @@ static int acpi_battery_update(struct acpi_battery *battery, bool resume) 
	if ((battery->state & ACPI_BATTERY_STATE_CRITICAL) ||

	    (test_bit(ACPI_BATTERY_ALARM_PRESENT, &battery->flags) &&

            (battery->capacity_now <= battery->alarm)))

		pm_wakeup_event(&battery->device->dev, 0);

		pm_wakeup_hard_event(&battery->device->dev);



	return result;

}

drivers/acpi/button.c

+3 −2
Original line number Diff line number Diff line
@@ -216,7 +216,7 @@ static int acpi_lid_notify_state(struct acpi_device *device, int state) 
	}



	if (state)

		pm_wakeup_event(&device->dev, 0);

		pm_wakeup_hard_event(&device->dev);



	ret = blocking_notifier_call_chain(&acpi_lid_notifier, state, device);

	if (ret == NOTIFY_DONE)
@@ -398,7 +398,7 @@ static void acpi_button_notify(struct acpi_device *device, u32 event) 
		} else {

			int keycode;



			pm_wakeup_event(&device->dev, 0);

			pm_wakeup_hard_event(&device->dev);

			if (button->suspended)

				break;
@@ -530,6 +530,7 @@ static int acpi_button_add(struct acpi_device *device) 
		lid_device = device;

	}



	device_init_wakeup(&device->dev, true);

	printk(KERN_INFO PREFIX "%s [%s]\n", name, acpi_device_bid(device));

	return 0;

drivers/acpi/device_pm.c

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <linux/pm_qos.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/suspend.h>



#include "internal.h"
@@ -399,7 +400,7 @@ static void acpi_pm_notify_handler(acpi_handle handle, u32 val, void *not_used) 
	mutex_lock(&acpi_pm_notifier_lock);



	if (adev->wakeup.flags.notifier_present) {

		__pm_wakeup_event(adev->wakeup.ws, 0);

		pm_wakeup_ws_event(adev->wakeup.ws, 0, true);

		if (adev->wakeup.context.work.func)

			queue_pm_work(&adev->wakeup.context.work);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE