[kernel] r11083 - in dists/trunk/linux-2.6/debian: . patches/features/all patches/series

Maximilian Attems maks at alioth.debian.org
Wed Apr 16 11:12:09 UTC 2008 

Author: maks
Date: Wed Apr 16 11:12:07 2008
New Revision: 11083

Log:
acpi: Add Eee PC Hotkey Driver

better eee pc out of the box linux-2.6 experience.
fedora merged and with upstream accepted /sys interface.


Added:
   dists/trunk/linux-2.6/debian/patches/features/all/acpi-eeepc-hotkey.patch
Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Apr 16 11:12:07 2008
@@ -38,6 +38,7 @@
   * copyright: adapt to latest lintian recommendation.
   * input: Add 4 additional exports for modular speakup and braille support.
   * firewire: Add firewire-git.patch for latest firewire tree features.
+  * acpi: Add Eee PC Hotkey Driver.
 
   [ Martin Michlmayr ]
   * [arm/armel] Add a kernel for Orion based devices, such as the QNAP

Added: dists/trunk/linux-2.6/debian/patches/features/all/acpi-eeepc-hotkey.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/all/acpi-eeepc-hotkey.patch	Wed Apr 16 11:12:07 2008
@@ -0,0 +1,490 @@
+Signed-off-by: Eric Cooper <ecc at cmu.edu>
+
+---
+ drivers/misc/Kconfig  |   10 +
+ drivers/misc/Makefile |    1 +
+ drivers/misc/eeepc.c  |  447 +++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 458 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/misc/eeepc.c
+
+diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+index b1f9a40..8fd1ccb 100644
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -251,4 +251,14 @@ config ATMEL_SSC
+ 	  driver (SCSI/ATA) which supports enclosures
+ 	  or a SCSI enclosure device (SES) to use these services.
+ 
++config EEEPC
++        tristate "Eee PC Hotkey Driver (EXPERIMENTAL)"
++        depends on X86
++        depends on ACPI
++	depends on EXPERIMENTAL && !ACPI_ASUS
++        ---help---
++	  This driver supports the Fn-Fx keys on Eee PC laptops.
++
++	  If you have an Eee PC laptop, say Y or M here.
++
+ endif # MISC_DEVICES
+diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
+index 87f2685..699b35c 100644
+--- a/drivers/misc/Makefile
++++ b/drivers/misc/Makefile
+@@ -17,3 +17,4 @@ obj-$(CONFIG_SONY_LAPTOP)	+= sony-laptop.o
+ obj-$(CONFIG_EEPROM_93CX6)	+= eeprom_93cx6.o
+ obj-$(CONFIG_INTEL_MENLOW)	+= intel_menlow.o
+ obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o
++obj-$(CONFIG_EEEPC)		+= eeepc.o
+diff --git a/drivers/misc/eeepc.c b/drivers/misc/eeepc.c
+new file mode 100644
+index 0000000..2e33117
+--- /dev/null
++++ b/drivers/misc/eeepc.c
+@@ -0,0 +1,447 @@
++/*
++ *  eepc_acpi.c - Asus Eee PC hotkey driver
++ *
++ *  Copyright (C) 2008 Eric Cooper <ecc at cmu.edu>
++ *
++ *  Based on asus_acpi.c as patched for the Eee PC by Asus:
++ *  ftp://ftp.asus.com/pub/ASUS/EeePC/701/ASUS_ACPI_071126.rar
++ *
++ *  Copyright (C) 2002-2005 Julien Lerouge, 2003-2006 Karol Kozimor
++ *
++ *  This program is free software; you can redistribute it and/or modify
++ *  it under the terms of the GNU General Public License as published by
++ *  the Free Software Foundation; either version 2 of the License, or
++ *  (at your option) any later version.
++ *
++ *  This program is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ *  GNU General Public License for more details.
++ */
++
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/init.h>
++#include <linux/types.h>
++#include <linux/platform_device.h>
++#include <acpi/acpi_drivers.h>
++#include <acpi/acpi_bus.h>
++#include <asm/uaccess.h>
++
++#define EEEPC_HOTK_NAME          "Eee PC Hotkey Driver"
++#define EEEPC_HOTK_FILE          "eeepc"
++#define EEEPC_HOTK_CLASS         "hotkey"
++#define EEEPC_HOTK_DEVICE_NAME   "Hotkey"
++#define EEEPC_HOTK_HID           "ASUS010"
++
++#define EEEPC_LOG	EEEPC_HOTK_FILE ": "
++#define EEEPC_ERR	KERN_ERR EEEPC_LOG
++#define EEEPC_WARNING	KERN_WARNING EEEPC_LOG
++#define EEEPC_NOTICE	KERN_NOTICE EEEPC_LOG
++#define EEEPC_INFO	KERN_INFO EEEPC_LOG
++
++/*
++ * Definitions for Asus EeePC
++ */
++
++#define	NOTIFY_WLAN_ON	0x10
++
++enum {
++	DISABLE_ASL_WLAN = 0x0001,
++	DISABLE_ASL_BLUETOOTH = 0x0002,
++	DISABLE_ASL_IRDA = 0x0004,
++	DISABLE_ASL_CAMERA = 0x0008,
++	DISABLE_ASL_TV = 0x0010,
++	DISABLE_ASL_GPS = 0x0020,
++	DISABLE_ASL_DISPLAYSWITCH = 0x0040,
++	DISABLE_ASL_MODEM = 0x0080,
++	DISABLE_ASL_CARDREADER = 0x0100
++};
++
++enum {
++	CM_ASL_WLAN = 0,
++	CM_ASL_BLUETOOTH,
++	CM_ASL_IRDA,
++	CM_ASL_1394,
++	CM_ASL_CAMERA,
++	CM_ASL_TV,
++	CM_ASL_GPS,
++	CM_ASL_DVDROM,
++	CM_ASL_DISPLAYSWITCH,
++	CM_ASL_PANELBRIGHT,
++	CM_ASL_BIOSFLASH,
++	CM_ASL_ACPIFLASH,
++	CM_ASL_CPUFV,
++	CM_ASL_CPUTEMPERATURE,
++	CM_ASL_FANCPU,
++	CM_ASL_FANCHASSIS,
++	CM_ASL_USBPORT1,
++	CM_ASL_USBPORT2,
++	CM_ASL_USBPORT3,
++	CM_ASL_MODEM,
++	CM_ASL_CARDREADER,
++	CM_ASL_LID
++};
++
++const char *cm_getv[] = {
++	"WLDG", NULL, NULL, NULL,
++	"CAMG", NULL, NULL, NULL,
++	NULL, "PBLG", NULL, NULL,
++	"CFVG", NULL, NULL, NULL,
++	"USBG", NULL, NULL, "MODG",
++	"CRDG", "LIDG"
++};
++
++const char *cm_setv[] = {
++	"WLDS", NULL, NULL, NULL,
++	"CAMS", NULL, NULL, NULL,
++	"SDSP", "PBLS", "HDPS", NULL,
++	"CFVS", NULL, NULL, NULL,
++	"USBG", NULL, NULL, "MODS",
++	"CRDS", NULL
++};
++
++static unsigned int init_flag;
++
++/*
++ * This is the main structure, we can use it to store useful information
++ * about the hotk device
++ */
++struct eeepc_hotk {
++	struct acpi_device *device;	/* the device we are in */
++	acpi_handle handle;		/* the handle of the hotk device */
++	u32 cm_supported;		/* the control methods supported
++					   by this BIOS */
++	u16 event_count[128];		/* count for each event */
++};
++
++/* The actual device the driver binds to */
++static struct eeepc_hotk *ehotk;
++
++/*
++ * The hotkey driver declaration
++ */
++static int eeepc_hotk_add(struct acpi_device *device);
++static int eeepc_hotk_remove(struct acpi_device *device, int type);
++
++static const struct acpi_device_id eee_device_ids[] = {
++	{EEEPC_HOTK_HID, 0},
++	{"", 0},
++};
++
++static struct acpi_driver eeepc_hotk_driver = {
++	.name = EEEPC_HOTK_NAME,
++	.class = EEEPC_HOTK_CLASS,
++	.ids = eee_device_ids,
++	.ops = {
++		.add = eeepc_hotk_add,
++		.remove = eeepc_hotk_remove,
++	},
++};
++
++MODULE_AUTHOR("Julien Lerouge, Karol Kozimor, Eric Cooper");
++MODULE_DESCRIPTION(EEEPC_HOTK_NAME);
++MODULE_LICENSE("GPL");
++
++/*
++ * returns 1 if write is successful, otherwise 0.
++ */
++static int write_acpi_int(acpi_handle handle, const char *method, int val,
++			  struct acpi_buffer *output)
++{
++	struct acpi_object_list params;
++	union acpi_object in_obj;
++	acpi_status status;
++
++	params.count = 1;
++	params.pointer = &in_obj;
++	in_obj.type = ACPI_TYPE_INTEGER;
++	in_obj.integer.value = val;
++
++	status = acpi_evaluate_object(handle, (char *)method, &params, output);
++	return (status == AE_OK);
++}
++
++static int read_acpi_int(acpi_handle handle, const char *method, int *val)
++{
++	struct acpi_buffer output;
++	union acpi_object out_obj;
++	acpi_status status;
++
++	output.length = sizeof(out_obj);
++	output.pointer = &out_obj;
++	status = acpi_evaluate_object(handle, (char *) method, NULL, &output);
++	*val = out_obj.integer.value;
++	return (status == AE_OK) && (out_obj.type == ACPI_TYPE_INTEGER);
++}
++
++static int parse_arg(const char *buf, unsigned long count, int *val)
++{
++	if (!count)
++		return 0;
++	if (count > 31)
++		return -EINVAL;
++	if (sscanf(buf, "%i", val) != 1)
++		return -EINVAL;
++	return count;
++}
++
++static ssize_t store_proc(int cm, const char *buf, size_t count)
++{
++	int rv, value;
++
++	rv = parse_arg(buf, count, &value);
++	if (rv > 0 && (ehotk->cm_supported & (0x1 << cm))) {
++		const char *method = cm_setv[cm];
++		if (method == NULL)
++			return 0;
++		if (!write_acpi_int(ehotk->handle, method, value, NULL))
++			printk(EEEPC_WARNING "Error writing %s\n", method);
++	}
++	return rv;
++}
++
++static ssize_t show_proc(int cm, char *buf)
++{
++	int value = -1;
++
++	if ((ehotk->cm_supported & (0x1 << cm))) {
++		const char *method = cm_getv[cm];
++		if (method == NULL)
++			return 0;
++		if (!read_acpi_int(ehotk->handle, method, &value))
++			printk(EEEPC_WARNING "Error reading %s\n", method);
++	}
++	return sprintf(buf, "%d\n", value);
++}
++
++static ssize_t real_store_init(struct device *dev,
++			       struct device_attribute *attr,
++			       const char *buf, size_t count)
++{
++	int rv, value;
++
++	rv = parse_arg(buf, count, &value);
++	if (!write_acpi_int(ehotk->handle, "INIT", value, NULL))
++		printk(EEEPC_ERR "Hotkey initialization failed\n");
++	else
++		printk(EEEPC_INFO "Reset init flag 0x%x\n", value);
++	return rv;
++}
++
++#define EEEPC_CREATE_DEVICE_ATTR(_name, _cm)				\
++	static ssize_t show_##_name(struct device *dev,			\
++				    struct device_attribute *attr,	\
++				    char *buf)				\
++	{								\
++		return show_proc(_cm, buf);				\
++	}								\
++	static ssize_t store_##_name(struct device *dev,		\
++				     struct device_attribute *attr,	\
++				     const char *buf, size_t count)	\
++	{								\
++		return store_proc(_cm, buf, count);			\
++	}								\
++	static struct device_attribute dev_attr_##_name = {		\
++		.attr = {						\
++			.name = __stringify(_name),			\
++			.mode = 0644 },					\
++		.show   = show_##_name,					\
++		.store  = store_##_name,				\
++	}
++
++EEEPC_CREATE_DEVICE_ATTR(brn, CM_ASL_PANELBRIGHT);
++EEEPC_CREATE_DEVICE_ATTR(camera, CM_ASL_CAMERA);
++EEEPC_CREATE_DEVICE_ATTR(cardr, CM_ASL_CARDREADER);
++EEEPC_CREATE_DEVICE_ATTR(cpufv, CM_ASL_CPUFV);
++EEEPC_CREATE_DEVICE_ATTR(disp, CM_ASL_DISPLAYSWITCH);
++EEEPC_CREATE_DEVICE_ATTR(hdps, CM_ASL_BIOSFLASH);
++EEEPC_CREATE_DEVICE_ATTR(init, -1);	/* fixed up in eeepc_hotk_add() */
++EEEPC_CREATE_DEVICE_ATTR(lid, CM_ASL_LID);
++EEEPC_CREATE_DEVICE_ATTR(wlan, CM_ASL_WLAN);
++
++static struct attribute *platform_attributes[] = {
++	&dev_attr_brn.attr,
++	&dev_attr_camera.attr,
++	&dev_attr_cardr.attr,
++	&dev_attr_cpufv.attr,
++	&dev_attr_disp.attr,
++	&dev_attr_hdps.attr,
++	&dev_attr_init.attr,
++	&dev_attr_lid.attr,
++	&dev_attr_wlan.attr,
++	NULL
++};
++
++static struct attribute_group platform_attribute_group = {
++	.attrs = platform_attributes
++};
++
++static int eeepc_hotk_check(void)
++{
++	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
++	int result;
++
++	result = acpi_bus_get_status(ehotk->device);
++	if (result)
++		return result;
++	if (ehotk->device->status.present) {
++		if (!write_acpi_int(ehotk->handle, "INIT", init_flag,
++				    &buffer)) {
++			printk(EEEPC_ERR "Hotkey initialization failed\n");
++			return -ENODEV;
++		} else {
++			printk(EEEPC_NOTICE "Hotkey init flags 0x%x\n",
++			       init_flag);
++		}
++		/* get control methods supported */
++		if (!read_acpi_int(ehotk->handle, "CMSG"
++				   , &ehotk->cm_supported)) {
++			printk(EEEPC_ERR
++			       "Get control methods supported failed\n");
++			return -ENODEV;
++		} else {
++			printk(EEEPC_INFO
++			       "Get control methods supported: 0x%x\n",
++			       ehotk->cm_supported);
++		}
++		ehotk->cm_supported |= (0x1 << CM_ASL_LID);
++	} else {
++		printk(EEEPC_ERR "Hotkey device not present, aborting\n");
++		return -EINVAL;
++	}
++	return 0;
++}
++
++static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
++{
++	if (!ehotk)
++		return;
++	/* if DISABLE_ASL_WLAN is set, the notify code for fn+f2
++	   will always be 0x10 */
++	if (event == NOTIFY_WLAN_ON && (DISABLE_ASL_WLAN & init_flag)) {
++		int value;
++		if (ehotk->cm_supported & (0x1 << CM_ASL_WLAN)) {
++			const char *method = cm_getv[CM_ASL_WLAN];
++			if (!read_acpi_int(ehotk->handle, method, &value))
++				printk(EEEPC_WARNING "Error reading %s\n",
++				       method);
++			else if (value == 1)
++				event = 0x11;
++		}
++	}
++	acpi_bus_generate_proc_event(ehotk->device, event,
++				     ehotk->event_count[event % 128]++);
++}
++
++static int ehotk_found;
++
++static int eeepc_hotk_add(struct acpi_device *device)
++{
++	acpi_status status = AE_OK;
++	int result;
++
++	if (!device)
++		 return -EINVAL;
++	printk(EEEPC_NOTICE EEEPC_HOTK_NAME "\n");
++	ehotk = kzalloc(sizeof(struct eeepc_hotk), GFP_KERNEL);
++	if (!ehotk)
++		return -ENOMEM;
++	ehotk->handle = device->handle;
++	strcpy(acpi_device_name(device), EEEPC_HOTK_DEVICE_NAME);
++	strcpy(acpi_device_class(device), EEEPC_HOTK_CLASS);
++	acpi_driver_data(device) = ehotk;
++	ehotk->device = device;
++	result = eeepc_hotk_check();
++	if (result)
++		goto end;
++	dev_attr_init.show = NULL;
++	dev_attr_init.store = real_store_init;
++	status = acpi_install_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
++					     eeepc_hotk_notify, ehotk);
++	if (ACPI_FAILURE(status))
++		printk(EEEPC_ERR "Error installing notify handler\n");
++	ehotk_found = 1;
++ end:
++	if (result)
++		kfree(ehotk);
++	return result;
++}
++
++static int eeepc_hotk_remove(struct acpi_device *device, int type)
++{
++	acpi_status status = 0;
++
++	if (!device || !acpi_driver_data(device))
++		 return -EINVAL;
++	status = acpi_remove_notify_handler(ehotk->handle, ACPI_SYSTEM_NOTIFY,
++					    eeepc_hotk_notify);
++	if (ACPI_FAILURE(status))
++		printk(EEEPC_ERR "Error removing notify handler\n");
++	kfree(ehotk);
++	return 0;
++}
++
++static struct platform_driver platform_driver = {
++	.driver = {
++		.name = EEEPC_HOTK_FILE,
++		.owner = THIS_MODULE,
++	}
++};
++
++static struct platform_device *platform_device;
++
++static void __exit eeepc_hotk_exit(void)
++{
++	acpi_bus_unregister_driver(&eeepc_hotk_driver);
++	sysfs_remove_group(&platform_device->dev.kobj,
++			   &platform_attribute_group);
++	platform_device_unregister(platform_device);
++	platform_driver_unregister(&platform_driver);
++}
++
++static int __init eeepc_hotk_init(void)
++{
++	struct device *dev;
++	int result;
++
++	if (acpi_disabled)
++		return -ENODEV;
++	init_flag = DISABLE_ASL_WLAN | DISABLE_ASL_DISPLAYSWITCH;
++	result = acpi_bus_register_driver(&eeepc_hotk_driver);
++	if (result < 0)
++		return result;
++	if (!ehotk_found) {
++		acpi_bus_unregister_driver(&eeepc_hotk_driver);
++		return -ENODEV;
++	}
++	dev = acpi_get_physical_device(ehotk->device->handle);
++	/* Register platform stuff */
++	result = platform_driver_register(&platform_driver);
++	if (result)
++		goto fail_platform_driver;
++	platform_device = platform_device_alloc(EEEPC_HOTK_FILE, -1);
++	if (!platform_device) {
++		result = -ENOMEM;
++		goto fail_platform_device1;
++	}
++	result = platform_device_add(platform_device);
++	if (result)
++		goto fail_platform_device2;
++	result = sysfs_create_group(&platform_device->dev.kobj,
++				    &platform_attribute_group);
++	if (result)
++		goto fail_sysfs;
++	return 0;
++ fail_sysfs:
++	platform_device_del(platform_device);
++ fail_platform_device2:
++	platform_device_put(platform_device);
++ fail_platform_device1:
++	platform_driver_unregister(&platform_driver);
++ fail_platform_driver:
++	return result;
++}
++
++module_init(eeepc_hotk_init);
++module_exit(eeepc_hotk_exit);

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Wed Apr 16 11:12:07 2008
@@ -39,3 +39,4 @@
 + bugfix/all/rtc-x1205-new-style-conversion-checkpatch-fixes.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch
 + features/all/firewire-git.patch
++ features/all/acpi-eeepc-hotkey.patch

More information about the Kernel-svn-changes mailing list