(unknown)
Subsystems (4)
Len Brown
reviewera few patches for 2.6.29-rc8
Len Brown
reviewerPATCH 1/14 suspend: switch the Asus Pundit P1-AH2 to old ACPI sleep ordering
From: Andy Whitcroft <[email protected]>
Switch the Asus Pundit P1-AH2 (M2N8L motherboard) to the old ACPI 1.0 sleep ordering by default. Without this it will not suspend/resume correctly.
--- drivers/acpi/sleep.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/acpi/sleep.c +8 -0
@@ -378,6 +378,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Macmini1,1"), }, }, + { + .callback = init_old_suspend_ordering, + .ident = "Asus Pundit P1-AH2 (M2N8L motherboard)", + .matches = { +DMI_MATCH (DMI_BOARD_VENDOR ,"ASUSTek Computer INC." ), + DMI_MATCH(DMI_BOARD_NAME, "M2N8L"), + }, + }, {}, };#endif /* CONFIG_SUSPEND */
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 2/14 Revert "ACPI: make some IO ports off-limits to AML"
In reply to Len BrownFrom: Len Brown <[email protected]>
This reverts commit 5ec5d38a1c8af255ffc481c81eef13e9155524b3. because it caused spurious dmesg warmings.
We'll implement the check for off-limit ports
in a more clever way in the future.
http://bugzilla.kernel.org/show_bug.cgi?id=12758
--- drivers/acpi/osl.c | 50 -------------------------------------------------- 1 files changed, 0 insertions(+), 50 deletions(-)
drivers/acpi/osl.c +0 -50
@@ -1317,54 +1317,6 @@ acpi_os_validate_interface (char *interface)return AE_SUPPORT ; } -#ifdef CONFIG_X86 - -struct aml_port_desc { -uint start; -uint end; -char * name; -char warned; -}; - -static struct aml_port_desc aml_invalid_port_list[] = { - {0x20 ,0x21 ,"PIC0" ,0 }, - {0xA0 ,0xA1 ,"PIC1" ,0 }, - {0x4D0 ,0x4D1 ,"ELCR" ,0 } -}; - -/* -* valid_aml_io_address() -* -* if valid, return true -* else invalid, warn once, return false -*/ -static bool valid_aml_io_address (uint address,uint length) -{ -int i; -int entries =sizeof (aml_invalid_port_list) /sizeof (struct aml_port_desc ); - -for (i =0 ; i < entries; ++i) { -if ((address >= aml_invalid_port_list[i].start && - address <= aml_invalid_port_list[i].end) || - (address + length >= aml_invalid_port_list[i].start && - address + length <= aml_invalid_port_list[i].end)) - { -if (!aml_invalid_port_list[i].warned) - { -printk (KERN_ERR "ACPI: Denied BIOS AML access" -" to invalid port 0x%x+0x%x (%s)\n" , - address, length, - aml_invalid_port_list[i].name); - aml_invalid_port_list[i].warned =1 ; - } -return false;/* invalid */ - } - } -return true;/* valid */ -} -#else -static inline bool valid_aml_io_address (uint address,uint length) {return true; } -#endif /****************************************************************************** * * FUNCTION: acpi_os_validate_address
@@ -1394,8 +1346,6 @@ acpi_os_validate_address (switch (space_id) {case ACPI_ADR_SPACE_SYSTEM_IO : -if (!valid_aml_io_address (address, length)) -return AE_AML_ILLEGAL_ADDRESS ;case ACPI_ADR_SPACE_SYSTEM_MEMORY :/* Only interference checks against SystemIO and SytemMemory are needed */
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 3/14 ACPI suspend: Blacklist Toshiba Satellite L300 that requires to set SCI_EN directly on resume
In reply to Len BrownFrom: Zhang Rui <[email protected]>
This is a supplement of commit 65df78473ffbf3bff5e2034df1638acc4f3ddd50.
http://bugzilla.kernel.org/show_bug.cgi?id=12798
--- drivers/acpi/sleep.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/acpi/sleep.c +8 -0
@@ -386,6 +386,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { DMI_MATCH(DMI_BOARD_NAME, "M2N8L"), }, }, + { + .callback = init_set_sci_en_on_resume, + .ident = "Toshiba Satellite L300", + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), + DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"), + }, + }, {}, };#endif /* CONFIG_SUSPEND */
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 4/14 ACPI: remove doubled status checking
In reply to Len BrownFrom: Jiri Slaby <[email protected]>
There was a misplaced status test (two consequent tests without a statement in between) in acpi_bus_init for ages. Remove it, since the function which should be checked (acpi_os_initialize1) has BUG_ONs on failure paths.
--- drivers/acpi/bus.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-)
drivers/acpi/bus.c +1 -8
@@ -758,8 +758,7 @@ static int __init acpi_bus_init(void)acpi_status status =AE_OK ;extern acpi_status acpi_os_initialize1 (void ); - - status =acpi_os_initialize1 (); +acpi_os_initialize1 (); status =acpi_enable_subsystem (ACPI_NO_HARDWARE_INIT |ACPI_NO_ACPI_ENABLE );
@@ -769,12 +768,6 @@ static int __init acpi_bus_init(void) goto error1; } -if (ACPI_FAILURE (status)) { - printk(KERN_ERR PREFIX - "Unable to initialize ACPI OS objects\n"); - goto error1; - } -/* * ACPI 2.0 requires the EC driver to be loaded and work before * the EC device is found in the namespace (i.e. before acpi_initialize_objects()
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 5/14 acpi: check for pxm_to_node_map overflow
In reply to Len BrownFrom: Cyrill Gorcunov <[email protected]>
It is hardly (if ever) possible but in case of broken _PXM entry we could reach out of pxm_to_node_map array bounds in acpi_map_pxm_to_node() call.
--- drivers/acpi/numa.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/acpi/numa.c +1 -1
@@ -277,7 +277,7 @@ int acpi_get_node(acpi_handle *handle)int pxm, node =-1 ; pxm =acpi_get_pxm (handle); -if (pxm >=0 ) +if (pxm >=0 && pxm <MAX_PXM_DOMAINS ) node =acpi_map_pxm_to_node (pxm);return node;
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 6/14 asus-laptop: restore acpi_generate_proc_event()
In reply to Len BrownFrom: Corentin Chary <[email protected]>
Restore acpi_generate_proc_event() for backward
compatibility with old acpi scripts.
--- drivers/platform/x86/asus-laptop.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-)
drivers/platform/x86/asus-laptop.c +4 -1
@@ -815,6 +815,7 @@ static int asus_setkeycode(struct input_dev *dev, int scancode, int keycode)static void asus_hotk_notify (acpi_handle handle,u32 event,void *data) {static struct key_entry *key; +u16 count;/* TODO Find a better way to handle events count. */ if (!hotk)
@@ -832,9 +833,11 @@ static void asus_hotk_notify(acpi_handle handle, u32 event, void *data)lcd_blank (FB_BLANK_POWERDOWN ); } + count = hotk->event_count[event %128 ]++; +acpi_bus_generate_proc_event (hotk->device, event, count);acpi_bus_generate_netlink_event (hotk->device->pnp.device_class,dev_name (&hotk->device->dev), event, - hotk->event_count[event %128 ]++); + count);if (hotk->inputdev) { key =asus_get_entry_by_scancode (event);
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 7/14 eeepc-laptop: restore acpi_generate_proc_event()
In reply to Len BrownFrom: Corentin Chary <[email protected]>
Restore acpi_generate_proc_event() for backward
compatibility with old acpi scripts.
--- drivers/platform/x86/eeepc-laptop.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-)
drivers/platform/x86/eeepc-laptop.c +5 -1
@@ -557,13 +557,17 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)static void eeepc_hotk_notify (acpi_handle handle,u32 event,void *data) {static struct key_entry *key; +u16 count; +if (!ehotk)return ;if (event >=NOTIFY_BRN_MIN && event <=NOTIFY_BRN_MAX )notify_brn (); + count = ehotk->event_count[event %128 ]++; +acpi_bus_generate_proc_event (ehotk->device, event, count);acpi_bus_generate_netlink_event (ehotk->device->pnp.device_class,dev_name (&ehotk->device->dev), event, - ehotk->event_count[event %128 ]++); + count);if (ehotk->inputdev) { key =eepc_get_entry_by_scancode (event);if (key) {
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 8/14 asus-laptop: use select instead of depends on
In reply to Len BrownFrom: Corentin Chary <[email protected]>
Like thinkpad_acpi or eeepc-laptop, asus-laptop will now use "select" instead of "depends on"
for LEDS_CLASS, NEW_LEDS and BACKLIGHT_CLASS_DEVICE
--- drivers/platform/x86/Kconfig | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/platform/x86/Kconfig +3 -3
@@ -39,9 +39,9 @@ config ASUS_LAPTOP tristate "Asus Laptop Extras (EXPERIMENTAL)" depends on ACPI depends on EXPERIMENTAL && !ACPI_ASUS - depends on LEDS_CLASS - depends on NEW_LEDS - depends on BACKLIGHT_CLASS_DEVICE + select LEDS_CLASS + select NEW_LEDS + select BACKLIGHT_CLASS_DEVICE depends on INPUT ---help--- This is the new Linux driver for Asus laptops. It may also support some
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 9/14 platform/x86: depends instead of select for laptop platform drivers
In reply to Len BrownFrom: Corentin Chary <[email protected]>
"I hate `select' and will gleefully leap on any s/select/depends/ patch, whether it works or not :)"
Andrew Morton
select INPUT is not needed here, because if someone doesn't want INPUT, he won't want these drivers either.
--- drivers/platform/x86/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/platform/x86/Kconfig +1 -1
@@ -185,11 +185,11 @@ config SONYPI_COMPAT config THINKPAD_ACPI tristate "ThinkPad ACPI Laptop Extras" depends on ACPI + depends on INPUT select BACKLIGHT_LCD_SUPPORT select BACKLIGHT_CLASS_DEVICE select HWMON select NVRAM - select INPUT select NEW_LEDS select LEDS_CLASS select NET
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 10/14 acer-wmi: double free in acer_rfkill_exit()
In reply to Len BrownFrom: Dan Carpenter <[email protected]>
This is acer_rfkill_exit() from drivers/platform/x86/acer-wmi.c.
The code frees wireless_rfkill->data again instead of bluetooth_rfkill->data.
This was found using a code checker (http://repo.or.cz/w/smatch.git/).
--- drivers/platform/x86/acer-wmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/platform/x86/acer-wmi.c +1 -1
@@ -1026,7 +1026,7 @@ static void acer_rfkill_exit(void)kfree (wireless_rfkill->data);rfkill_unregister (wireless_rfkill);if (has_cap (ACER_CAP_BLUETOOTH )) { -kfree (wireless_rfkill->data); +kfree (bluetooth_rfkill->data);rfkill_unregister (bluetooth_rfkill); }return ;
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 11/14 acpi-wmi: Unmark as 'experimental'
In reply to Len BrownFrom: Carlos Corbacho <[email protected]>
ACPI-WMI isn't experimental anymore, and there are other drivers that now depend on it that aren't either.
--- drivers/platform/x86/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/platform/x86/Kconfig +1 -2
@@ -315,9 +315,8 @@ config EEEPC_LAPTOP config ACPI_WMI - tristate "WMI (EXPERIMENTAL)" + tristate "WMI" depends on ACPI - depends on EXPERIMENTAL help This driver adds support for the ACPI-WMI (Windows Management Instrumentation) mapper device (PNP0C14) found on some systems.
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 12/14 acer-wmi: Unmark as 'experimental'
In reply to Len BrownFrom: Carlos Corbacho <[email protected]>
This driver has been around and used long enough that we can drop the 'experimental'.
--- drivers/platform/x86/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/platform/x86/Kconfig +1 -2
@@ -15,8 +15,7 @@ menuconfig X86_PLATFORM_DEVICES if X86_PLATFORM_DEVICES config ACER_WMI - tristate "Acer WMI Laptop Extras (EXPERIMENTAL)" - depends on EXPERIMENTAL + tristate "Acer WMI Laptop Extras" depends on ACPI depends on LEDS_CLASS depends on NEW_LEDS
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 13/14 thinkpad-acpi: fix module autoloading for older models
In reply to Len BrownFrom: Mathieu Chouquet-Stringer <[email protected]>
Looking at the source, there seems to be a missing * to match my DMI string. I mean for newer IBM and Lenovo's laptops you match either one of the following:MODULE_ALIAS("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*"); MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");
While for older Thinkpads, you do this (for instance):IBM_BIOS_MODULE_ALIAS("1[0,3,6,8,A-G,I,K,M-P,S,T]");
with IBM_BIOS_MODULE_ALIAS being MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW")
Note there's no * terminating the string. As result, udev doesn't load anything because modprobe cannot find anything matching this (my machine actually):
udevtest: run: '/sbin/modprobe dmi:bvnIBM:bvr1IET71WW(2.10):bd06/16/2006:svnIBM:pn236621U:pvrNotAv
--- drivers/platform/x86/thinkpad_acpi.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/platform/x86/thinkpad_acpi.c +4 -4
@@ -7532,7 +7532,7 @@ MODULE_ALIAS(TPACPI_DRVR_SHORTNAME);* if it is not there yet. */ #define IBM_BIOS_MODULE_ALIAS (__type) \ - MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW") + MODULE_ALIAS("dmi:bvnIBM:bvr" __type "ET??WW*")/* Non-ancient thinkpads */ MODULE_ALIAS ("dmi:bvnIBM:*:svnIBM:*:pvrThinkPad*:rvnIBM:*" );
@@ -7541,9 +7541,9 @@ MODULE_ALIAS("dmi:bvnLENOVO:*:svnLENOVO:*:pvrThinkPad*:rvnLENOVO:*");/* Ancient thinkpad BIOSes have to be identified by * BIOS type or model number, and there are far less * BIOS types than model numbers... */ -IBM_BIOS_MODULE_ALIAS ("I[B,D,H,I,M,N,O,T,W,V,Y,Z]" ); -IBM_BIOS_MODULE_ALIAS ("1[0,3,6,8,A-G,I,K,M-P,S,T]" ); -IBM_BIOS_MODULE_ALIAS ("K[U,X-Z]" ); +IBM_BIOS_MODULE_ALIAS ("I[BDHIMNOTWVYZ]" ); +IBM_BIOS_MODULE_ALIAS ("1[0368A-GIKM-PST]" ); +IBM_BIOS_MODULE_ALIAS ("K[UX-Z]" );MODULE_AUTHOR ("Borislav Deianov, Henrique de Moraes Holschuh" );MODULE_DESCRIPTION (TPACPI_DESC );
Signature · 1 line
1.5.6.6
Len Brown
reviewerPATCH 14/14 acpi-wmi: unsigned cannot be less than 0
In reply to Len BrownFrom: Roel Kluin <[email protected]>
include/linux/pci-acpi.h:74:
typedef u32 acpi_status;
result is unsigned, so an error returned by acpi_bus_register_driver() will not be noticed.
--- drivers/platform/x86/wmi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/platform/x86/wmi.c +1 -1
@@ -708,7 +708,7 @@ static int __init acpi_wmi_add(struct acpi_device *device)static int __init acpi_wmi_init (void ) { -acpi_status result; +int result;INIT_LIST_HEAD (&wmi_blocks.list);
Signature · 1 line
1.5.6.6