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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull ACPI & Power Management changes from Len Brown:
 - ACPI 5.0 after-ripples, ACPICA/Linux divergence cleanup
 - cpuidle evolving, more ARM use
 - thermal sub-system evolving, ditto
 - assorted other PM bits

Fix up conflicts in various cpuidle implementations due to ARM cpuidle
cleanups (ARM at91 self-refresh and cpu idle code rewritten into
"standby" in asm conflicting with the consolidation of cpuidle time
keeping), trivial SH include file context conflict and RCU tracing fixes
in generic code.

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: (77 commits)
  ACPI throttling: fix endian bug in acpi_read_throttling_status()
  Disable MCP limit exceeded messages from Intel IPS driver
  ACPI video: Don't start video device until its associated input device has been allocated
  ACPI video: Harden video bus adding.
  ACPI: Add support for exposing BGRT data
  ACPI: export acpi_kobj
  ACPI: Fix logic for removing mappings in 'acpi_unmap'
  CPER failed to handle generic error records with multiple sections
  ACPI: Clean redundant codes in scan.c
  ACPI: Fix unprotected smp_processor_id() in acpi_processor_cst_has_changed()
  ACPI: consistently use should_use_kmap()
  PNPACPI: Fix device ref leaking in acpi_pnp_match
  ACPI: Fix use-after-free in acpi_map_lsapic
  ACPI: processor_driver: add missing kfree
  ACPI, APEI: Fix incorrect APEI register bit width check and usage
  Update documentation for parameter *notrigger* in einj.txt
  ACPI, APEI, EINJ, new parameter to control trigger action
  ACPI, APEI, EINJ, limit the range of einj_param
  ACPI, APEI, Fix ERST header length check
  cpuidle: power_usage should be declared signed integer
  ...
parents 10f3cb41 d326f44e

Documentation/ABI/testing/sysfs-firmware-acpi

+20 −0
Original line number Diff line number Diff line 
What:		/sys/firmware/acpi/bgrt/

Date:		January 2012

Contact:	Matthew Garrett <mjg@redhat.com>

Description:

		The BGRT is an ACPI 5.0 feature that allows the OS

		to obtain a copy of the firmware boot splash and

		some associated metadata. This is intended to be used

		by boot splash applications in order to interact with

		the firmware boot splash in order to avoid jarring

		transitions.



		image: The image bitmap. Currently a 32-bit BMP.

		status: 1 if the image is valid, 0 if firmware invalidated it.

		type: 0 indicates image is in BMP format.

		version: The version of the BGRT. Currently 1.

		xoffset: The number of pixels between the left of the screen

			 and the left edge of the image.

		yoffset: The number of pixels between the top of the screen

			 and the top edge of the image.



What:		/sys/firmware/acpi/interrupts/

Date:		February 2008

Contact:	Len Brown <lenb@kernel.org>

Documentation/acpi/apei/einj.txt

+8 −0
Original line number Diff line number Diff line
@@ -53,6 +53,14 @@ directory apei/einj. The following files are provided. 
  This file is used to set the second error parameter value. Effect of

  parameter depends on error_type specified.



- notrigger

  The EINJ mechanism is a two step process. First inject the error, then

  perform some actions to trigger it. Setting "notrigger" to 1 skips the

  trigger phase, which *may* allow the user to cause the error in some other

  context by a simple access to the cpu, memory location, or device that is

  the target of the error injection. Whether this actually works depends

  on what operations the BIOS actually includes in the trigger phase.



BIOS versions based in the ACPI 4.0 specification have limited options

to control where the errors are injected.  Your BIOS may support an

extension (enabled with the param_extension=1 module parameter, or

Documentation/cpuidle/sysfs.txt

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ drwxr-xr-x 2 root root 0 Feb 8 10:42 state3 
/sys/devices/system/cpu/cpu0/cpuidle/state0:

total 0

-r--r--r-- 1 root root 4096 Feb  8 10:42 desc

-rw-r--r-- 1 root root 4096 Feb  8 10:42 disable

-r--r--r-- 1 root root 4096 Feb  8 10:42 latency

-r--r--r-- 1 root root 4096 Feb  8 10:42 name

-r--r--r-- 1 root root 4096 Feb  8 10:42 power
@@ -45,6 +46,7 @@ total 0 
/sys/devices/system/cpu/cpu0/cpuidle/state1:

total 0

-r--r--r-- 1 root root 4096 Feb  8 10:42 desc

-rw-r--r-- 1 root root 4096 Feb  8 10:42 disable

-r--r--r-- 1 root root 4096 Feb  8 10:42 latency

-r--r--r-- 1 root root 4096 Feb  8 10:42 name

-r--r--r-- 1 root root 4096 Feb  8 10:42 power
@@ -54,6 +56,7 @@ total 0 
/sys/devices/system/cpu/cpu0/cpuidle/state2:

total 0

-r--r--r-- 1 root root 4096 Feb  8 10:42 desc

-rw-r--r-- 1 root root 4096 Feb  8 10:42 disable

-r--r--r-- 1 root root 4096 Feb  8 10:42 latency

-r--r--r-- 1 root root 4096 Feb  8 10:42 name

-r--r--r-- 1 root root 4096 Feb  8 10:42 power
@@ -63,6 +66,7 @@ total 0 
/sys/devices/system/cpu/cpu0/cpuidle/state3:

total 0

-r--r--r-- 1 root root 4096 Feb  8 10:42 desc

-rw-r--r-- 1 root root 4096 Feb  8 10:42 disable

-r--r--r-- 1 root root 4096 Feb  8 10:42 latency

-r--r--r-- 1 root root 4096 Feb  8 10:42 name

-r--r--r-- 1 root root 4096 Feb  8 10:42 power
@@ -72,6 +76,7 @@ total 0 




* desc : Small description about the idle state (string)

* disable : Option to disable this idle state (bool)

* latency : Latency to exit out of this idle state (in microseconds)

* name : Name of the idle state (string)

* power : Power consumed while in this idle state (in milliwatts)

arch/arm/include/asm/cpuidle.h

0 → 100644
+29 −0
Original line number Diff line number Diff line 
#ifndef __ASM_ARM_CPUIDLE_H

#define __ASM_ARM_CPUIDLE_H



#ifdef CONFIG_CPU_IDLE

extern int arm_cpuidle_simple_enter(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int index);

#else

static inline int arm_cpuidle_simple_enter(struct cpuidle_device *dev,

		struct cpuidle_driver *drv, int index) { return -ENODEV; }

#endif



/* Common ARM WFI state */

#define ARM_CPUIDLE_WFI_STATE_PWR(p) {\

	.enter                  = arm_cpuidle_simple_enter,\

	.exit_latency           = 1,\

	.target_residency       = 1,\

	.power_usage		= p,\

	.flags                  = CPUIDLE_FLAG_TIME_VALID,\

	.name                   = "WFI",\

	.desc                   = "ARM WFI",\

}



/*

 * in case power_specified == 1, give a default WFI power value needed

 * by some governors

 */

#define ARM_CPUIDLE_WFI_STATE ARM_CPUIDLE_WFI_STATE_PWR(UINT_MAX)



#endif

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o 


obj-$(CONFIG_LEDS)		+= leds.o

obj-$(CONFIG_OC_ETM)		+= etm.o



obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_FIQ)		+= fiq.o fiqasm.o

obj-$(CONFIG_MODULES)		+= armksyms.o module.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE