From patchwork Wed Oct 13 03:47:42 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chun-Yi Lee X-Patchwork-Id: 249591 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9D3qG8h023213 for ; Wed, 13 Oct 2010 03:52:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752503Ab0JMDwP (ORCPT ); Tue, 12 Oct 2010 23:52:15 -0400 Received: from mail-gw0-f46.google.com ([74.125.83.46]:33695 "EHLO mail-gw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751255Ab0JMDwO (ORCPT ); Tue, 12 Oct 2010 23:52:14 -0400 Received: by mail-gw0-f46.google.com with SMTP id 17so1689837gwj.19 for ; Tue, 12 Oct 2010 20:52:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=G5SSHVmOst9U8GL3YH6MLgRDyS91C5+cbVA3Meghlpk=; b=f3K4kL1zwN/GNPbbFl/G/EO6u0xKk2/7KEiAuC/t2IQBAcvadE8eGZb2gwPbo1+bct uke7kdJtP0eHMdMyy6w/R9wWMELbNdf7CwyhITC+beb1c7y4QH9kbP8Oq9BxX1QHUhzI sPSJR0Zh3v5WdUFFq9wRgIuCIu3LlF4+roaks= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=IMjSg34kl3LPBOywqD0Nbm2EMRuHAiuC3lbfLHDEdQibWYMsTt4+OWq7tW+G003/S1 Bvueo2CtQmkxOVYx3Q30B1NZFxKWJAwtN5V1biT3/T3eWm/v2gmm3Gz+I17thPc5+33L 1dAaFKVryKH8Cf3+ny0XNkdfIgwrzTeEnXEG4= Received: by 10.150.189.14 with SMTP id m14mr194083ybf.311.1286941933947; Tue, 12 Oct 2010 20:52:13 -0700 (PDT) Received: from localhost.localdomain ([61.14.133.18]) by mx.google.com with ESMTPS id r36sm4575406yba.12.2010.10.12.20.52.09 (version=SSLv3 cipher=RC4-MD5); Tue, 12 Oct 2010 20:52:13 -0700 (PDT) From: "Lee, Chun-Yi" To: platform-driver-x86@vger.kernel.org Cc: mjg59@srcf.ucam.org, carlos@strangeworlds.co.uk, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, tiwai@novell.com, trenn@novell.com, jbenc@suse.cz, corentin.chary@gmail.com, "Lee, Chun-Yi" Subject: [PATCH 3/3] Add 3G rfkill sysfs file Date: Wed, 13 Oct 2010 11:47:42 +0800 Message-Id: <1286941662-9774-3-git-send-email-jlee@novell.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1286941662-9774-2-git-send-email-jlee@novell.com> References: <1286941662-9774-1-git-send-email-jlee@novell.com> <1286941662-9774-2-git-send-email-jlee@novell.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 13 Oct 2010 03:52:16 +0000 (UTC) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index a28a775..150e0e3 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -136,6 +136,26 @@ struct lm_return_value { } __attribute__((packed)); /* + * GUID3 Get Device Status device flags + */ +#define ACER_WMID_GUID3_GDS_WIRELESS (1<<0) /* WiFi */ +#define ACER_WMID_GUID3_GDS_THREEG (1<<6) /* 3G */ +#define ACER_WMID_GUID3_GDS_BLUETOOTH (1<<11) /* BT */ + +struct guid3_gds_input_param { /* Get Device Status input parameter */ + u8 function_num; /* Function Number */ + u8 hotkey_number; /* Hotkey Number */ + u16 devices; /* Get Device */ +} __attribute__((packed)); + +struct guid3_gds_return_value { /* Get Device Status return value*/ + u8 error_code; /* Error Code */ + u8 ec_return_value; /* EC Return Value */ + u16 devices; /* Current Device Status */ + u32 reserved; +} __attribute__((packed)); + +/* * Interface capability flags */ #define ACER_CAP_MAILLED (1<<0) @@ -192,6 +212,7 @@ struct acer_debug { static struct rfkill *wireless_rfkill; static struct rfkill *bluetooth_rfkill; +static struct rfkill *threeg_rfkill; /* Each low-level interface must define at least some of the following */ struct wmi_interface { @@ -1000,6 +1021,54 @@ static void acer_backlight_exit(void) backlight_device_unregister(acer_backlight_device); } +static acpi_status acer_wmi_get_device_status(u32 *value, u16 device) +{ + struct guid3_gds_return_value return_value; + acpi_status status; + union acpi_object *obj; + struct guid3_gds_input_param params = { + .function_num = 0x1, + .hotkey_number = 0x01, + .devices = device, + }; + struct acpi_buffer input = { + sizeof(struct guid3_gds_input_param), + ¶ms + }; + struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; + + status = wmi_evaluate_method(WMID_GUID3, 0, 0x2, &input, &output); + if (ACPI_FAILURE(status)) + return status; + + obj = output.pointer; + + if (!obj) + return -EINVAL; + else if (obj->type != ACPI_TYPE_BUFFER) { + kfree(obj); + return -EINVAL; + } + if (obj->buffer.length != 8) { + printk(ACER_WARNING "Unknown buffer length %d\n", + obj->buffer.length); + kfree(obj); + return -EINVAL; + } + + return_value = *((struct guid3_gds_return_value *)obj->buffer.pointer); + kfree(obj); + + if (return_value.error_code || return_value.ec_return_value) + printk(ACER_WARNING "Get Device Status failed: " + "0x%x - 0x%x\n", return_value.error_code, + return_value.ec_return_value); + else + *value = !!(return_value.devices & device); + + return status; +} + /* * Rfkill devices */ @@ -1020,6 +1089,13 @@ static void acer_rfkill_update(struct work_struct *ignored) rfkill_set_sw_state(bluetooth_rfkill, !state); } + if (has_cap(ACER_CAP_BLUETOOTH) && wmi_has_guid(WMID_GUID3)) { + status = acer_wmi_get_device_status(&state, + ACER_WMID_GUID3_GDS_THREEG); + if (ACPI_SUCCESS(status)) + rfkill_set_sw_state(bluetooth_rfkill, !state); + } + schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ)); } @@ -1076,6 +1152,19 @@ static int acer_rfkill_init(struct device *dev) } } + if (has_cap(ACER_CAP_THREEG)) { + threeg_rfkill = acer_rfkill_register(dev, + RFKILL_TYPE_WWAN, "acer-threeg", + ACER_CAP_THREEG); + if (IS_ERR(threeg_rfkill)) { + rfkill_unregister(wireless_rfkill); + rfkill_destroy(wireless_rfkill); + rfkill_unregister(bluetooth_rfkill); + rfkill_destroy(bluetooth_rfkill); + return PTR_ERR(threeg_rfkill); + } + } + schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ)); return 0; @@ -1092,6 +1181,11 @@ static void acer_rfkill_exit(void) rfkill_unregister(bluetooth_rfkill); rfkill_destroy(bluetooth_rfkill); } + + if (has_cap(ACER_CAP_THREEG)) { + rfkill_unregister(threeg_rfkill); + rfkill_destroy(threeg_rfkill); + } return; } @@ -1102,7 +1196,12 @@ static ssize_t show_bool_threeg(struct device *dev, struct device_attribute *attr, char *buf) { u32 result; \ - acpi_status status = get_u32(&result, ACER_CAP_THREEG); + acpi_status status; + if (wmi_has_guid(WMID_GUID3)) + status = acer_wmi_get_device_status(&result, + ACER_WMID_GUID3_GDS_THREEG); + else + status = get_u32(&result, ACER_CAP_THREEG); if (ACPI_SUCCESS(status)) return sprintf(buf, "%u\n", result); return sprintf(buf, "Read error\n");