Commit 71556b98 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: (23 commits)
  ACPI PCI hotplug: harden against panic regression
  ACPI: rename main.c to sleep.c
  dell-laptop: move to drivers/platform/x86/ from drivers/misc/
  eeepc-laptop: enable Bluetooth ACPI details
  ACPI: fix ACPI_FADT_S4_RTC_WAKE comment
  kprobes: check CONFIG_FREEZER instead of CONFIG_PM
  PM: Fix freezer compilation if PM_SLEEP is unset
  thermal fixup for broken BIOS which has invalid trip points.
  ACPI: EC: Don't trust ECDT tables from ASUS
  ACPI: EC: Limit workaround for ASUS notebooks even more
  ACPI: thinkpad-acpi: bump up version to 0.22
  ACPI: thinkpad-acpi: handle HKEY event 6030
  ACPI: thinkpad-acpi: clean-up fan subdriver quirk
  ACPI: thinkpad-acpi: start the event hunt season
  ACPI: thinkpad-acpi: handle HKEY thermal and battery alarms
  ACPI: thinkpad-acpi: clean up hotkey_notify()
  ACPI: thinkpad-acpi: use killable instead of interruptible mutexes
  ACPI: thinkpad-acpi: add UWB radio support
  ACPI: thinkpad-acpi: preserve radio state across shutdown
  ACPI: thinkpad-acpi: resume with radios disabled
  ...
parents abcea859 d45e0855

Documentation/laptops/thinkpad-acpi.txt

+22 −3
Original line number Diff line number Diff line 
		     ThinkPad ACPI Extras Driver



                            Version 0.21

                           May 29th, 2008

                            Version 0.22

                        November 23rd,  2008



               Borislav Deianov <borislav@users.sf.net>

             Henrique de Moraes Holschuh <hmh@hmh.eng.br>
@@ -16,7 +16,8 @@ supported by the generic Linux ACPI drivers. 
This driver used to be named ibm-acpi until kernel 2.6.21 and release

0.13-20070314.  It used to be in the drivers/acpi tree, but it was

moved to the drivers/misc tree and renamed to thinkpad-acpi for kernel

2.6.22, and release 0.14.

2.6.22, and release 0.14.  It was moved to drivers/platform/x86 for

kernel 2.6.29 and release 0.22.



The driver is named "thinkpad-acpi".  In some places, like module

names, "thinkpad_acpi" is used because of userspace issues.
@@ -1412,6 +1413,24 @@ Sysfs notes: 
	rfkill controller switch "tpacpi_wwan_sw": refer to

	Documentation/rfkill.txt for details.



EXPERIMENTAL: UWB

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



This feature is marked EXPERIMENTAL because it has not been extensively

tested and validated in various ThinkPad models yet.  The feature may not

work as expected. USE WITH CAUTION! To use this feature, you need to supply

the experimental=1 parameter when loading the module.



sysfs rfkill class: switch "tpacpi_uwb_sw"



This feature exports an rfkill controller for the UWB device, if one is

present and enabled in the BIOS.



Sysfs notes:



	rfkill controller switch "tpacpi_uwb_sw": refer to

	Documentation/rfkill.txt for details.



Multiple Commands, Module Parameters

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

arch/ia64/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -870,7 +870,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) 
		return 1;



ss_probe:

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)

	if (p->ainsn.inst_flag == INST_FLAG_BOOSTABLE && !p->post_handler) {

		/* Boost up -- we can execute copied instructions directly */

		ia64_psr(regs)->ri = p->ainsn.slot;

arch/x86/kernel/kprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, 
static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs,

				       struct kprobe_ctlblk *kcb)

{

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_PM)

#if !defined(CONFIG_PREEMPT) || defined(CONFIG_FREEZER)

	if (p->ainsn.boostable == 1 && !p->post_handler) {

		/* Boost up -- we can execute copied instructions directly */

		reset_current_kprobe();

drivers/acpi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ obj-y += osl.o utils.o reboot.o\ 


# sleep related files

obj-y				+= wakeup.o

obj-y				+= main.o

obj-y				+= sleep.o

obj-$(CONFIG_ACPI_SLEEP)	+= proc.o

drivers/acpi/ec.c

+30 −43
Original line number Diff line number Diff line
@@ -120,31 +120,6 @@ static struct acpi_ec { 
	spinlock_t curr_lock;

} *boot_ec, *first_ec;



/* 

 * Some Asus system have exchanged ECDT data/command IO addresses.

 */

static int print_ecdt_error(const struct dmi_system_id *id)

{

	printk(KERN_NOTICE PREFIX "%s detected - "

		"ECDT has exchanged control/data I/O address\n",

		id->ident);

	return 0;

}



static struct dmi_system_id __cpuinitdata ec_dmi_table[] = {

	{

	print_ecdt_error, "Asus L4R", {

	DMI_MATCH(DMI_BIOS_VERSION, "1008.006"),

	DMI_MATCH(DMI_PRODUCT_NAME, "L4R"),

	DMI_MATCH(DMI_BOARD_NAME, "L4R") }, NULL},

	{

	print_ecdt_error, "Asus M6R", {

	DMI_MATCH(DMI_BIOS_VERSION, "0207"),

	DMI_MATCH(DMI_PRODUCT_NAME, "M6R"),

	DMI_MATCH(DMI_BOARD_NAME, "M6R") }, NULL},

	{},

};



/* --------------------------------------------------------------------------

                             Transaction Management

   -------------------------------------------------------------------------- */
@@ -983,8 +958,8 @@ static const struct acpi_device_id ec_device_ids[] = { 
int __init acpi_ec_ecdt_probe(void)

{

	acpi_status status;

	struct acpi_ec *saved_ec = NULL;

	struct acpi_table_ecdt *ecdt_ptr;

	acpi_handle dummy;



	boot_ec = make_acpi_ec();

	if (!boot_ec)
@@ -998,21 +973,16 @@ int __init acpi_ec_ecdt_probe(void) 
		pr_info(PREFIX "EC description table is found, configuring boot EC\n");

		boot_ec->command_addr = ecdt_ptr->control.address;

		boot_ec->data_addr = ecdt_ptr->data.address;

		if (dmi_check_system(ec_dmi_table)) {

			/*

			 * If the board falls into ec_dmi_table, it means

			 * that ECDT table gives the incorrect command/status

			 * & data I/O address. Just fix it.

			 */

			boot_ec->data_addr = ecdt_ptr->control.address;

			boot_ec->command_addr = ecdt_ptr->data.address;

		}

		boot_ec->gpe = ecdt_ptr->gpe;

		boot_ec->handle = ACPI_ROOT_OBJECT;

		acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);

		/* Add some basic check against completely broken table */

		if (boot_ec->data_addr != boot_ec->command_addr)

		/* Don't trust ECDT, which comes from ASUSTek */

		if (!dmi_name_in_vendors("ASUS"))

			goto install;

		saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);

		if (!saved_ec)

			return -ENOMEM;

		memcpy(&saved_ec, boot_ec, sizeof(saved_ec));

	/* fall through */

	}

	/* This workaround is needed only on some broken machines,
@@ -1023,12 +993,29 @@ int __init acpi_ec_ecdt_probe(void) 
	/* Check that acpi_get_devices actually find something */

	if (ACPI_FAILURE(status) || !boot_ec->handle)

		goto error;

	if (saved_ec) {

		/* try to find good ECDT from ASUSTek */

		if (saved_ec->command_addr != boot_ec->command_addr ||

		    saved_ec->data_addr != boot_ec->data_addr ||

		    saved_ec->gpe != boot_ec->gpe ||

		    saved_ec->handle != boot_ec->handle)

			pr_info(PREFIX "ASUSTek keeps feeding us with broken "

			"ECDT tables, which are very hard to workaround. "

			"Trying to use DSDT EC info instead. Please send "

			"output of acpidump to linux-acpi@vger.kernel.org\n");

		kfree(saved_ec);

		saved_ec = NULL;

	} else {

		/* We really need to limit this workaround, the only ASUS,

		* which needs it, has fake EC._INI method, so use it as flag.

		* Keep boot_ec struct as it will be needed soon.

		*/

	if (ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI", &dummy)))

		acpi_handle dummy;

		if (!dmi_name_in_vendors("ASUS") ||

		    ACPI_FAILURE(acpi_get_handle(boot_ec->handle, "_INI",

							&dummy)))

			return -ENODEV;

	}

install:

	if (!ec_install_handlers(boot_ec)) {

		first_ec = boot_ec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE