Commit 0c581415 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'acpi-assorted' 

* acpi-assorted:
  ACPI / osl: Kill macro INVALID_TABLE().
  earlycpio.c: Fix the confusing comment of find_cpio_data().
  ACPI / x86: Print Hot-Pluggable Field in SRAT.
  ACPI / thermal: Use THERMAL_TRIPS_NONE macro to replace number
  ACPI / thermal: Remove unused macros in the driver/acpi/thermal.c
  ACPI / thermal: Remove the unused lock of struct acpi_thermal
  ACPI / osl: Fix osi_setup_entries[] __initdata attribute location
  ACPI / numa: Fix __init attribute location in slit_valid()
  ACPI / dock: Fix __init attribute location in find_dock_and_bay()
  ACPI / Sleep: Fix incorrect placement of __initdata
  ACPI / processor: Fix incorrect placement of __initdata
  ACPI / EC: Fix incorrect placement of __initdata
  ACPI / scan: Drop unnecessary label from acpi_create_platform_device()
  ACPI: Move acpi_bus_get_device() from bus.c to scan.c
  ACPI / scan: Allow platform device creation without any IO resources
  ACPI: Cleanup sparse warning on acpi_os_initialize1()
  platform / thinkpad: Remove deprecated hotkey_report_mode parameter
  ACPI: Remove the old /proc/acpi/event interface
parents afdca01c 7702ae0d

Documentation/laptops/asus-laptop.txt

+4 −4
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ http://acpi4asus.sf.net/ 


 This driver provides support for extra features of ACPI-compatible ASUS laptops.

 It may also support some MEDION, JVC or VICTOR laptops (such as MEDION 9675 or

 VICTOR XP7210 for example). It makes all the extra buttons generate standard

 ACPI events that go through /proc/acpi/events and input events (like keyboards).

 VICTOR XP7210 for example). It makes all the extra buttons generate input

 events (like keyboards).

 On some models adds support for changing the display brightness and output,

 switching the LCD backlight on and off, and most importantly, allows you to

 blink those fancy LEDs intended for reporting mail and wireless status.
@@ -55,8 +55,8 @@ Usage 
  DSDT) to me.



  That's all, now, all the events generated by the hotkeys of your laptop

  should be reported in your /proc/acpi/event entry. You can check with

  "acpi_listen".

  should be reported via netlink events. You can check with

  "acpi_genl monitor" (part of the acpica project).



  Hotkeys are also reported as input keys (like keyboards) you can check

  which key are supported using "xev" under X11.

Documentation/laptops/sony-laptop.txt

+4 −4
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ Fn keys (hotkeys): 
------------------

Some models report hotkeys through the SNC or SPIC devices, such events are

reported both through the ACPI subsystem as acpi events and through the INPUT

subsystem. See the logs of acpid or /proc/acpi/event and

/proc/bus/input/devices to find out what those events are and which input

devices are created by the driver. Additionally, loading the driver with the

debug option will report all events in the kernel log.

subsystem. See the logs of /proc/bus/input/devices to find out what those

events are and which input devices are created by the driver.

Additionally, loading the driver with the debug option will report all events

in the kernel log.



The "scancodes" passed to the input system (that can be remapped with udev)

are indexes to the table "sony_laptop_input_keycode_map" in the sony-laptop.c

Documentation/laptops/thinkpad-acpi.txt

+6 −67
Original line number Diff line number Diff line
@@ -329,20 +329,6 @@ sysfs notes: 


		This attribute has poll()/select() support.



	hotkey_report_mode:

		Returns the state of the procfs ACPI event report mode

		filter for hot keys.  If it is set to 1 (the default),

		all hot key presses are reported both through the input

		layer and also as ACPI events through procfs (but not

		through netlink).  If it is set to 2, hot key presses

		are reported only through the input layer.



		This attribute is read-only in kernels 2.6.23 or later,

		and read-write on earlier kernels.



		May return -EPERM (write access locked out by module

		parameter) or -EACCES (read-only).



	wakeup_reason:

		Set to 1 if the system is waking up because the user

		requested a bay ejection.  Set to 2 if the system is
@@ -518,24 +504,21 @@ SW_TABLET_MODE Tablet ThinkPads HKEY events 0x5009 and 0x500A 
Non hotkey ACPI HKEY event map:

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



Events that are not propagated by the driver, except for legacy

compatibility purposes when hotkey_report_mode is set to 1:



0x5001		Lid closed

0x5002		Lid opened

0x5009		Tablet swivel: switched to tablet mode

0x500A		Tablet swivel: switched to normal mode

0x7000		Radio Switch may have changed state



Events that are never propagated by the driver:



0x2304		System is waking up from suspend to undock

0x2305		System is waking up from suspend to eject bay

0x2404		System is waking up from hibernation to undock

0x2405		System is waking up from hibernation to eject bay

0x5001		Lid closed

0x5002		Lid opened

0x5009		Tablet swivel: switched to tablet mode

0x500A		Tablet swivel: switched to normal mode

0x5010		Brightness level changed/control event

0x6000		KEYBOARD: Numlock key pressed

0x6005		KEYBOARD: Fn key pressed (TO BE VERIFIED)

0x7000		Radio Switch may have changed state





Events that are propagated by the driver to userspace:
@@ -574,50 +557,6 @@ operating system is to force either an immediate suspend or hibernate 
cycle, or a system shutdown.  Obviously, something is very wrong if this

happens.



Compatibility notes:



ibm-acpi and thinkpad-acpi 0.15 (mainline kernels before 2.6.23) never

supported the input layer, and sent events over the procfs ACPI event

interface.



To avoid sending duplicate events over the input layer and the ACPI

event interface, thinkpad-acpi 0.16 implements a module parameter

(hotkey_report_mode), and also a sysfs device attribute with the same

name.



Make no mistake here: userspace is expected to switch to using the input

layer interface of thinkpad-acpi, together with the ACPI netlink event

interface in kernels 2.6.23 and later, or with the ACPI procfs event

interface in kernels 2.6.22 and earlier.



If no hotkey_report_mode module parameter is specified (or it is set to

zero), the driver defaults to mode 1 (see below), and on kernels 2.6.22

and earlier, also allows one to change the hotkey_report_mode through

sysfs.  In kernels 2.6.23 and later, where the netlink ACPI event

interface is available, hotkey_report_mode cannot be changed through

sysfs (it is read-only).



If the hotkey_report_mode module parameter is set to 1 or 2, it cannot

be changed later through sysfs (any writes will return -EPERM to signal

that hotkey_report_mode was locked.  On 2.6.23 and later, where

hotkey_report_mode cannot be changed at all, writes will return -EACCES).



hotkey_report_mode set to 1 makes the driver export through the procfs

ACPI event interface all hot key presses (which are *also* sent to the

input layer).  This is a legacy compatibility behaviour, and it is also

the default mode of operation for the driver.



hotkey_report_mode set to 2 makes the driver filter out the hot key

presses from the procfs ACPI event interface, so these events will only

be sent through the input layer.  Userspace that has been updated to use

the thinkpad-acpi input layer interface should set hotkey_report_mode to

2.



Hot key press events are never sent to the ACPI netlink event interface.

Really up-to-date userspace under kernel 2.6.23 and later is to use the

netlink interface and the input layer interface, and don't bother at all

with hotkey_report_mode.





Brightness hotkey notes:

arch/x86/mm/srat.c

+7 −4
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ int __init 
acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)

{

	u64 start, end;

	u32 hotpluggable;

	int node, pxm;



	if (srat_disabled())
@@ -154,7 +155,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 
		goto out_err_bad_srat;

	if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)

		goto out_err;

	if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())

	hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;

	if (hotpluggable && !save_add_info())

		goto out_err;



	start = ma->base_address;
@@ -174,9 +176,10 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma) 


	node_set(node, numa_nodes_parsed);



	printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",

	pr_info("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n",

		node, pxm,

	       (unsigned long long) start, (unsigned long long) end - 1);

		(unsigned long long) start, (unsigned long long) end - 1,

		hotpluggable ? " hotplug" : "");



	return 0;

out_err_bad_srat:

drivers/acpi/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -91,24 +91,6 @@ config ACPI_EC_DEBUGFS 
	  Thus this option is a debug option that helps to write ACPI drivers

	  and can be used to identify ACPI code or EC firmware bugs.



config ACPI_PROC_EVENT

	bool "Deprecated /proc/acpi/event support"

	depends on PROC_FS

	default y

	help

	  A user-space daemon, acpid, typically reads /proc/acpi/event

	  and handles all ACPI-generated events.



	  These events are now delivered to user-space either

	  via the input layer or as netlink events.



	  This build option enables the old code for legacy

	  user-space implementation.  After some time, this will

	  be moved under CONFIG_ACPI_PROCFS, and then deleted.



	  Say Y here to retain the old behaviour.  Say N if your

	  user-space is newer than kernel 2.6.23 (September 2007).



config ACPI_AC

	tristate "AC Adapter"

	depends on X86

CRA Git | Maintained and supported by SUSTech CRA and CCSE