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

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

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

Pull more ACPI and power management updates from Rafael Wysocki:
 "These are regression fixes (leds-gpio, ACPI backlight driver,
  operating performance points library, ACPI device enumeration
  messages, cpupower tool), other bug fixes (ACPI EC driver, ACPI device
  PM), some cleanups in the operating performance points (OPP)
  framework, continuation of CONFIG_PM_RUNTIME elimination, a couple of
  minor intel_pstate driver changes, a new MAINTAINERS entry for it and
  an ACPI fan driver change needed for better support of thermal
  management in user space.

  Specifics:

   - Fix a regression in leds-gpio introduced by a recent commit that
     inadvertently changed the name of one of the properties used by the
     driver (Fabio Estevam).

   - Fix a regression in the ACPI backlight driver introduced by a
     recent fix that missed one special case that had to be taken into
     account (Aaron Lu).

   - Drop the level of some new kernel messages from the ACPI core
     introduced by a recent commit to KERN_DEBUG which they should have
     used from the start and drop some other unuseful KERN_ERR messages
     printed by ACPI (Rafael J Wysocki).

   - Revert an incorrect commit modifying the cpupower tool (Prarit
     Bhargava).

   - Fix two regressions introduced by recent commits in the OPP library
     and clean up some existing minor issues in that code (Viresh
     Kumar).

   - Continue to replace CONFIG_PM_RUNTIME with CONFIG_PM throughout the
     tree (or drop it where that can be done) in order to make it
     possible to eliminate CONFIG_PM_RUNTIME (Rafael J Wysocki, Ulf
     Hansson, Ludovic Desroches).

     There will be one more "CONFIG_PM_RUNTIME removal" batch after this
     one, because some new uses of it have been introduced during the
     current merge window, but that should be sufficient to finally get
     rid of it.

   - Make the ACPI EC driver more robust against race conditions related
     to GPE handler installation failures (Lv Zheng).

   - Prevent the ACPI device PM core code from attempting to disable
     GPEs that it has not enabled which confuses ACPICA and makes it
     report errors unnecessarily (Rafael J Wysocki).

   - Add a "force" command line switch to the intel_pstate driver to
     make it possible to override the blacklisting of some systems in
     that driver if needed (Ethan Zhao).

   - Improve intel_pstate code documentation and add a MAINTAINERS entry
     for it (Kristen Carlson Accardi).

   - Make the ACPI fan driver create cooling device interfaces witn
     names that reflect the IDs of the ACPI device objects they are
     associated with, except for "generic" ACPI fans (PNP ID "PNP0C0B").

     That's necessary for user space thermal management tools to be able
     to connect the fans with the parts of the system they are supposed
     to be cooling properly.  From Srinivas Pandruvada"

* tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (32 commits)
  MAINTAINERS: add entry for intel_pstate
  ACPI / video: update the skip case for acpi_video_device_in_dod()
  power / PM: Eliminate CONFIG_PM_RUNTIME
  NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  SCSI / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  ACPI / EC: Fix unexpected ec_remove_handlers() invocations
  Revert "tools: cpupower: fix return checks for sysfs_get_idlestate_count()"
  tracing / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  x86 / PM: Replace CONFIG_PM_RUNTIME in io_apic.c
  PM: Remove the SET_PM_RUNTIME_PM_OPS() macro
  mmc: atmel-mci: use SET_RUNTIME_PM_OPS() macro
  PM / Kconfig: Replace PM_RUNTIME with PM in dependencies
  ARM / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  sound / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  phy / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  video / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  tty / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  spi: Replace CONFIG_PM_RUNTIME with CONFIG_PM
  ACPI / PM: Do not disable wakeup GPEs that have not been enabled
  ACPI / utils: Drop error messages from acpi_evaluate_reference()
  ...
parents 385336e3 2ec1c17c

Documentation/kernel-parameters.txt

+9 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		       disable

		         Do not enable intel_pstate as the default

		         scaling driver for the supported processors

		       force

			 Enable intel_pstate on systems that prohibit it by default

			 in favor of acpi-cpufreq. Forcing the intel_pstate driver

			 instead of acpi-cpufreq may disable platform features, such

			 as thermal controls and power capping, that rely on ACPI

			 P-States information being indicated to OSPM and therefore

			 should be used with caution. This option does not work with

			 processors that aren't supported by the intel_pstate driver

			 or on platforms that use pcc-cpufreq instead of acpi-cpufreq.

		       no_hwp

		         Do not enable hardware P state control (HWP)

			 if available.

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4963,6 +4963,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git 
S:	Supported

F:	drivers/idle/intel_idle.c



INTEL PSTATE DRIVER

M:	Kristen Carlson Accardi <kristen@linux.intel.com>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	drivers/cpufreq/intel_pstate.c



INTEL FRAMEBUFFER DRIVER (excluding 810 and 815)

M:	Maik Broemme <mbroemme@plusserver.de>

L:	linux-fbdev@vger.kernel.org

arch/arm/kernel/perf_event.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ static void armpmu_disable(struct pmu *pmu) 
	armpmu->stop(armpmu);

}



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int armpmu_runtime_resume(struct device *dev)

{

	struct arm_pmu_platdata *plat = dev_get_platdata(dev);

arch/arm/mach-davinci/pm_domain.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/pm_clock.h>

#include <linux/platform_device.h>



#ifdef CONFIG_PM_RUNTIME

#ifdef CONFIG_PM

static int davinci_pm_runtime_suspend(struct device *dev)

{

	int ret;

arch/arm/mach-exynos/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS 
	select HAVE_S3C_RTC if RTC_CLASS

	select PINCTRL

	select PINCTRL_EXYNOS

	select PM_GENERIC_DOMAINS if PM_RUNTIME

	select PM_GENERIC_DOMAINS if PM

	select S5P_DEV_MFC

	select SRAM

	select MFD_SYSCON