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

Commit f0f1b336 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-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (112 commits)
  ACPI: fix build warning
  Revert "cpuidle: build fix for non-x86"
  ACPI: update intrd DSDT override console messages
  ACPI: update DSDT override documentation
  ACPI: Add "acpi_no_initrd_override" kernel parameter
  ACPI: its a directory not a folder....
  ACPI: misc cleanups
  ACPI: add missing prink prefix strings
  ACPI: cleanup acpi.h
  ACPICA: fix CONFIG_ACPI_DEBUG_FUNC_TRACE build
  ACPI: video: Ignore ACPI video devices that aren't present in hardware
  ACPI: video: reset brightness on resume
  ACPI: video: call ACPI notifier chain for ACPI video notifications
  ACPI: create notifier chain to get hotkey events to graphics driver
  ACPI: video: delete unused display switch on hotkey event code
  ACPI: video: create "brightness_switch_enabled" modparam
  cpuidle: Add a poll_idle method
  ACPI: cpuidle: Support C1 idle time accounting
  ACPI: enable MWAIT for C1 idle
  ACPI: idle: Fix acpi_safe_halt usages and interrupt enabling/disabling
  ...
parents 4383f18b b7143156

Documentation/00-INDEX

+3 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ Following translations are available on the WWW: 
	- this file.

	- this file.

ABI/

ABI/

	- info on kernel <-> userspace ABI and relative interface stability.

	- info on kernel <-> userspace ABI and relative interface stability.



BUG-HUNTING

BUG-HUNTING

	- brute force method of doing binary search of patches to find bug.

	- brute force method of doing binary search of patches to find bug.

Changes

Changes
@@ -66,6 +67,8 @@ VGA-softcursor.txt 
	- how to change your VGA cursor from a blinking underscore.

	- how to change your VGA cursor from a blinking underscore.

accounting/

accounting/

	- documentation on accounting and taskstats.

	- documentation on accounting and taskstats.

acpi/

	- info on ACPI-specific hooks in the kernel.

aoe/

aoe/

	- description of AoE (ATA over Ethernet) along with config examples.

	- description of AoE (ATA over Ethernet) along with config examples.

applying-patches.txt

applying-patches.txt

Documentation/ABI/testing/sysfs-firmware-acpi

0 → 100644
+99 −0
Original line number Original line Diff line number Diff line 
What:		/sys/firmware/acpi/interrupts/

Date:		February 2008

Contact:	Len Brown <lenb@kernel.org>

Description:

		All ACPI interrupts are handled via a single IRQ,

		the System Control Interrupt (SCI), which appears

		as "acpi" in /proc/interrupts.



		However, one of the main functions of ACPI is to make

		the platform understand random hardware without

		special driver support.  So while the SCI handles a few

		well known (fixed feature) interrupts sources, such

		as the power button, it can also handle a variable

		number of a "General Purpose Events" (GPE).



		A GPE vectors to a specified handler in AML, which

		can do a anything the BIOS writer wants from

		OS context.  GPE 0x12, for example, would vector

		to a level or edge handler called _L12 or _E12.

		The handler may do its business and return.

		Or the handler may send send a Notify event

		to a Linux device driver registered on an ACPI device,

		such as a battery, or a processor.



		To figure out where all the SCI's are coming from,

		/sys/firmware/acpi/interrupts contains a file listing

		every possible source, and the count of how many

		times it has triggered.



		$ cd /sys/firmware/acpi/interrupts

		$ grep . *

		error:0

		ff_gbl_lock:0

		ff_pmtimer:0

		ff_pwr_btn:0

		ff_rt_clk:0

		ff_slp_btn:0

		gpe00:0

		gpe01:0

		gpe02:0

		gpe03:0

		gpe04:0

		gpe05:0

		gpe06:0

		gpe07:0

		gpe08:0

		gpe09:174

		gpe0A:0

		gpe0B:0

		gpe0C:0

		gpe0D:0

		gpe0E:0

		gpe0F:0

		gpe10:0

		gpe11:60

		gpe12:0

		gpe13:0

		gpe14:0

		gpe15:0

		gpe16:0

		gpe17:0

		gpe18:0

		gpe19:7

		gpe1A:0

		gpe1B:0

		gpe1C:0

		gpe1D:0

		gpe1E:0

		gpe1F:0

		gpe_all:241

		sci:241



		sci - The total number of times the ACPI SCI

		has claimed an interrupt.



		gpe_all - count of SCI caused by GPEs.



		gpeXX - count for individual GPE source



		ff_gbl_lock - Global Lock



		ff_pmtimer - PM Timer



		ff_pwr_btn - Power Button



		ff_rt_clk - Real Time Clock



		ff_slp_btn - Sleep Button



		error - an interrupt that can't be accounted for above.



		Root has permission to clear any of these counters.  Eg.

		# echo 0 > gpe11



		All counters can be cleared by clearing the total "sci":

		# echo 0 > sci



		None of these counters has an effect on the function

		of the system, they are simply statistics.

Documentation/acpi/dsdt-override.txt

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
Linux supports two methods of overriding the BIOS DSDT:



CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.



CONFIG_ACPI_CUSTOM_DSDT_INITRD adds the image to the initrd.



When to use these methods is described in detail on the

Linux/ACPI home page:

http://www.lesswatts.org/projects/acpi/overridingDSDT.php



Note that if both options are used, the DSDT supplied

by the INITRD method takes precedence.



Documentation/initramfs-add-dsdt.sh is provided for convenience

for use with the CONFIG_ACPI_CUSTOM_DSDT_INITRD method.

Documentation/acpi/initramfs-add-dsdt.sh

0 → 100755
+43 −0
Original line number Original line Diff line number Diff line 
#!/bin/bash

# Adds a DSDT file to the initrd (if it's an initramfs)

# first argument is the name of archive

# second argument is the name of the file to add

# The file will be copied as /DSDT.aml



# 20060126: fix "Premature end of file" with some old cpio (Roland Robic)

# 20060205: this time it should really work



# check the arguments

if [ $# -ne 2 ]; then

	program_name=$(basename $0)

	echo "\

$program_name: too few arguments

Usage: $program_name initrd-name.img DSDT-to-add.aml

Adds a DSDT file to an initrd (in initramfs format)



  initrd-name.img: filename of the initrd in initramfs format

  DSDT-to-add.aml: filename of the DSDT file to add

  " 1>&2

    exit 1

fi



# we should check it's an initramfs



tempcpio=$(mktemp -d)

# cleanup on exit, hangup, interrupt, quit, termination

trap 'rm -rf $tempcpio' 0 1 2 3 15



# extract the archive

gunzip -c "$1" > "$tempcpio"/initramfs.cpio || exit 1



# copy the DSDT file at the root of the directory so that we can call it "/DSDT.aml"

cp -f "$2" "$tempcpio"/DSDT.aml



# add the file

cd "$tempcpio"

(echo DSDT.aml | cpio --quiet -H newc -o -A -O "$tempcpio"/initramfs.cpio) || exit 1

cd "$OLDPWD"



# re-compress the archive

gzip -c "$tempcpio"/initramfs.cpio > "$1"

Documentation/acpi/method-tracing.txt

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
/sys/module/acpi/parameters/:



trace_method_name

	The AML method name that the user wants to trace



trace_debug_layer

	The temporary debug_layer used when tracing the method.

	Using 0xffffffff by default if it is 0.



trace_debug_level

	The temporary debug_level used when tracing the method.

	Using 0x00ffffff by default if it is 0.



trace_state

	The status of the tracing feature.



	"enabled" means this feature is enabled

	and the AML method is traced every time it's executed.



	"1" means this feature is enabled and the AML method

	will only be traced during the next execution.



	"disabled" means this feature is disabled.

	Users can enable/disable this debug tracing feature by

	"echo string > /sys/module/acpi/parameters/trace_state".

	"string" should be one of "enable", "disable" and "1".