diff options
author | Seth Forshee <seth.forshee@canonical.com> | 2012-01-18 14:44:11 -0500 |
---|---|---|
committer | Matthew Garrett <mjg@redhat.com> | 2012-03-22 09:31:53 -0400 |
commit | f11f999e989061952f1a27bd0c49645a46d13173 (patch) | |
tree | 2e351b98cd900601b45c77af23740834f148703f /drivers | |
parent | af502837a08c8ca3495d3940d4c4eb4e19a3beaa (diff) |
toshiba_acpi: Refuse to load on machines with buggy INFO implementations
Several Satellite models have a buggy implementation of the INFO method
that causes ACPI exceptions when executed:
ACPI Error: Result stack is empty! State=ffff88012d70f800 (20110413/dswstate-98)
ACPI Exception: AE_AML_NO_RETURN_VALUE, Missing or null operand (20110413/dsutils-646)
ACPI Exception: AE_AML_NO_RETURN_VALUE, While creating Arg 0 (20110413/dsutils-763)
ACPI Error: Method parse/execution failed [\_SB_.VALZ.GETE] (Node ffff880131175eb0), AE_AML_NO_RETURN_VALUE (20110413/psparse-536)
ACPI Error: Method parse/execution failed [\_SB_.VALZ.INFO] (Node ffff880131175ed8), AE_AML_NO_RETURN_VALUE (20110413/psparse-536)
toshiba_acpi: ACPI INFO method execution failed
toshiba_acpi: Failed to query hotkey event
All known machines with this implementation also have a WMI interface
with event GUID 59142400-C6A3-40FA-BADB-8A2652834100 which is not seen
on any other models. Refuse to load toshiba_acpi on machines with this
guid.
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/platform/x86/Kconfig | 1 | ||||
-rw-r--r-- | drivers/platform/x86/Makefile | 4 | ||||
-rw-r--r-- | drivers/platform/x86/toshiba_acpi.c | 10 |
3 files changed, 15 insertions, 0 deletions
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 2efd7af2a21e..ce10f0313961 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
@@ -569,6 +569,7 @@ config TOPSTAR_LAPTOP | |||
569 | config ACPI_TOSHIBA | 569 | config ACPI_TOSHIBA |
570 | tristate "Toshiba Laptop Extras" | 570 | tristate "Toshiba Laptop Extras" |
571 | depends on ACPI | 571 | depends on ACPI |
572 | depends on ACPI_WMI | ||
572 | select LEDS_CLASS | 573 | select LEDS_CLASS |
573 | select NEW_LEDS | 574 | select NEW_LEDS |
574 | depends on BACKLIGHT_CLASS_DEVICE | 575 | depends on BACKLIGHT_CLASS_DEVICE |
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index e072c3095915..dcfee6b2606d 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile | |||
@@ -30,7 +30,11 @@ obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o | |||
30 | obj-$(CONFIG_ACPI_WMI) += wmi.o | 30 | obj-$(CONFIG_ACPI_WMI) += wmi.o |
31 | obj-$(CONFIG_MSI_WMI) += msi-wmi.o | 31 | obj-$(CONFIG_MSI_WMI) += msi-wmi.o |
32 | obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o | 32 | obj-$(CONFIG_TOPSTAR_LAPTOP) += topstar-laptop.o |
33 | |||
34 | # toshiba_acpi must link after wmi to ensure that wmi devices are found | ||
35 | # before toshiba_acpi initializes | ||
33 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o | 36 | obj-$(CONFIG_ACPI_TOSHIBA) += toshiba_acpi.o |
37 | |||
34 | obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o | 38 | obj-$(CONFIG_TOSHIBA_BT_RFKILL) += toshiba_bluetooth.o |
35 | obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o | 39 | obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o |
36 | obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o | 40 | obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += intel_scu_ipcutil.o |
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index e3e1fa6db004..ee79ce64d9df 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
@@ -63,6 +63,8 @@ MODULE_AUTHOR("John Belmonte"); | |||
63 | MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver"); | 63 | MODULE_DESCRIPTION("Toshiba Laptop ACPI Extras Driver"); |
64 | MODULE_LICENSE("GPL"); | 64 | MODULE_LICENSE("GPL"); |
65 | 65 | ||
66 | #define TOSHIBA_WMI_EVENT_GUID "59142400-C6A3-40FA-BADB-8A2652834100" | ||
67 | |||
66 | /* Scan code for Fn key on TOS1900 models */ | 68 | /* Scan code for Fn key on TOS1900 models */ |
67 | #define TOS1900_FN_SCAN 0x6e | 69 | #define TOS1900_FN_SCAN 0x6e |
68 | 70 | ||
@@ -1249,6 +1251,14 @@ static int __init toshiba_acpi_init(void) | |||
1249 | { | 1251 | { |
1250 | int ret; | 1252 | int ret; |
1251 | 1253 | ||
1254 | /* | ||
1255 | * Machines with this WMI guid aren't supported due to bugs in | ||
1256 | * their AML. This check relies on wmi initializing before | ||
1257 | * toshiba_acpi to guarantee guids have been identified. | ||
1258 | */ | ||
1259 | if (wmi_has_guid(TOSHIBA_WMI_EVENT_GUID)) | ||
1260 | return -ENODEV; | ||
1261 | |||
1252 | toshiba_proc_dir = proc_mkdir(PROC_TOSHIBA, acpi_root_dir); | 1262 | toshiba_proc_dir = proc_mkdir(PROC_TOSHIBA, acpi_root_dir); |
1253 | if (!toshiba_proc_dir) { | 1263 | if (!toshiba_proc_dir) { |
1254 | pr_err("Unable to create proc dir " PROC_TOSHIBA "\n"); | 1264 | pr_err("Unable to create proc dir " PROC_TOSHIBA "\n"); |