Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug',... (1a05e467) · Commits · 戴 / test

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/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
		@@ -21,7 +21,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_ARCH_ACORN) += ecard.o
		obj-$(CONFIG_FIQ) += fiq.o fiqasm.o

arch/arm/kernel/cpuidle.c

0 → 100644

+21 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 Linaro Ltd.
		*
		* The code contained herein is licensed under the GNU General Public
		* License. You may obtain a copy of the GNU General Public License
		* Version 2 or later at the following locations:
		*
		* http://www.opensource.org/licenses/gpl-license.html
		* http://www.gnu.org/copyleft/gpl.html
		*/

		#include <linux/cpuidle.h>
		#include <asm/proc-fns.h>

		int arm_cpuidle_simple_enter(struct cpuidle_device *dev,
		struct cpuidle_driver *drv, int index)
		{
		cpu_do_idle();

		return index;
		}

Admin message