From patchwork Fri Oct 1 13:51:28 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: 224282 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 o91DtHFq028291 for ; Fri, 1 Oct 2010 13:55:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932119Ab0JANzQ (ORCPT ); Fri, 1 Oct 2010 09:55:16 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:33429 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932371Ab0JANzP (ORCPT ); Fri, 1 Oct 2010 09:55:15 -0400 Received: by mail-fx0-f46.google.com with SMTP id 14so576471fxm.19 for ; Fri, 01 Oct 2010 06:55:15 -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=3w4m80izbINClTHTEF1Yzag6qo1SJWsgD3yUyM+++OI=; b=jRvo0Z7PUiwfhC35ijKlLr0Xy/T/+v7nULslkk54qDhAQaJD7rbjoYXVcXYWe6B6SS Bd6ylaP3EhvstYdJ4oBNlSJVAiC1gnr7Am1Z99JdM7ErPUzkAeEdy60meR1mu3IsqdZc 7dFdbcj65ZJJ+U46/YA3gSweQt2a3mcB69WkE= 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=AbkgR5jTcByl8FBaIUzMeBuSAnDt+H/sZ12lM1RRcKOXp8tyZmrd6VN0FwidUda/9E mv7UEWvch682UUyjDZBsTrD6EfjOZz42sCN3V/6l/yMbBS8wDxj3pIqKlo3F+E2/5fGN geErvsTxQUp8vRADHw31QIEXm0J6ZOt3nNetU= Received: by 10.103.238.17 with SMTP id p17mr2356932mur.20.1285941314351; Fri, 01 Oct 2010 06:55:14 -0700 (PDT) Received: from localhost.localdomain ([61.14.133.18]) by mx.google.com with ESMTPS id m17sm3538994fag.0.2010.10.01.06.55.09 (version=SSLv3 cipher=RC4-MD5); Fri, 01 Oct 2010 06:55: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, "Lee, Chun-Yi" Subject: [PATCH 2/2] Support enable Acer Launch Manager mode Date: Fri, 1 Oct 2010 21:51:28 +0800 Message-Id: <1285941088-31196-2-git-send-email-jlee@novell.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1285941088-31196-1-git-send-email-jlee@novell.com> References: <1285941088-31196-1-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]); Fri, 01 Oct 2010 13:55:17 +0000 (UTC) diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 79d2553..562e853 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c @@ -84,6 +84,7 @@ MODULE_LICENSE("GPL"); #define AMW0_GUID2 "431F16ED-0C2B-444C-B267-27DEB140CF9C" #define WMID_GUID1 "6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3" #define WMID_GUID2 "95764E09-FB56-4e83-B31A-37761F60994A" +#define WMID_GUID3 "61EF69EA-865C-4BC3-A502-A0DEBA0CB531" /* * Acer ACPI event GUIDs @@ -127,6 +128,20 @@ struct event_return_value { u32 reserved; } __attribute__((packed)); +struct lm_input_params { + u8 function_num; /* Function Number */ + u16 commun_devices; /* Communication type devices default status */ + u16 devices; /* Other type devices default status */ + u8 lm_status; /* Launch Manager Status */ + u16 reserved; +} __attribute__((packed)); + +struct lm_return_value { + u8 error_code; /* Error Code */ + u8 ec_return_value; /* EC Return Value */ + u16 reserved; +} __attribute__((packed)); + /* * Interface capability flags */ @@ -157,15 +172,18 @@ static int mailled = -1; static int brightness = -1; static int threeg = -1; static int force_series; +static bool launch_manager; module_param(mailled, int, 0444); module_param(brightness, int, 0444); module_param(threeg, int, 0444); module_param(force_series, int, 0444); +module_param(launch_manager, bool, 0444); MODULE_PARM_DESC(mailled, "Set initial state of Mail LED"); MODULE_PARM_DESC(brightness, "Set initial LCD backlight brightness"); MODULE_PARM_DESC(threeg, "Set initial state of 3G hardware"); MODULE_PARM_DESC(force_series, "Force a different laptop series"); +MODULE_PARM_DESC(launch_manager, "Enable Acer Launch Manager mode"); struct acer_data { int mailled; @@ -1457,6 +1475,52 @@ error_debugfs: return -ENOMEM; } +static int acer_wmi_enable_lm(void) +{ + struct lm_return_value return_value; + acpi_status status; + union acpi_object *obj; + struct lm_input_params params = { + .function_num = 0x1, + .commun_devices = 0x0041, /* WiFi on, 3G on, BT off */ + .devices = 0xFFFF, + .lm_status = 0x41, /* Launch Manager Active */ + }; + + struct acpi_buffer input = { sizeof(struct lm_input_params), ¶ms }; + struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; + + status = wmi_evaluate_method(WMID_GUID3, 0, 0x1, &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 != 4) { + printk(ACER_WARNING "Unknown buffer length %d\n", + obj->buffer.length); + kfree(obj); + return -EINVAL; + } + + return_value = *((struct lm_return_value *)obj->buffer.pointer); + kfree(obj); + + if (return_value.error_code || return_value.ec_return_value) + printk(ACER_WARNING "Enabling Launch Manager failed: 0x%x - 0x%x\n", + return_value.error_code, return_value.ec_return_value); + else + printk(ACER_INFO "Enabled Launch Manager"); + + return status; +} + static int __init acer_wmi_init(void) { int err; @@ -1518,6 +1582,15 @@ static int __init acer_wmi_init(void) "generic video driver\n"); } + if (wmi_has_guid(WMID_GUID3) && launch_manager) { + if (ACPI_FAILURE(acer_wmi_enable_lm())) { + printk(ACER_ERR "Cannot enable Launch Manager mode\n"); + return -ENODEV; + } + } else if (!wmi_has_guid(WMID_GUID3) && launch_manager) { + printk(ACER_INFO "No WMID launch manager enable method found\n"); + } + if (wmi_has_guid(ACERWMID_EVENT_GUID)) { err = wmi_install_notify_handler(ACERWMID_EVENT_GUID, acer_wmi_notify, NULL);