| Message ID | 49DCA63B.5050802@tuffmail.co.uk (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Corentin Chary |
| Headers | show |
On Wed, Apr 8, 2009 at 3:27 PM, Alan Jenkins <alan-jenkins@tuffmail.co.uk> wrote: > 1) Buggy firmware can change the RFKILL state by itself. This is easily > Â detected. Â The RFKILL API states that in such cases, we should call > Â rfkill_force_state() to notify the core. > > Â I have reported the bug to Asus. I believe this is the right thing > Â to do for robustness, even if this particular firmware bug is fixed. > > 2) The same bug causes the wireless toggle key to be reported as 0x11 > Â instead of 0x10. Â 0x11 is otherwise unused, so it should be safe to > Â add this as a new keycode. > > The bug is triggered by removing the laptop battery while hibernated. > > On resume, the wireless toggle key causes the firmware to toggle the > wireless state itself. Â (Also, the key is reported as 0x11 when the > current wireless state is OFF). > > This is very poor behaviour because the OS can't predict whether the > firmware is controlling the RFKILL state. > > Without this workaround, the bug means users have to press the wireless > toggle key twice to enable, due to the OS/firmware conflict. Â (Assuming > rfkill-input or equivalent is being used). Â The workaround avoids this. > > I believe that acpid scripts which toggle the value of the sysfs state file > when the toggle key is pressed will be rendered ineffective by the bug, > regardless of this workaround. Â If they simply toggle the state, when the > firmware has already toggled it, then you will never see a state change. > > Tested on "EEEPC 4G" only. Hi, Thanks for the patch, applied on acpi4asus tree. Could someone with EEEPC 900/1000 test this patch ? Thanks
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index e21f7cd..f725eaf 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -158,6 +158,7 @@ enum { KE_KEY, KE_END }; static struct key_entry eeepc_keymap[] = { /* Sleep already handled via generic ACPI code */ {KE_KEY, 0x10, KEY_WLAN }, + {KE_KEY, 0x11, KEY_WLAN }, {KE_KEY, 0x12, KEY_PROG1 }, {KE_KEY, 0x13, KEY_MUTE }, {KE_KEY, 0x14, KEY_VOLUMEDOWN }, @@ -521,6 +522,7 @@ static void notify_brn(void) static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) { + enum rfkill_state state; struct pci_dev *dev; struct pci_bus *bus = pci_find_bus(0, 1); @@ -532,7 +534,9 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) return; } - if (get_acpi(CM_ASL_WLAN) == 1) { + eeepc_wlan_rfkill_state(ehotk->eeepc_wlan_rfkill, &state); + + if (state == RFKILL_STATE_UNBLOCKED) { dev = pci_get_slot(bus, 0); if (dev) { /* Device already present */ @@ -552,6 +556,8 @@ static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data) pci_dev_put(dev); } } + + rfkill_force_state(ehotk->eeepc_wlan_rfkill, state); } static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
1) Buggy firmware can change the RFKILL state by itself. This is easily detected. The RFKILL API states that in such cases, we should call rfkill_force_state() to notify the core. I have reported the bug to Asus. I believe this is the right thing to do for robustness, even if this particular firmware bug is fixed. 2) The same bug causes the wireless toggle key to be reported as 0x11 instead of 0x10. 0x11 is otherwise unused, so it should be safe to add this as a new keycode. The bug is triggered by removing the laptop battery while hibernated. On resume, the wireless toggle key causes the firmware to toggle the wireless state itself. (Also, the key is reported as 0x11 when the current wireless state is OFF). This is very poor behaviour because the OS can't predict whether the firmware is controlling the RFKILL state. Without this workaround, the bug means users have to press the wireless toggle key twice to enable, due to the OS/firmware conflict. (Assuming rfkill-input or equivalent is being used). The workaround avoids this. I believe that acpid scripts which toggle the value of the sysfs state file when the toggle key is pressed will be rendered ineffective by the bug, regardless of this workaround. If they simply toggle the state, when the firmware has already toggled it, then you will never see a state change. Tested on "EEEPC 4G" only. Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk> --- drivers/platform/x86/eeepc-laptop.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)