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

Commit 08c1184f 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: (47 commits)
  ACPI: pci_link: remove acpi_irq_balance_set() interface
  fujitsu-laptop: Add DMI callback for Lifebook S6420
  ACPI: EC: Don't do transaction from GPE handler in poll mode.
  ACPI: EC: lower interrupt storm treshold
  ACPICA: Use spinlock for acpi_{en|dis}able_gpe
  ACPI: EC: restart failed command
  ACPI: EC: wait for last write gpe
  ACPI: EC: make kernel messages more useful when GPE storm is detected
  ACPI: EC: revert msleep patch
  thinkpad_acpi: fingers off backlight if video.ko is serving this functionality
  sony-laptop: fingers off backlight if video.ko is serving this functionality
  msi-laptop: fingers off backlight if video.ko is serving this functionality
  fujitsu-laptop: fingers off backlight if video.ko is serving this functionality
  eeepc-laptop: fingers off backlight if video.ko is serving this functionality
  compal: fingers off backlight if video.ko is serving this functionality
  asus-acpi: fingers off backlight if video.ko is serving this functionality
  Acer-WMI: fingers off backlight if video.ko is serving this functionality
  ACPI video: if no ACPI backlight support, use vendor drivers
  ACPI: video: Ignore devices that aren't present in hardware
  Delete an unwanted return statement at evgpe.c
  ...
parents f21f237c d1876ba4

Documentation/ABI/testing/sysfs-firmware-acpi

+8 −8
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ Description: 


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



		invalid: it's either a wakeup GPE or a GPE/Fixed Event that

		invalid: it's either a GPE or a Fixed Event that

			doesn't have an event handler.



		disable: the GPE/Fixed Event is valid but disabled.
@@ -117,30 +117,30 @@ Description: 
		and other user space applications so that the machine won't shutdown

		when pressing the power button.

		# cat ff_pwr_btn

		0

		0	enabled

		# press the power button for 3 times;

		# cat ff_pwr_btn

		3

		3	enabled

		# echo disable > ff_pwr_btn

		# cat ff_pwr_btn

		disable

		3	disabled

		# press the power button for 3 times;

		# cat ff_pwr_btn

		disable

		3	disabled

		# echo enable > ff_pwr_btn

		# cat ff_pwr_btn

		4

		4	enabled

		/*

		 * this is because the status bit is set even if the enable bit is cleared,

		 * and it triggers an ACPI fixed event when the enable bit is set again

		 */

		# press the power button for 3 times;

		# cat ff_pwr_btn

		7

		7	enabled

		# echo disable > ff_pwr_btn

		# press the power button for 3 times;

		# echo clear > ff_pwr_btn	/* clear the status bit */

		# echo disable > ff_pwr_btn

		# cat ff_pwr_btn

		7

		7	enabled

Documentation/acpi/debug.txt

0 → 100644
+148 −0
Original line number Diff line number Diff line 
			ACPI Debug Output





The ACPI CA, the Linux ACPI core, and some ACPI drivers can generate debug

output.  This document describes how to use this facility.



Compile-time configuration

--------------------------



ACPI debug output is globally enabled by CONFIG_ACPI_DEBUG.  If this config

option is turned off, the debug messages are not even built into the

kernel.



Boot- and run-time configuration

--------------------------------



When CONFIG_ACPI_DEBUG=y, you can select the component and level of messages

you're interested in.  At boot-time, use the acpi.debug_layer and

acpi.debug_level kernel command line options.  After boot, you can use the

debug_layer and debug_level files in /sys/module/acpi/parameters/ to control

the debug messages.



debug_layer (component)

-----------------------



The "debug_layer" is a mask that selects components of interest, e.g., a

specific driver or part of the ACPI interpreter.  To build the debug_layer

bitmask, look for the "#define _COMPONENT" in an ACPI source file.



You can set the debug_layer mask at boot-time using the acpi.debug_layer

command line argument, and you can change it after boot by writing values

to /sys/module/acpi/parameters/debug_layer.



The possible components are defined in include/acpi/acoutput.h and

include/acpi/acpi_drivers.h.  Reading /sys/module/acpi/parameters/debug_layer

shows the supported mask values, currently these:



    ACPI_UTILITIES                  0x00000001

    ACPI_HARDWARE                   0x00000002

    ACPI_EVENTS                     0x00000004

    ACPI_TABLES                     0x00000008

    ACPI_NAMESPACE                  0x00000010

    ACPI_PARSER                     0x00000020

    ACPI_DISPATCHER                 0x00000040

    ACPI_EXECUTER                   0x00000080

    ACPI_RESOURCES                  0x00000100

    ACPI_CA_DEBUGGER                0x00000200

    ACPI_OS_SERVICES                0x00000400

    ACPI_CA_DISASSEMBLER            0x00000800

    ACPI_COMPILER                   0x00001000

    ACPI_TOOLS                      0x00002000

    ACPI_BUS_COMPONENT              0x00010000

    ACPI_AC_COMPONENT               0x00020000

    ACPI_BATTERY_COMPONENT          0x00040000

    ACPI_BUTTON_COMPONENT           0x00080000

    ACPI_SBS_COMPONENT              0x00100000

    ACPI_FAN_COMPONENT              0x00200000

    ACPI_PCI_COMPONENT              0x00400000

    ACPI_POWER_COMPONENT            0x00800000

    ACPI_CONTAINER_COMPONENT        0x01000000

    ACPI_SYSTEM_COMPONENT           0x02000000

    ACPI_THERMAL_COMPONENT          0x04000000

    ACPI_MEMORY_DEVICE_COMPONENT    0x08000000

    ACPI_VIDEO_COMPONENT            0x10000000

    ACPI_PROCESSOR_COMPONENT        0x20000000



debug_level

-----------



The "debug_level" is a mask that selects different types of messages, e.g.,

those related to initialization, method execution, informational messages, etc.

To build debug_level, look at the level specified in an ACPI_DEBUG_PRINT()

statement.



The ACPI interpreter uses several different levels, but the Linux

ACPI core and ACPI drivers generally only use ACPI_LV_INFO.



You can set the debug_level mask at boot-time using the acpi.debug_level

command line argument, and you can change it after boot by writing values

to /sys/module/acpi/parameters/debug_level.



The possible levels are defined in include/acpi/acoutput.h.  Reading

/sys/module/acpi/parameters/debug_level shows the supported mask values,

currently these:



    ACPI_LV_INIT                    0x00000001

    ACPI_LV_DEBUG_OBJECT            0x00000002

    ACPI_LV_INFO                    0x00000004

    ACPI_LV_INIT_NAMES              0x00000020

    ACPI_LV_PARSE                   0x00000040

    ACPI_LV_LOAD                    0x00000080

    ACPI_LV_DISPATCH                0x00000100

    ACPI_LV_EXEC                    0x00000200

    ACPI_LV_NAMES                   0x00000400

    ACPI_LV_OPREGION                0x00000800

    ACPI_LV_BFIELD                  0x00001000

    ACPI_LV_TABLES                  0x00002000

    ACPI_LV_VALUES                  0x00004000

    ACPI_LV_OBJECTS                 0x00008000

    ACPI_LV_RESOURCES               0x00010000

    ACPI_LV_USER_REQUESTS           0x00020000

    ACPI_LV_PACKAGE                 0x00040000

    ACPI_LV_ALLOCATIONS             0x00100000

    ACPI_LV_FUNCTIONS               0x00200000

    ACPI_LV_OPTIMIZATIONS           0x00400000

    ACPI_LV_MUTEX                   0x01000000

    ACPI_LV_THREADS                 0x02000000

    ACPI_LV_IO                      0x04000000

    ACPI_LV_INTERRUPTS              0x08000000

    ACPI_LV_AML_DISASSEMBLE         0x10000000

    ACPI_LV_VERBOSE_INFO            0x20000000

    ACPI_LV_FULL_TABLES             0x40000000

    ACPI_LV_EVENTS                  0x80000000



Examples

--------



For example, drivers/acpi/bus.c contains this:



    #define _COMPONENT              ACPI_BUS_COMPONENT

    ...

    ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device insertion detected\n"));



To turn on this message, set the ACPI_BUS_COMPONENT bit in acpi.debug_layer

and the ACPI_LV_INFO bit in acpi.debug_level.  (The ACPI_DEBUG_PRINT

statement uses ACPI_DB_INFO, which is macro based on the ACPI_LV_INFO

definition.)



Enable all AML "Debug" output (stores to the Debug object while interpreting

AML) during boot:



    acpi.debug_layer=0xffffffff acpi.debug_level=0x2



Enable PCI and PCI interrupt routing debug messages:



    acpi.debug_layer=0x400000 acpi.debug_level=0x4



Enable all ACPI hardware-related messages:



    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff



Enable all ACPI_DB_INFO messages after boot:



    # echo 0x4 > /sys/module/acpi/parameters/debug_level



Show all valid component values:



    # cat /sys/module/acpi/parameters/debug_layer

Documentation/kernel-parameters.txt

+35 −52
Original line number Diff line number Diff line
@@ -198,59 +198,42 @@ and is between 256 and 4096 characters. It is defined in the file 
			that require a timer override, but don't have

			HPET



	acpi.debug_layer=	[HW,ACPI]

	acpi_backlight=	[HW,ACPI]

			acpi_backlight=vendor

			acpi_backlight=video

			If set to vendor, prefer vendor specific driver

			(e.g. thinkpad_acpi, sony_acpi, etc.) instead

			of the ACPI video.ko driver.



	acpi_display_output=	[HW,ACPI]

			acpi_display_output=vendor

			acpi_display_output=video

			See above.



	acpi.debug_layer=	[HW,ACPI,ACPI_DEBUG]

	acpi.debug_level=	[HW,ACPI,ACPI_DEBUG]

			Format: <int>

			Each bit of the <int> indicates an ACPI debug layer,

			1: enable, 0: disable. It is useful for boot time

			debugging. After system has booted up, it can be set

			via /sys/module/acpi/parameters/debug_layer.

			CONFIG_ACPI_DEBUG must be enabled for this to produce any output.

			Available bits (add the numbers together) to enable debug output

			for specific parts of the ACPI subsystem:

			0x01 utilities 0x02 hardware 0x04 events 0x08 tables

			0x10 namespace 0x20 parser 0x40 dispatcher

			0x80 executer 0x100 resources 0x200 acpica debugger

			0x400 os services 0x800 acpica disassembler.

			The number can be in decimal or prefixed with 0x in hex.

			Warning: Many of these options can produce a lot of

			output and make your system unusable. Be very careful.



	acpi.debug_level=	[HW,ACPI]

			Format: <int>

			Each bit of the <int> indicates an ACPI debug level,

			which corresponds to the level in an ACPI_DEBUG_PRINT

			statement.  After system has booted up, this mask

			can be set via /sys/module/acpi/parameters/debug_level.



			CONFIG_ACPI_DEBUG must be enabled for this to produce

			any output.  The number can be in decimal or prefixed

			with 0x in hex.  Some of these options produce so much

			output that the system is unusable.



			The following global components are defined by the

			ACPI CA:

			       0x01 error

			       0x02 warn

			       0x04 init

			       0x08 debug object

			       0x10 info

			       0x20 init names

			       0x40 parse

			       0x80 load

			      0x100 dispatch

			      0x200 execute

			      0x400 names

			      0x800 operation region

			     0x1000 bfield

			     0x2000 tables

			     0x4000 values

			     0x8000 objects

			    0x10000 resources

			    0x20000 user requests

			    0x40000 package

 			The number can be in decimal or prefixed with 0x in hex.

 			Warning: Many of these options can produce a lot of

 			output and make your system unusable. Be very careful.

			CONFIG_ACPI_DEBUG must be enabled to produce any ACPI

			debug output.  Bits in debug_layer correspond to a

			_COMPONENT in an ACPI source file, e.g.,

			    #define _COMPONENT ACPI_PCI_COMPONENT

			Bits in debug_level correspond to a level in

			ACPI_DEBUG_PRINT statements, e.g.,

			    ACPI_DEBUG_PRINT((ACPI_DB_INFO, ...

			See Documentation/acpi/debug.txt for more information

			about debug layers and levels.



			Enable AML "Debug" output, i.e., stores to the Debug

			object while interpreting AML:

			    acpi.debug_layer=0xffffffff acpi.debug_level=0x2

			Enable PCI/PCI interrupt routing info messages:

			    acpi.debug_layer=0x400000 acpi.debug_level=0x4

			Enable all messages related to ACPI hardware:

			    acpi.debug_layer=0x2 acpi.debug_level=0xffffffff



			Some values produce so much output that the system is

			unusable.  The "log_buf_len" parameter may be useful

			if you need to capture more output.



 	acpi.power_nocheck=	[HW,ACPI]

 			Format: 1/0 enable/disable the check of power state.

MAINTAINERS

+10 −1
Original line number Diff line number Diff line
@@ -2216,6 +2216,13 @@ M: adaplas@gmail.com 
L:	linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)

S:	Maintained



INTEL MENLOW THERMAL DRIVER

P:	Sujith Thomas

M:	sujith.thomas@intel.com

L:	linux-acpi@vger.kernel.org

W:	http://www.lesswatts.org/projects/acpi/

S:	Supported



INTEL IA32 MICROCODE UPDATE SUPPORT

P:	Tigran Aivazian

M:	tigran@aivazian.fsnet.co.uk
@@ -3377,7 +3384,9 @@ S: Maintained 


PNP SUPPORT

P:	Adam Belay

M:	ambx1@neo.rr.com

M:	abelay@mit.edu

P:	Bjorn Helgaas

M:	bjorn.helgaas@hp.com

S:	Maintained



PNXxxxx I2C DRIVER

arch/x86/include/asm/acpi.h

+0 −1
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static inline void acpi_disable_pci(void) 
	acpi_pci_disabled = 1;

	acpi_noirq_set();

}

extern int acpi_irq_balance_set(char *str);



/* routines for saving/restoring kernel state */

extern int acpi_save_state_mem(void);