From patchwork Sat Dec 26 14:56:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?= X-Patchwork-Id: 7921831 Return-Path: X-Original-To: patchwork-platform-driver-x86@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE495BEEE5 for ; Sat, 26 Dec 2015 14:57:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ADC1B20364 for ; Sat, 26 Dec 2015 14:57:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA7DC20374 for ; Sat, 26 Dec 2015 14:57:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752531AbbLZO5O (ORCPT ); Sat, 26 Dec 2015 09:57:14 -0500 Received: from mail-pf0-f194.google.com ([209.85.192.194]:33505 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752155AbbLZO5H (ORCPT ); Sat, 26 Dec 2015 09:57:07 -0500 Received: by mail-pf0-f194.google.com with SMTP id 78so8341164pfw.0; Sat, 26 Dec 2015 06:57:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=eDmaoS9bD6OiAntnsMejIGNfaguVmPCNUm1GY7+La8A=; b=iCD8joEVOqv3+ycEWmDlqEgGiKk5yy/gTBYLuX6bJNcI/I0W3zlSpywOoMWs1KQ8Wn IdmJlPHKb0xkliraZhjj6nFSFZQPKHG8HSjDzSmYGbBFgfVQQwDpGVJ9bYMZShbo0RQB EotqO4YYLJhLEZB6grIpRq78mREPsv9CNVAd9GX5eOfOZDScUglTOS5ceVpZ8XBJlF08 8SemNvNM07ltVRBORQdLl/QQfL7crjcF4ET/x2UUPMb4E2+90hQ9KdN3MUkE90o/rUTs vgpHcO+nTNrGjIpukyHxJ7BpN5spHEtQAgtguMKp1jRilDi1oaG0TCc+TTaxFm2zwooI hRhg== X-Received: by 10.98.0.14 with SMTP id 14mr13348991pfa.164.1451141827305; Sat, 26 Dec 2015 06:57:07 -0800 (PST) Received: from localhost.localdomain ([128.177.161.154]) by smtp.gmail.com with ESMTPSA id cn1sm65870765pad.11.2015.12.26.06.57.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 26 Dec 2015 06:57:06 -0800 (PST) From: "=?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?=" X-Google-Original-From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= To: Darren Hart Cc: Corentin Chary , platform-driver-x86@vger.kernel.org, acpi4asus-user@lists.sourceforge.net, linux-kernel@vger.kernel.org, =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= Subject: [PATCH 4/4] asus-wireless: Toggle airplane mode LED Date: Sat, 26 Dec 2015 09:56:37 -0500 Message-Id: <1451141797-1066-5-git-send-email-jprvita@endlessm.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1451141797-1066-1-git-send-email-jprvita@endlessm.com> References: <1451141797-1066-1-git-send-email-jprvita@endlessm.com> MIME-Version: 1.0 Sender: platform-driver-x86-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: platform-driver-x86@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- drivers/platform/x86/Kconfig | 2 + drivers/platform/x86/asus-wireless.c | 81 ++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+) diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index d3a088b..3d8dc0b 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -592,6 +592,8 @@ config ASUS_WIRELESS depends on ACPI depends on INPUT default m + 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 7928efd..489ef83 100644 --- a/drivers/platform/x86/asus-wireless.c +++ b/drivers/platform/x86/asus-wireless.c @@ -17,13 +17,76 @@ #include #include #include +#include #define ASUS_WIRELESS_MODULE_NAME "Asus Wireless Radio Control Driver" +#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 *inputdev; + struct acpi_device *acpidev; + 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; + + pr_debug("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_SUCCESS(s)) + pr_err("Failed to evaluate method %s, parameter 0x%X (%d)\n", + method, param, s); + pr_debug("%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(data->acpidev->handle, "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(data->acpidev->handle, "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 *device, u32 event) { struct asus_wireless_data *data = acpi_driver_data(device); @@ -49,6 +112,7 @@ static int asus_wireless_add(struct acpi_device *device) return -ENOMEM; device->driver_data = data; + data->acpidev = device; data->inputdev = input_allocate_device(); if (!data->inputdev) goto fail; @@ -64,6 +128,21 @@ static int asus_wireless_add(struct acpi_device *device) err = input_register_device(data->inputdev); if (err) goto fail; + + data->wq = create_singlethread_workqueue("asus_wireless_workqueue"); + if (!data->wq) + goto fail; + + 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 = led_classdev_register(&device->dev, &data->led); + if (err) + goto fail; return 0; fail: @@ -78,6 +157,8 @@ static int asus_wireless_remove(struct acpi_device *device) pr_info("Removing "ASUS_WIRELESS_MODULE_NAME"\n"); if (data->inputdev) input_unregister_device(data->inputdev); + if (data->wq) + destroy_workqueue(data->wq); kfree(data); return 0; }