* [PATCH 0/2] asus-wireless: Drive airplane mode LED @ 2016-01-06 2:19 João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 1/2] asus-wireless: Toggle " João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 2/2] asus-wmi: Create quirk for airplane_mode LED João Paulo Rechi Vita 0 siblings, 2 replies; 4+ messages in thread From: João Paulo Rechi Vita @ 2016-01-06 2:19 UTC (permalink / raw) To: Darren Hart Cc: Corentin Chary, andy.shevchenko, platform-driver-x86, acpi4asus-user, linux-kernel, João Paulo Rechi Vita This series adds code to drive the airplane mode indicator LED present in some of the Asus laptops that have an airplane mode hotkey. It depends on a new LED trigger created in the RFKill subsystem, which is currently pending review on linux-wireless. It also creates a new DMI quirk on asus-wmi because it also tries to drive the same LED on laptops where the BIOS reports it does not save the WLAN LED state. João Paulo Rechi Vita (2): asus-wireless: Toggle airplane mode LED asus-wmi: Create quirk for airplane_mode LED drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/asus-nb-wmi.c | 31 ++++++++++++ drivers/platform/x86/asus-wireless.c | 92 +++++++++++++++++++++++++++++++++++- drivers/platform/x86/asus-wmi.c | 8 ++-- drivers/platform/x86/asus-wmi.h | 1 + 5 files changed, 130 insertions(+), 4 deletions(-) -- 2.5.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] asus-wireless: Toggle airplane mode LED 2016-01-06 2:19 [PATCH 0/2] asus-wireless: Drive airplane mode LED João Paulo Rechi Vita @ 2016-01-06 2:19 ` João Paulo Rechi Vita 2016-01-06 2:29 ` João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 2/2] asus-wmi: Create quirk for airplane_mode LED João Paulo Rechi Vita 1 sibling, 1 reply; 4+ messages in thread From: João Paulo Rechi Vita @ 2016-01-06 2:19 UTC (permalink / raw) To: Darren Hart Cc: Corentin Chary, andy.shevchenko, platform-driver-x86, acpi4asus-user, linux-kernel, João Paulo Rechi Vita In the ASHS device we have the HSWC method, which basically calls either OWGD or OWGS, depending on its parameter: Device (ASHS) { Name (_HID, "ATK4002") // _HID: Hardware ID Method (HSWC, 1, Serialized) { If ((Arg0 < 0x02)) { OWGD (Arg0) Return (One) } If ((Arg0 == 0x02)) { Local0 = OWGS () If (Local0) { Return (0x05) } Else { Return (0x04) } } If ((Arg0 == 0x03)) { Return (0xFF) } If ((Arg0 == 0x04)) { OWGD (Zero) Return (One) } If ((Arg0 == 0x05)) { OWGD (One) Return (One) } If ((Arg0 == 0x80)) { Return (One) } } Method (_STA, 0, NotSerialized) // _STA: Status { If ((MSOS () >= OSW8)) { Return (0x0F) } Else { Return (Zero) } } } On the Asus E202SA laptop, which does not have an airplane mode LED, OWGD has an empty implementation and OWGS simply returns 0. On the Asus X555UB these methods have the following implementation: Method (OWGD, 1, Serialized) { SGPL (0x0203000F, Arg0) SGPL (0x0203000F, Arg0) } Method (OWGS, 0, Serialized) { Store (RGPL (0x0203000F), Local0) Return (Local0) } Where OWGD(1) sets the airplane mode LED ON, OWGD(0) set it off, and OWGS() returns its state. This commit makes use of a newly implemented RFKill LED trigger to trigger the LED when the system enters or exits "Airplane Mode", there is, when all radios are blocked. Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> --- drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/asus-wireless.c | 92 +++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index f37821f..5798cc4 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -591,6 +591,8 @@ config ASUS_WIRELESS tristate "Asus Wireless Radio Control Driver" depends on ACPI depends on INPUT + select NEW_LEDS + select LEDS_CLASS ---help--- The Asus Wireless Radio Control handles the airplane mode hotkey present on some Asus laptops. diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index 9ec721e..51a33a0 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -15,11 +15,78 @@ #include <linux/acpi.h> #include <linux/input.h> #include <linux/pci_ids.h> +#include <linux/leds.h> + +#define ASUS_WIRELESS_LED_STATUS 0x2 +#define ASUS_WIRELESS_LED_OFF 0x4 +#define ASUS_WIRELESS_LED_ON 0x5 struct asus_wireless_data { struct input_dev *idev; + struct acpi_device *adev; + struct workqueue_struct *wq; + struct work_struct led_work; + struct led_classdev led; + int led_state; }; +static u64 asus_wireless_method(acpi_handle handle, const char *method, + int param) +{ + union acpi_object obj; + struct acpi_object_list p; + acpi_status s; + u64 ret; + + acpi_handle_debug(handle, "Evaluating method %s, parameter 0x%X\n", + method, param); + obj.type = ACPI_TYPE_INTEGER; + obj.integer.value = param; + p.count = 1; + p.pointer = &obj; + + s = acpi_evaluate_integer(handle, (acpi_string) method, &p, &ret); + if (ACPI_FAILURE(s)) + acpi_handle_err(handle, + "Failed to eval method %s, param 0x%X (%d)\n", + method, param, s); + acpi_handle_debug(handle, "%s returned 0x%X\n", method, (uint) ret); + return ret; +} + +static enum led_brightness asus_wireless_led_get(struct led_classdev *led) +{ + struct asus_wireless_data *data; + int s; + + data = container_of(led, struct asus_wireless_data, led); + s = asus_wireless_method(acpi_device_handle(data->adev), "HSWC", + ASUS_WIRELESS_LED_STATUS); + if (s == ASUS_WIRELESS_LED_ON) + return LED_FULL; + return LED_OFF; +} + +static void asus_wireless_led_update(struct work_struct *work) +{ + struct asus_wireless_data *data; + + data = container_of(work, struct asus_wireless_data, led_work); + asus_wireless_method(acpi_device_handle(data->adev), "HSWC", + data->led_state); +} + +static void asus_wireless_led_set(struct led_classdev *led, + enum led_brightness value) +{ + struct asus_wireless_data *data; + + data = container_of(led, struct asus_wireless_data, led); + data->led_state = value == LED_OFF ? ASUS_WIRELESS_LED_OFF : + ASUS_WIRELESS_LED_ON; + queue_work(data->wq, &data->led_work); +} + static void asus_wireless_notify(struct acpi_device *adev, u32 event) { struct asus_wireless_data *data = acpi_driver_data(adev); @@ -37,6 +104,7 @@ static void asus_wireless_notify(struct acpi_device *adev, u32 event) static int asus_wireless_add(struct acpi_device *adev) { struct asus_wireless_data *data; + int err; data = devm_kzalloc(&adev->dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -52,11 +120,33 @@ static int asus_wireless_add(struct acpi_device *adev) data->idev->id.vendor = PCI_VENDOR_ID_ASUSTEK; set_bit(EV_KEY, data->idev->evbit); set_bit(KEY_RFKILL, data->idev->keybit); - return input_register_device(data->idev); + err = input_register_device(data->idev); + if (err) + return err; + + data->adev = adev; + data->wq = create_singlethread_workqueue("asus_wireless_workqueue"); + if (!data->wq) + return -ENOMEM; + INIT_WORK(&data->led_work, asus_wireless_led_update); + data->led.name = "asus-wireless::airplane_mode"; + data->led.brightness_set = asus_wireless_led_set; + data->led.brightness_get = asus_wireless_led_get; + data->led.flags = LED_CORE_SUSPENDRESUME; + data->led.max_brightness = 1; + data->led.default_trigger = "rfkill-airplane-mode"; + err = devm_led_classdev_register(&adev->dev, &data->led); + if (err) + destroy_workqueue(data->wq); + return err; } static int asus_wireless_remove(struct acpi_device *adev) { + struct asus_wireless_data *data = acpi_driver_data(adev); + + if (data->wq) + destroy_workqueue(data->wq); return 0; } -- 2.5.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] asus-wireless: Toggle airplane mode LED 2016-01-06 2:19 ` [PATCH 1/2] asus-wireless: Toggle " João Paulo Rechi Vita @ 2016-01-06 2:29 ` João Paulo Rechi Vita 0 siblings, 0 replies; 4+ messages in thread From: João Paulo Rechi Vita @ 2016-01-06 2:29 UTC (permalink / raw) To: Darren Hart Cc: Corentin Chary, andy.shevchenko, platform-driver-x86, acpi4asus-user, linux-kernel, João Paulo Rechi Vita In the ASHS device we have the HSWC method, which basically calls either OWGD or OWGS, depending on its parameter: Device (ASHS) { Name (_HID, "ATK4002") // _HID: Hardware ID Method (HSWC, 1, Serialized) { If ((Arg0 < 0x02)) { OWGD (Arg0) Return (One) } If ((Arg0 == 0x02)) { Local0 = OWGS () If (Local0) { Return (0x05) } Else { Return (0x04) } } If ((Arg0 == 0x03)) { Return (0xFF) } If ((Arg0 == 0x04)) { OWGD (Zero) Return (One) } If ((Arg0 == 0x05)) { OWGD (One) Return (One) } If ((Arg0 == 0x80)) { Return (One) } } Method (_STA, 0, NotSerialized) // _STA: Status { If ((MSOS () >= OSW8)) { Return (0x0F) } Else { Return (Zero) } } } On the Asus E202SA laptop, which does not have an airplane mode LED, OWGD has an empty implementation and OWGS simply returns 0. On the Asus X555UB these methods have the following implementation: Method (OWGD, 1, Serialized) { SGPL (0x0203000F, Arg0) SGPL (0x0203000F, Arg0) } Method (OWGS, 0, Serialized) { Store (RGPL (0x0203000F), Local0) Return (Local0) } Where OWGD(1) sets the airplane mode LED ON, OWGD(0) set it off, and OWGS() returns its state. This commit makes use of a newly implemented RFKill LED trigger to trigger the LED when the system enters or exits "Airplane Mode", there is, when all radios are blocked. Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> --- drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/asus-wireless.c | 92 +++++++++++++++++++++++++++++++++++- 2 files changed, 93 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index f37821f..5798cc4 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -591,6 +591,8 @@ config ASUS_WIRELESS tristate "Asus Wireless Radio Control Driver" depends on ACPI depends on INPUT + select NEW_LEDS + select LEDS_CLASS ---help--- The Asus Wireless Radio Control handles the airplane mode hotkey present on some Asus laptops. diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index 9ec721e..052a527 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -15,11 +15,78 @@ #include <linux/acpi.h> #include <linux/input.h> #include <linux/pci_ids.h> +#include <linux/leds.h> + +#define ASUS_WIRELESS_LED_STATUS 0x2 +#define ASUS_WIRELESS_LED_OFF 0x4 +#define ASUS_WIRELESS_LED_ON 0x5 struct asus_wireless_data { struct input_dev *idev; + struct acpi_device *adev; + struct workqueue_struct *wq; + struct work_struct led_work; + struct led_classdev led; + int led_state; }; +static u64 asus_wireless_method(acpi_handle handle, const char *method, + int param) +{ + union acpi_object obj; + struct acpi_object_list p; + acpi_status s; + u64 ret; + + acpi_handle_debug(handle, "Evaluating method %s, parameter %#x\n", + method, param); + obj.type = ACPI_TYPE_INTEGER; + obj.integer.value = param; + p.count = 1; + p.pointer = &obj; + + s = acpi_evaluate_integer(handle, (acpi_string) method, &p, &ret); + if (ACPI_FAILURE(s)) + acpi_handle_err(handle, + "Failed to eval method %s, param %#x (%d)\n", + method, param, s); + acpi_handle_debug(handle, "%s returned %#x\n", method, (uint) ret); + return ret; +} + +static enum led_brightness asus_wireless_led_get(struct led_classdev *led) +{ + struct asus_wireless_data *data; + int s; + + data = container_of(led, struct asus_wireless_data, led); + s = asus_wireless_method(acpi_device_handle(data->adev), "HSWC", + ASUS_WIRELESS_LED_STATUS); + if (s == ASUS_WIRELESS_LED_ON) + return LED_FULL; + return LED_OFF; +} + +static void asus_wireless_led_update(struct work_struct *work) +{ + struct asus_wireless_data *data; + + data = container_of(work, struct asus_wireless_data, led_work); + asus_wireless_method(acpi_device_handle(data->adev), "HSWC", + data->led_state); +} + +static void asus_wireless_led_set(struct led_classdev *led, + enum led_brightness value) +{ + struct asus_wireless_data *data; + + data = container_of(led, struct asus_wireless_data, led); + data->led_state = value == LED_OFF ? ASUS_WIRELESS_LED_OFF : + ASUS_WIRELESS_LED_ON; + queue_work(data->wq, &data->led_work); +} + static void asus_wireless_notify(struct acpi_device *adev, u32 event) { struct asus_wireless_data *data = acpi_driver_data(adev); @@ -37,6 +104,7 @@ static void asus_wireless_notify(struct acpi_device *adev, u32 event) static int asus_wireless_add(struct acpi_device *adev) { struct asus_wireless_data *data; + int err; data = devm_kzalloc(&adev->dev, sizeof(*data), GFP_KERNEL); if (!data) @@ -52,11 +120,33 @@ static int asus_wireless_add(struct acpi_device *adev) data->idev->id.vendor = PCI_VENDOR_ID_ASUSTEK; set_bit(EV_KEY, data->idev->evbit); set_bit(KEY_RFKILL, data->idev->keybit); - return input_register_device(data->idev); + err = input_register_device(data->idev); + if (err) + return err; + + data->adev = adev; + data->wq = create_singlethread_workqueue("asus_wireless_workqueue"); + if (!data->wq) + return -ENOMEM; + INIT_WORK(&data->led_work, asus_wireless_led_update); + data->led.name = "asus-wireless::airplane_mode"; + data->led.brightness_set = asus_wireless_led_set; + data->led.brightness_get = asus_wireless_led_get; + data->led.flags = LED_CORE_SUSPENDRESUME; + data->led.max_brightness = 1; + data->led.default_trigger = "rfkill-airplane-mode"; + err = devm_led_classdev_register(&adev->dev, &data->led); + if (err) + destroy_workqueue(data->wq); + return err; } static int asus_wireless_remove(struct acpi_device *adev) { + struct asus_wireless_data *data = acpi_driver_data(adev); + + if (data->wq) + destroy_workqueue(data->wq); return 0; } -- 2.5.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] asus-wmi: Create quirk for airplane_mode LED 2016-01-06 2:19 [PATCH 0/2] asus-wireless: Drive airplane mode LED João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 1/2] asus-wireless: Toggle " João Paulo Rechi Vita @ 2016-01-06 2:19 ` João Paulo Rechi Vita 1 sibling, 0 replies; 4+ messages in thread From: João Paulo Rechi Vita @ 2016-01-06 2:19 UTC (permalink / raw) To: Darren Hart Cc: Corentin Chary, andy.shevchenko, platform-driver-x86, acpi4asus-user, linux-kernel, João Paulo Rechi Vita Some Asus laptops have a "airplane mode" indicator LED, have the WMI WLAN user bit set, and also have the following bits in their DSDT: Scope (_SB) { (...) Device (ATKD) { (...) Method (WMNB, 3, Serialized) { (...) If (LEqual (IIA0, 0x00010002)) { OWGD (IIA1) Return (One) } } } } So when asus-wmi uses ASUS_WMI_DEVID_WLAN_LED (0x00010002) to store the wlan state, it drives the airplane mode indicator LED (throught the call to OWGD)in an inverted fashion: the LED is ON when airplane mode is OFF (since wlan is ON), and vice-versa. This commit creates a quirk to no register a RFKill switch at all for these laptops, to allow the asus-wireless driver to drive the airplane mode LED correctly. Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> --- drivers/platform/x86/asus-nb-wmi.c | 31 +++++++++++++++++++++++++++++++ drivers/platform/x86/asus-wmi.c | 8 +++++--- drivers/platform/x86/asus-wmi.h | 1 + 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 131fee2..4ded187 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c @@ -78,6 +78,10 @@ static struct quirk_entry quirk_asus_x200ca = { .wapf = 2, }; +static struct quirk_entry quirk_no_rfkill = { + .no_rfkill = true, +}; + static int dmi_matched(const struct dmi_system_id *dmi) { quirks = dmi->driver_data; @@ -297,6 +301,33 @@ static const struct dmi_system_id asus_quirks[] = { }, .driver_data = &quirk_asus_x200ca, }, + { + .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. X555UB", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X555UB"), + }, + .driver_data = &quirk_no_rfkill, + }, + { + .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. X552VW", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X552VW"), + }, + .driver_data = &quirk_no_rfkill, + }, + { + .callback = dmi_matched, + .ident = "ASUSTeK COMPUTER INC. U303LB", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "U303LB"), + }, + .driver_data = &quirk_no_rfkill, + }, {}, }; diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index a96630d..370fa347 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -2064,9 +2064,11 @@ static int asus_wmi_add(struct platform_device *pdev) if (err) goto fail_leds; - err = asus_wmi_rfkill_init(asus); - if (err) - goto fail_rfkill; + if (!asus->driver->quirks->no_rfkill) { + err = asus_wmi_rfkill_init(asus); + if (err) + goto fail_rfkill; + } /* Some Asus desktop boards export an acpi-video backlight interface, stop this from showing up */ diff --git a/drivers/platform/x86/asus-wmi.h b/drivers/platform/x86/asus-wmi.h index 4da4c8b..5de1df5 100644 --- a/drivers/platform/x86/asus-wmi.h +++ b/drivers/platform/x86/asus-wmi.h @@ -38,6 +38,7 @@ struct key_entry; struct asus_wmi; struct quirk_entry { + bool no_rfkill; bool hotplug_wireless; bool scalar_panel_brightness; bool store_backlight_power; -- 2.5.0 ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-01-06 2:29 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-01-06 2:19 [PATCH 0/2] asus-wireless: Drive airplane mode LED João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 1/2] asus-wireless: Toggle " João Paulo Rechi Vita 2016-01-06 2:29 ` João Paulo Rechi Vita 2016-01-06 2:19 ` [PATCH 2/2] asus-wmi: Create quirk for airplane_mode LED João Paulo Rechi Vita
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®