X86 platform drivers
 help / color / mirror / Atom feed
* [PATCH 0/4] Add new wmi support to acer-wmi driver
@ 2010-11-24 17:39 Lee, Chun-Yi
  2010-11-24 17:39 ` [PATCH 1/4] Add acer wmi hotkey events support Lee, Chun-Yi
  0 siblings, 1 reply; 11+ messages in thread
From: Lee, Chun-Yi @ 2010-11-24 17:39 UTC (permalink / raw)
  To: mjg59
  Cc: corentin.chary, dmitry.torokhov, tiwai, carlos, jbenc, jdelvare,
	trenn, linux-input, platform-driver-x86, Lee, Chun-Yi

Hi Matthew, 

These patches add new wmi support to acer-wmi driver, included the following
functions:

- Acer wmi hotkey events:
  Acer BIOS applied wmi hotkey events from 2010, this patch adds support.

- Enabled Acer Launch Manager mode:
  Directly enable it to avoid the raw EC behavior conflict with rfkill-input or
  userland solution.

- Add 3G rfkill sysfs file:
  Provide interface to userland for enable/disable 3G function by wmi method.

- Detect the WiFi/Bluetooth/3G devices available:
  Look for OEM type AAh in dmi to get the WiFi/BT/3G devices available.

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Reviewed-by: Thomas Renninger <trenn@suse.de>

Lee, Chun-Yi (4):
  Add acer wmi hotkey events support
  Enabled Acer Launch Manager mode
  Add 3G rfkill sysfs file
  Detect the WiFi/Bluetooth/3G devices available

 drivers/platform/x86/Kconfig    |    2 +
 drivers/platform/x86/acer-wmi.c |  400 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 394 insertions(+), 8 deletions(-)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PATCH 0/4] Add new wmi support to acer-wmi driver
@ 2010-12-04  1:03 Lee, Chun-Yi
  2010-12-04  1:03 ` [PATCH 1/4] Add acer wmi hotkey events support Lee, Chun-Yi
  0 siblings, 1 reply; 11+ messages in thread
From: Lee, Chun-Yi @ 2010-12-04  1:03 UTC (permalink / raw)
  To: mjg
  Cc: carlos, corentin.chary, dmitry.torokhov, corentincj, tiwai, mjg59,
	jbenc, jdelvare, trenn, platform-driver-x86, linux-input,
	Lee, Chun-Yi

Hi Matthew, 

These patches add new wmi support to acer-wmi driver, included the following
functions:

- Acer wmi hotkey events:
  Acer BIOS applied wmi hotkey events from 2010, this patch adds support.

- Enabled Acer Launch Manager mode:
  Directly enable it to avoid the raw EC behavior conflict with rfkill-input or
  userland solution.

- Add 3G rfkill sysfs file:
  Provide interface to userland for enable/disable 3G function by wmi method.

- Detect the WiFi/Bluetooth/3G devices available:
  Look for OEM type AAh in dmi to get the WiFi/BT/3G devices available.

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
Reviewed-by: Thomas Renninger <trenn@suse.de>

Lee, Chun-Yi (4):
  Add acer wmi hotkey events support
  Enabled Acer Launch Manager mode
  Add 3G rfkill sysfs file
  Detect the WiFi/Bluetooth/3G devices available

 drivers/platform/x86/Kconfig    |    2 +
 drivers/platform/x86/acer-wmi.c |  400 ++++++++++++++++++++++++++++++++++++++-
 2 files changed, 394 insertions(+), 8 deletions(-)

^ permalink raw reply	[flat|nested] 11+ messages in thread
* Re: [PATCH 3/4] Add 3G rfkill sysfs file
@ 2010-10-30 16:44 Joey Lee
  0 siblings, 0 replies; 11+ messages in thread
From: Joey Lee @ 2010-10-30 16:44 UTC (permalink / raw)
  To: platform-driver-x86
  Cc: corentin.chary, dmitry.torokhov, Takashi Iwai, Thomas Renninger,
	mjg59, carlos, jbenc, trenn, linux-input

Add CC. Thomas

於 日，2010-10-31 於 00:36 +0800，Lee, Chun-Yi 提到：
> Add 3G rfkill sysfs file for provide userland to control 3G device
> on/off by using WMI method.
> 
> Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
> ---
>  drivers/platform/x86/acer-wmi.c |   99 ++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 98 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
> index 0b870d3..9656464 100644
> --- a/drivers/platform/x86/acer-wmi.c
> +++ b/drivers/platform/x86/acer-wmi.c
> @@ -136,6 +136,24 @@ struct lm_return_value {
>  } __attribute__((packed));
>  
>  /*
> + * GUID3 Get Device Status device flags
> + */
> +#define ACER_WMID3_GDS_THREEG		(1<<6)	/* 3G */
> +
> +struct wmid3_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 wmid3_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 +210,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 +1019,54 @@ static void acer_backlight_exit(void)
>  	backlight_device_unregister(acer_backlight_device);
>  }
>  
> +static acpi_status wmid3_get_device_status(u32 *value, u16 device)
> +{
> +	struct wmid3_gds_return_value return_value;
> +	acpi_status status;
> +	union acpi_object *obj;
> +	struct wmid3_gds_input_param params = {
> +		.function_num = 0x1,
> +		.hotkey_number = 0x01,
> +		.devices = device,
> +	};
> +	struct acpi_buffer input = {
> +		sizeof(struct wmid3_gds_input_param),
> +		&params
> +	};
> +	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 wmid3_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 +1087,13 @@ static void acer_rfkill_update(struct work_struct *ignored)
>  			rfkill_set_sw_state(bluetooth_rfkill, !state);
>  	}
>  
> +	if (has_cap(ACER_CAP_THREEG) && wmi_has_guid(WMID_GUID3)) {
> +		status = wmid3_get_device_status(&state,
> +				ACER_WMID3_GDS_THREEG);
> +		if (ACPI_SUCCESS(status))
> +			rfkill_set_sw_state(threeg_rfkill, !state);
> +	}
> +
>  	schedule_delayed_work(&acer_rfkill_work, round_jiffies_relative(HZ));
>  }
>  
> @@ -1076,6 +1150,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 +1179,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 +1194,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 = wmid3_get_device_status(&result,
> +				ACER_WMID3_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");

^ permalink raw reply	[flat|nested] 11+ messages in thread
* [PATCH 1/4] Add acer wmi hotkey events support
@ 2010-10-30 16:36 Lee, Chun-Yi
  2010-10-30 16:36 ` [PATCH 2/4] Enabled Acer Launch Manager mode Lee, Chun-Yi
  0 siblings, 1 reply; 11+ messages in thread
From: Lee, Chun-Yi @ 2010-10-30 16:36 UTC (permalink / raw)
  To: platform-driver-x86
  Cc: linux-input, carlos, corentin.chary, dmitry.torokhov, tiwai,
	trenn, mjg59, jbenc, Lee, Chun-Yi

Add acer wmi hotkey event support. Install a wmi notify handler to
transfer wmi event key to key code, then send out keycode through acer
wmi input device to userland.

Signed-off-by: Lee, Chun-Yi <jlee@novell.com>
---
 drivers/platform/x86/Kconfig    |    2 +
 drivers/platform/x86/acer-wmi.c |  139 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+), 0 deletions(-)

diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index cff7cc2..c242fdd 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -23,7 +23,9 @@ config ACER_WMI
 	depends on BACKLIGHT_CLASS_DEVICE
 	depends on SERIO_I8042
 	depends on RFKILL || RFKILL = n
+	depends on INPUT
 	select ACPI_WMI
+	select INPUT_SPARSEKMAP
 	---help---
 	  This is a driver for newer Acer (and Wistron) laptops. It adds
 	  wireless radio and bluetooth control, and on some laptops,
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c
index 2badee2..930df56 100644
--- a/drivers/platform/x86/acer-wmi.c
+++ b/drivers/platform/x86/acer-wmi.c
@@ -37,6 +37,8 @@
 #include <linux/workqueue.h>
 #include <linux/debugfs.h>
 #include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/input/sparse-keymap.h>
 
 #include <acpi/acpi_drivers.h>
 
@@ -48,6 +50,7 @@ MODULE_LICENSE("GPL");
 #define ACER_ERR KERN_ERR ACER_LOGPREFIX
 #define ACER_NOTICE KERN_NOTICE ACER_LOGPREFIX
 #define ACER_INFO KERN_INFO ACER_LOGPREFIX
+#define ACER_WARNING KERN_WARNING ACER_LOGPREFIX
 
 /*
  * Magic Number
@@ -83,8 +86,39 @@ MODULE_LICENSE("GPL");
 #define WMID_GUID1		"6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3"
 #define WMID_GUID2		"95764E09-FB56-4e83-B31A-37761F60994A"
 
+/*
+ * Acer ACPI event GUIDs
+ */
+#define ACERWMID_EVENT_GUID "676AA15E-6A47-4D9F-A2CC-1E6D18D14026"
+
 MODULE_ALIAS("wmi:67C3371D-95A3-4C37-BB61-DD47B491DAAB");
 MODULE_ALIAS("wmi:6AF4F258-B401-42fd-BE91-3D4AC2D7C0D3");
+MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026");
+
+enum acer_wmi_event_ids {
+	WMID_HOTKEY_EVENT = 0x1,
+};
+
+static const struct key_entry acer_wmi_keymap[] = {
+	{KE_KEY, 0x01, {KEY_WLAN} },     /* WiFi */
+	{KE_KEY, 0x12, {KEY_BLUETOOTH} },	/* BT */
+	{KE_KEY, 0x21, {KEY_PROG1} },    /* Backup */
+	{KE_KEY, 0x22, {KEY_PROG2} },    /* Aracade */
+	{KE_KEY, 0x23, {KEY_PROG3} },    /* P_Key */
+	{KE_KEY, 0x24, {KEY_PROG4} },    /* Social networking_Key */
+	{KE_KEY, 0x64, {KEY_SWITCHVIDEOMODE} },	/* Display Switch */
+	{KE_KEY, 0x82, {KEY_F22} },      /* Touch Pad On/Off */
+	{KE_END, 0}
+};
+
+static struct input_dev *acer_wmi_input_dev;
+
+struct event_return_value {
+	u8 function;
+	u8 key_num;
+	u16 device_state;
+	u32 reserved;
+} __attribute__((packed));
 
 /*
  * Interface capability flags
@@ -1085,6 +1119,99 @@ static ssize_t show_interface(struct device *dev, struct device_attribute *attr,
 
 static DEVICE_ATTR(interface, S_IRUGO, show_interface, NULL);
 
+static void acer_wmi_notify(u32 value, void *context)
+{
+	struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL };
+	union acpi_object *obj;
+	struct event_return_value return_value;
+	acpi_status status;
+
+	status = wmi_get_event_data(value, &response);
+	if (status != AE_OK) {
+		printk(ACER_WARNING "bad event status 0x%x\n", status);
+		return;
+	}
+
+	obj = (union acpi_object *)response.pointer;
+
+	if (!obj)
+		return;
+	if (obj->type != ACPI_TYPE_BUFFER) {
+		printk(ACER_WARNING "Unknown response received %d\n",
+			obj->type);
+		kfree(obj);
+		return;
+	}
+	if (obj->buffer.length != 8) {
+		printk(ACER_WARNING "Unknown buffer length %d\n",
+			obj->buffer.length);
+		kfree(obj);
+		return;
+	}
+
+	return_value = *((struct event_return_value *)obj->buffer.pointer);
+	kfree(obj);
+
+	switch (return_value.function) {
+	case WMID_HOTKEY_EVENT:
+		if (!sparse_keymap_report_event(acer_wmi_input_dev,
+				return_value.key_num, 1, true))
+			printk(ACER_WARNING "Unknown key number - 0x%x\n",
+				return_value.key_num);
+		break;
+	default:
+		printk(ACER_WARNING "Unknown function number - %d - %d\n",
+			return_value.function, return_value.key_num);
+		break;
+	}
+}
+
+static int __init acer_wmi_input_setup(void)
+{
+	acpi_status status;
+	int err;
+
+	acer_wmi_input_dev = input_allocate_device();
+	if (!acer_wmi_input_dev)
+		return -ENOMEM;
+
+	acer_wmi_input_dev->name = "Acer WMI hotkeys";
+	acer_wmi_input_dev->phys = "wmi/input0";
+	acer_wmi_input_dev->id.bustype = BUS_HOST;
+
+	err = sparse_keymap_setup(acer_wmi_input_dev, acer_wmi_keymap, NULL);
+	if (err)
+		goto err_free_dev;
+
+	status = wmi_install_notify_handler(ACERWMID_EVENT_GUID,
+						acer_wmi_notify, NULL);
+	if (ACPI_FAILURE(status)) {
+		err = -EIO;
+		goto err_free_keymap;
+	}
+
+	err = input_register_device(acer_wmi_input_dev);
+	if (err)
+		goto err_uninstall_notifier;
+
+	return 0;
+
+err_uninstall_notifier:
+	wmi_remove_notify_handler(ACERWMID_EVENT_GUID);
+err_free_keymap:
+	sparse_keymap_free(acer_wmi_input_dev);
+err_free_dev:
+	input_free_device(acer_wmi_input_dev);
+	return err;
+}
+
+static void acer_wmi_input_destroy(void)
+{
+	wmi_remove_notify_handler(ACERWMID_EVENT_GUID);
+	sparse_keymap_free(acer_wmi_input_dev);
+	input_unregister_device(acer_wmi_input_dev);
+}
+
 /*
  * debugfs functions
  */
@@ -1327,6 +1454,12 @@ static int __init acer_wmi_init(void)
 		       "generic video driver\n");
 	}
 
+	if (wmi_has_guid(ACERWMID_EVENT_GUID)) {
+		err = acer_wmi_input_setup();
+		if (err)
+			return err;
+	}
+
 	err = platform_driver_register(&acer_platform_driver);
 	if (err) {
 		printk(ACER_ERR "Unable to register platform driver.\n");
@@ -1368,11 +1501,17 @@ error_device_add:
 error_device_alloc:
 	platform_driver_unregister(&acer_platform_driver);
 error_platform_register:
+	if (wmi_has_guid(ACERWMID_EVENT_GUID))
+		acer_wmi_input_destroy();
+
 	return err;
 }
 
 static void __exit acer_wmi_exit(void)
 {
+	if (wmi_has_guid(ACERWMID_EVENT_GUID))
+		acer_wmi_input_destroy();
+
 	remove_sysfs(acer_platform_device);
 	remove_debugfs();
 	platform_device_unregister(acer_platform_device);
-- 
1.6.0.2

^ permalink raw reply related	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2010-12-04  1:05 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-11-24 17:39 [PATCH 0/4] Add new wmi support to acer-wmi driver Lee, Chun-Yi
2010-11-24 17:39 ` [PATCH 1/4] Add acer wmi hotkey events support Lee, Chun-Yi
2010-11-24 17:39   ` [PATCH 2/4] Enabled Acer Launch Manager mode Lee, Chun-Yi
2010-11-24 17:39     ` [PATCH 3/4] Add 3G rfkill sysfs file Lee, Chun-Yi
2010-11-24 17:39       ` [PATCH 4/4] Detect the WiFi/Bluetooth/3G devices available Lee, Chun-Yi
2010-11-24 20:03       ` [PATCH 3/4] Add 3G rfkill sysfs file Carlos Corbacho
2010-11-24 19:49     ` [PATCH 2/4] Enabled Acer Launch Manager mode Carlos Corbacho
2010-11-24 19:28   ` [PATCH 1/4] Add acer wmi hotkey events support Carlos Corbacho
  -- strict thread matches above, loose matches on Subject: below --
2010-12-04  1:03 [PATCH 0/4] Add new wmi support to acer-wmi driver Lee, Chun-Yi
2010-12-04  1:03 ` [PATCH 1/4] Add acer wmi hotkey events support Lee, Chun-Yi
2010-12-04  1:03   ` [PATCH 2/4] Enabled Acer Launch Manager mode Lee, Chun-Yi
2010-12-04  1:03     ` [PATCH 3/4] Add 3G rfkill sysfs file Lee, Chun-Yi
2010-10-30 16:44 Joey Lee
2010-10-30 16:36 [PATCH 1/4] Add acer wmi hotkey events support Lee, Chun-Yi
2010-10-30 16:36 ` [PATCH 2/4] Enabled Acer Launch Manager mode Lee, Chun-Yi
2010-10-30 16:36   ` [PATCH 3/4] Add 3G rfkill sysfs file Lee, Chun-Yi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox