Menu
▾
▴
mactel-linux-devel
|
From: <nbo...@us...> - 2007-03-24 18:06:49
|
Revision: 94
http://svn.sourceforge.net/mactel-linux/?rev=94&view=rev
Author: nboichat
Date: 2007-03-24 11:06:03 -0700 (Sat, 24 Mar 2007)
Log Message:
-----------
/home/nicolas/dev/apple/mactel-linux/kernel/svn-commit.3.tmp
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.20/unapply
Added Paths:
-----------
trunk/kernel/mactel-patches-2.6.20/0001-coretemp.patch
trunk/kernel/mactel-patches-2.6.20/0002-applesmc.patch
trunk/kernel/mactel-patches-2.6.20/0003-applesmc_joydev.patch
trunk/kernel/mactel-patches-2.6.20/0004-appletouch.patch
trunk/kernel/mactel-patches-2.6.20/0005-sigmatel_audio.patch
trunk/kernel/mactel-patches-2.6.20/0006-appleir.patch
trunk/kernel/mactel-patches-2.6.20/0007-usbhid.patch
Removed Paths:
-------------
trunk/kernel/mactel-patches-2.6.20/applesmc.patch
trunk/kernel/mactel-patches-2.6.20/appletouch.patch
trunk/kernel/mactel-patches-2.6.20/coretemp.patch
trunk/kernel/mactel-patches-2.6.20/mouseemu.patch
trunk/kernel/mactel-patches-2.6.20/sigmatel_audio.patch
trunk/kernel/mactel-patches-2.6.20/usb-storage-zerowait.patch
trunk/kernel/mactel-patches-2.6.20/usbhid.patch
Added: trunk/kernel/mactel-patches-2.6.20/0001-coretemp.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.20/0001-coretemp.patch (rev 0)
+++ trunk/kernel/mactel-patches-2.6.20/0001-coretemp.patch 2007-03-24 18:06:03 UTC (rev 94)
@@ -0,0 +1,589 @@
+Intel Core CPU temperature monitor driver.
+
+From: lm-sensors mailing list <?>
+
+
+---
+
+ arch/i386/kernel/msr.c | 31 ++--
+ drivers/hwmon/Kconfig | 9 +
+ drivers/hwmon/Makefile | 1
+ drivers/hwmon/coretemp.c | 400 ++++++++++++++++++++++++++++++++++++++++++++++
+ include/asm-i386/msr.h | 3
+ include/asm-x86_64/msr.h | 3
+ 6 files changed, 432 insertions(+), 15 deletions(-)
+
+diff --git a/arch/i386/kernel/msr.c b/arch/i386/kernel/msr.c
+index 4a472a1..9efc31c 100644
+--- a/arch/i386/kernel/msr.c
++++ b/arch/i386/kernel/msr.c
+@@ -90,7 +90,7 @@ static void msr_smp_rdmsr(void *cmd_block)
+ cmd->err = rdmsr_eio(cmd->reg, &cmd->data[0], &cmd->data[1]);
+ }
+
+-static inline int do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
++int msr_write(int cpu, u32 reg, u32 eax, u32 edx)
+ {
+ struct msr_command cmd;
+ int ret;
+@@ -111,7 +111,7 @@ static inline int do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
+ return ret;
+ }
+
+-static inline int do_rdmsr(int cpu, u32 reg, u32 * eax, u32 * edx)
++int msr_read(int cpu, u32 reg, u32 * eax, u32 * edx)
+ {
+ struct msr_command cmd;
+ int ret;
+@@ -136,19 +136,22 @@ static inline int do_rdmsr(int cpu, u32 reg, u32 * eax, u32 * edx)
+
+ #else /* ! CONFIG_SMP */
+
+-static inline int do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
++int msr_write(int cpu, u32 reg, u32 eax, u32 edx)
+ {
+ return wrmsr_eio(reg, eax, edx);
+ }
+
+-static inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
++int msr_read(int cpu, u32 reg, u32 *eax, u32 *edx)
+ {
+ return rdmsr_eio(reg, eax, edx);
+ }
+
+ #endif /* ! CONFIG_SMP */
+
+-static loff_t msr_seek(struct file *file, loff_t offset, int orig)
++EXPORT_SYMBOL_GPL(msr_write);
++EXPORT_SYMBOL_GPL(msr_read);
++
++static loff_t msr_fseek(struct file *file, loff_t offset, int orig)
+ {
+ loff_t ret = -EINVAL;
+
+@@ -166,7 +169,7 @@ static loff_t msr_seek(struct file *file, loff_t offset, int orig)
+ return ret;
+ }
+
+-static ssize_t msr_read(struct file *file, char __user * buf,
++static ssize_t msr_fread(struct file *file, char __user * buf,
+ size_t count, loff_t * ppos)
+ {
+ u32 __user *tmp = (u32 __user *) buf;
+@@ -179,7 +182,7 @@ static ssize_t msr_read(struct file *file, char __user * buf,
+ return -EINVAL; /* Invalid chunk size */
+
+ for (; count; count -= 8) {
+- err = do_rdmsr(cpu, reg, &data[0], &data[1]);
++ err = msr_read(cpu, reg, &data[0], &data[1]);
+ if (err)
+ return err;
+ if (copy_to_user(tmp, &data, 8))
+@@ -190,7 +193,7 @@ static ssize_t msr_read(struct file *file, char __user * buf,
+ return ((char __user *)tmp) - buf;
+ }
+
+-static ssize_t msr_write(struct file *file, const char __user *buf,
++static ssize_t msr_fwrite(struct file *file, const char __user *buf,
+ size_t count, loff_t *ppos)
+ {
+ const u32 __user *tmp = (const u32 __user *)buf;
+@@ -205,7 +208,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
+ for (; count; count -= 8) {
+ if (copy_from_user(&data, tmp, 8))
+ return -EFAULT;
+- err = do_wrmsr(cpu, reg, data[0], data[1]);
++ err = msr_write(cpu, reg, data[0], data[1]);
+ if (err)
+ return err;
+ tmp += 2;
+@@ -214,7 +217,7 @@ static ssize_t msr_write(struct file *file, const char __user *buf,
+ return ((char __user *)tmp) - buf;
+ }
+
+-static int msr_open(struct inode *inode, struct file *file)
++static int msr_fopen(struct inode *inode, struct file *file)
+ {
+ unsigned int cpu = iminor(file->f_path.dentry->d_inode);
+ struct cpuinfo_x86 *c = &(cpu_data)[cpu];
+@@ -232,10 +235,10 @@ static int msr_open(struct inode *inode, struct file *file)
+ */
+ static struct file_operations msr_fops = {
+ .owner = THIS_MODULE,
+- .llseek = msr_seek,
+- .read = msr_read,
+- .write = msr_write,
+- .open = msr_open,
++ .llseek = msr_fseek,
++ .read = msr_fread,
++ .write = msr_fwrite,
++ .open = msr_fopen,
+ };
+
+ static int msr_device_create(int i)
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 891ef6d..77f23ab 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -156,6 +156,15 @@ config SENSORS_ATXP1
+ This driver can also be built as a module. If so, the module
+ will be called atxp1.
+
++config SENSORS_CORETEMP
++ tristate "Intel Core (2) Duo/Solo temperature sensor"
++ depends on HWMON && X86 && EXPERIMENTAL
++ select X86_MSR
++ help
++ If you say yes here you get support for the temperature
++ sensor inside your CPU. Supported all are all known variants
++ of Intel Core family.
++
+ config SENSORS_DS1621
+ tristate "Dallas Semiconductor DS1621 and DS1625"
+ depends on HWMON && I2C
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 3166112..65d5cb8 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -21,6 +21,7 @@ obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o
+ obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o
+ obj-$(CONFIG_SENSORS_AMS) += ams/
+ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
++obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
+ obj-$(CONFIG_SENSORS_DS1621) += ds1621.o
+ obj-$(CONFIG_SENSORS_F71805F) += f71805f.o
+ obj-$(CONFIG_SENSORS_FSCHER) += fscher.o
+diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
+new file mode 100644
+index 0000000..f139b41
+--- /dev/null
++++ b/drivers/hwmon/coretemp.c
+@@ -0,0 +1,400 @@
++/*
++ * coretemp.c - Linux kernel module for hardware monitoring
++ *
++ * Copyright (C) 2006 Rudolf Marek <r....@as...>
++ *
++ * Inspired from many hwmon drivers
++ *
++ * 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.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++ * 02110-1301 USA.
++ */
++
++#include <linux/module.h>
++#include <linux/delay.h>
++#include <linux/init.h>
++#include <linux/slab.h>
++#include <linux/jiffies.h>
++#include <linux/hwmon.h>
++#include <linux/sysfs.h>
++#include <linux/hwmon-sysfs.h>
++#include <linux/err.h>
++#include <linux/mutex.h>
++#include <linux/list.h>
++#include <linux/platform_device.h>
++#include <asm/msr.h>
++#include <linux/cpu.h>
++
++#define DRVNAME "coretemp"
++
++typedef enum { SHOW_TEMP, SHOW_TJMAX, SHOW_LABEL, SHOW_NAME } SHOW;
++
++/*
++ * Functions declaration
++ */
++
++static struct coretemp_data *coretemp_update_device(struct device *dev);
++
++struct coretemp_data {
++ struct class_device *class_dev;
++ struct mutex update_lock;
++ const char *name;
++ u32 id;
++ char valid; /* zero until following fields are valid */
++ unsigned long last_updated; /* in jiffies */
++ int temp;
++ int tjmax;
++ /* registers values */
++ u32 therm_status;
++};
++
++static struct coretemp_data *coretemp_update_device(struct device *dev);
++
++/*
++ * Sysfs stuff
++ */
++
++
++static ssize_t show_name(struct device *dev, struct device_attribute
++ *devattr, char *buf)
++{
++ int ret;
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++ struct coretemp_data *data = dev_get_drvdata(dev);
++
++ if (attr->index == SHOW_NAME)
++ ret = sprintf(buf, "%s\n", data->name);
++ else /* show label */
++ ret = sprintf(buf, "Core %d\n", data->id);
++ return ret;
++}
++
++static ssize_t show_alarm(struct device *dev, struct device_attribute
++ *devattr, char *buf)
++{
++ struct coretemp_data *data = coretemp_update_device(dev);
++ /* read the Out-of-spec log, never clear */
++ return sprintf(buf, "%d\n", (data->therm_status >> 5) & 1);
++}
++
++static ssize_t show_temp(struct device *dev,
++ struct device_attribute *devattr, char *buf)
++{
++ struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
++ struct coretemp_data *data = coretemp_update_device(dev);
++ return sprintf(buf, "%d\n",
++ attr->index ==
++ SHOW_TEMP ? data->temp : data->tjmax);
++}
++
++static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL,
++ SHOW_TEMP);
++static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, show_temp, NULL,
++ SHOW_TJMAX);
++static DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, show_alarm, NULL);
++static SENSOR_DEVICE_ATTR(temp1_label, S_IRUGO, show_name, NULL, SHOW_LABEL);
++static SENSOR_DEVICE_ATTR(name, S_IRUGO, show_name, NULL, SHOW_NAME);
++
++static struct attribute *coretemp_attributes[] = {
++ &sensor_dev_attr_name.dev_attr.attr,
++ &sensor_dev_attr_temp1_label.dev_attr.attr,
++ &dev_attr_temp1_crit_alarm.attr,
++ &sensor_dev_attr_temp1_input.dev_attr.attr,
++ &sensor_dev_attr_temp1_crit.dev_attr.attr,
++ NULL
++};
++
++static const struct attribute_group coretemp_group = {
++ .attrs = coretemp_attributes,
++};
++
++static struct coretemp_data *coretemp_update_device(struct device *dev)
++{
++ struct coretemp_data *data = dev_get_drvdata(dev);
++
++ mutex_lock(&data->update_lock);
++
++ if (!data->valid || time_after(jiffies, data->last_updated + HZ)) {
++ u32 eax, edx;
++
++ data->valid = 0;
++ msr_read(data->id, MSR_IA32_THERM_STATUS, &eax, &edx);
++ data->therm_status = eax;
++
++ /* update only if data has been valid */
++ if (eax & 0x80000000) {
++ data->temp = data->tjmax - (((data->therm_status >> 16)
++ & 0x7f) * 1000);
++ data->valid = 1;
++ }
++ data->last_updated = jiffies;
++ }
++
++ mutex_unlock(&data->update_lock);
++ return data;
++}
++
++static int __devinit coretemp_probe(struct platform_device *pdev)
++{
++ struct coretemp_data *data;
++ struct cpuinfo_x86 *c = &(cpu_data)[pdev->id];
++ int err;
++ u32 eax, edx;
++
++ if (!(data = kzalloc(sizeof(struct coretemp_data), GFP_KERNEL))) {
++ err = -ENOMEM;
++ dev_err(&pdev->dev, "Out of memory\n");
++ goto exit;
++ }
++
++ data->id = pdev->id;
++ data->name = "coretemp";
++ mutex_init(&data->update_lock);
++ /* Tjmax default is 100C */
++ data->tjmax = 100000;
++
++ /* Some processors have Tjmax 85 following magic should detect it */
++ /* family is always 0x6 */
++
++ if (((c->x86_model == 0xf) && (c->x86_mask > 3 )) ||
++ (c->x86_model == 0xe)) {
++
++ err = msr_read(data->id, 0xee, &eax, &edx);
++ if (err) {
++ dev_warn(&pdev->dev,
++ "Unable to access MSR 0xEE, Tjmax left at %d\n",
++ data->tjmax);
++ } else if (eax & 0x40000000) {
++ data->tjmax = 85000;
++ }
++ }
++
++ /* test if we can access the THERM_STATUS MSR */
++ err = msr_read(data->id, MSR_IA32_THERM_STATUS, &eax, &edx);
++
++ if (err) {
++ dev_err(&pdev->dev,
++ "Unable to access THERM_STATUS MSR, giving up\n");
++ goto exit_free;
++ }
++ platform_set_drvdata(pdev, data);
++
++ if ((err = sysfs_create_group(&pdev->dev.kobj, &coretemp_group)))
++ goto exit_free;
++
++ data->class_dev = hwmon_device_register(&pdev->dev);
++ if (IS_ERR(data->class_dev)) {
++ err = PTR_ERR(data->class_dev);
++ dev_err(&pdev->dev, "Class registration failed (%d)\n",
++ err);
++ goto exit_class;
++ }
++
++ return 0;
++
++exit_class:
++ sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
++exit_free:
++ kfree(data);
++exit:
++ return err;
++}
++
++static int __devexit coretemp_remove(struct platform_device *pdev)
++{
++ struct coretemp_data *data = platform_get_drvdata(pdev);
++
++ hwmon_device_unregister(data->class_dev);
++ sysfs_remove_group(&pdev->dev.kobj, &coretemp_group);
++ platform_set_drvdata(pdev, NULL);
++ kfree(data);
++ return 0;
++}
++
++static struct platform_driver coretemp_driver = {
++ .driver = {
++ .owner = THIS_MODULE,
++ .name = DRVNAME,
++ },
++ .probe = coretemp_probe,
++ .remove = __devexit_p(coretemp_remove),
++};
++
++struct pdev_entry {
++ struct list_head list;
++ struct platform_device *pdev;
++ unsigned int cpu;
++};
++
++static LIST_HEAD(pdev_list);
++static DEFINE_MUTEX(pdev_list_mutex);
++
++static int __cpuinit coretemp_devices_add(unsigned int cpu)
++{
++ int err;
++ struct platform_device *pdev;
++ struct pdev_entry *pdev_entry;
++
++ pdev = platform_device_alloc(DRVNAME, cpu);
++ if (!pdev) {
++ err = -ENOMEM;
++ printk(KERN_ERR DRVNAME ": Device allocation failed\n");
++ goto exit;
++
++ }
++
++ pdev_entry = kzalloc(sizeof(struct pdev_entry), GFP_KERNEL);
++
++ if (!pdev_entry) {
++ err = -ENOMEM;
++ goto exit_device_put;
++ }
++
++ err = platform_device_add(pdev);
++
++ if (err) {
++ printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
++ err);
++ goto exit_device_free;
++ }
++
++ pdev_entry->pdev = pdev;
++ pdev_entry->cpu = cpu;
++ mutex_lock(&pdev_list_mutex);
++ list_add_tail(&pdev_entry->list, &pdev_list);
++ mutex_unlock(&pdev_list_mutex);
++
++ return 0;
++
++exit_device_free:
++ kfree(pdev_entry);
++exit_device_put:
++ platform_device_put(pdev);
++exit:
++ return err;
++}
++
++#ifdef CONFIG_HOTPLUG_CPU
++void coretemp_devices_remove(unsigned int cpu)
++{
++ struct pdev_entry *p, *n;
++ mutex_lock(&pdev_list_mutex);
++ list_for_each_entry_safe(p, n, &pdev_list, list) {
++ if (p->cpu == cpu) {
++ platform_device_unregister(p->pdev);
++ list_del(&p->list);
++ kfree(p);
++ }
++ }
++ mutex_unlock(&pdev_list_mutex);
++}
++
++static int coretemp_cpu_callback(struct notifier_block *nfb,
++ unsigned long action, void *hcpu)
++{
++ unsigned int cpu = (unsigned long) hcpu;
++
++ switch (action) {
++ case CPU_ONLINE:
++ coretemp_devices_add(cpu);
++ break;
++ case CPU_DEAD:
++ coretemp_devices_remove(cpu);
++ break;
++ }
++ return NOTIFY_OK;
++}
++
++static struct notifier_block __cpuinitdata coretemp_cpu_notifier = {
++ .notifier_call = coretemp_cpu_callback,
++};
++#endif /* !CONFIG_HOTPLUG_CPU */
++
++static int __init coretemp_init(void)
++{
++ int i, err = -ENODEV;
++ struct pdev_entry *p, *n;
++
++ if (current_cpu_data.x86_vendor != X86_VENDOR_INTEL)
++ goto exit;
++
++ err = platform_driver_register(&coretemp_driver);
++ if (err)
++ goto exit;
++
++ for_each_online_cpu(i) {
++ struct cpuinfo_x86 *c = &(cpu_data)[i];
++
++ /* check if family 6, models e, f */
++ if ((c->cpuid_level < 0) || (c->x86 != 0x6) ||
++ !((c->x86_model == 0xe) || (c->x86_model == 0xf))) {
++
++ /* supported CPU not found, but report the unknown
++ family 6 CPU */
++ if ((c->x86 == 0x6) && (c->x86_model > 0xf))
++ printk(KERN_WARNING DRVNAME ": Unknown CPU, please"
++ " report to the lm-...@lm...\n");
++ continue;
++ }
++
++ err = coretemp_devices_add(i);
++ if (err)
++ goto exit_driver;
++ }
++ if (list_empty(&pdev_list)) {
++ err = -ENODEV;
++ goto exit_driver_unreg;
++ }
++
++#ifdef CONFIG_HOTPLUG_CPU
++ register_hotcpu_notifier(&coretemp_cpu_notifier);
++#endif
++ return 0;
++
++exit_driver:
++ mutex_lock(&pdev_list_mutex);
++ list_for_each_entry_safe(p, n, &pdev_list, list) {
++ platform_device_unregister(p->pdev);
++ list_del(&p->list);
++ kfree(p);
++ }
++ mutex_unlock(&pdev_list_mutex);
++exit_driver_unreg:
++ platform_driver_unregister(&coretemp_driver);
++exit:
++ return err;
++}
++
++static void __exit coretemp_exit(void)
++{
++ struct pdev_entry *p, *n;
++#ifdef CONFIG_HOTPLUG_CPU
++ unregister_hotcpu_notifier(&coretemp_cpu_notifier);
++#endif
++ mutex_lock(&pdev_list_mutex);
++ list_for_each_entry_safe(p, n, &pdev_list, list) {
++ platform_device_unregister(p->pdev);
++ list_del(&p->list);
++ kfree(p);
++ }
++ mutex_unlock(&pdev_list_mutex);
++ platform_driver_unregister(&coretemp_driver);
++}
++
++MODULE_AUTHOR("Rudolf Marek <r....@as...>");
++MODULE_DESCRIPTION("Intel Core temperature monitor");
++MODULE_LICENSE("GPL");
++
++module_init(coretemp_init)
++module_exit(coretemp_exit)
+diff --git a/include/asm-i386/msr.h b/include/asm-i386/msr.h
+index 609a389..c8962f7 100644
+--- a/include/asm-i386/msr.h
++++ b/include/asm-i386/msr.h
+@@ -83,6 +83,9 @@ static inline void wrmsrl (unsigned long msr, unsigned long long val)
+ : "c" (counter))
+ #endif /* !CONFIG_PARAVIRT */
+
++int msr_write(int cpu, u32 reg, u32 eax, u32 edx);
++int msr_read(int cpu, u32 reg, u32 *eax, u32 *edx);
++
+ /* symbolic names for some interesting MSRs */
+ /* Intel defined MSRs. */
+ #define MSR_IA32_P5_MC_ADDR 0
+diff --git a/include/asm-x86_64/msr.h b/include/asm-x86_64/msr.h
+index 3227bc9..e3f74e1 100644
+--- a/include/asm-x86_64/msr.h
++++ b/include/asm-x86_64/msr.h
+@@ -160,7 +160,8 @@ static inline unsigned int cpuid_edx(unsigned int op)
+ #define MSR_IA32_UCODE_WRITE 0x79
+ #define MSR_IA32_UCODE_REV 0x8b
+
+-
++int msr_write(int cpu, u32 reg, u32 eax, u32 edx);
++int msr_read(int cpu, u32 reg, u32 *eax, u32 *edx);
+ #endif
+
+ /* AMD/K8 specific MSRs */
Added: trunk/kernel/mactel-patches-2.6.20/0002-applesmc.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.20/0002-applesmc.patch (rev 0)
+++ trunk/kernel/mactel-patches-2.6.20/0002-applesmc.patch 2007-03-24 18:06:03 UTC (rev 94)
@@ -0,0 +1,1000 @@
+This driver provides support for the Apple System Management Controller, which provides an accelerometer (Apple Sudden Motion Sensor), light sensors, temperature sensors, keyboard backlight control and fan control. Only Intel-based Apple's computers are supported (MacBook Pro, MacBook, MacMini).
+
+From: Nicolas Boichat <ni...@bo...>
+
+
+---
+
+ MAINTAINERS | 6
+ drivers/hwmon/Kconfig | 24 +
+ drivers/hwmon/Makefile | 1
+ drivers/hwmon/applesmc.c | 917 ++++++++++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 948 insertions(+), 0 deletions(-)
+
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 0ad8803..c1bed51 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -354,6 +354,12 @@ L: lin...@vg...
+ W: http://www.canb.auug.org.au/~sfr/
+ S: Supported
+
++APPLE SMC DRIVER
++P: Nicolas Boichat
++M: ni...@bo...
++L: mac...@li...
++S: Maintained
++
+ APPLETALK NETWORK LAYER
+ P: Arnaldo Carvalho de Melo
+ M: ac...@co...
+diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
+index 77f23ab..8c8c804 100644
+--- a/drivers/hwmon/Kconfig
++++ b/drivers/hwmon/Kconfig
+@@ -591,6 +591,30 @@ config SENSORS_HDAPS
+ Say Y here if you have an applicable laptop and want to experience
+ the awesome power of hdaps.
+
++config SENSORS_APPLESMC
++ tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)"
++ depends on HWMON && INPUT && X86
++ select NEW_LEDS
++ select LEDS_CLASS
++ default n
++ help
++ This driver provides support for the Apple System Management
++ Controller, which provides an accelerometer (Apple Sudden Motion
++ Sensor), light sensors, temperature sensors, keyboard backlight
++ control and fan control.
++
++ Only Intel-based Apple's computers are supported (MacBook Pro,
++ MacBook, MacMini).
++
++ Data from the different sensors, keyboard backlight control and fan
++ control are accessible via sysfs.
++
++ This driver also provides an absolute input class device, allowing
++ the laptop to act as a pinball machine-esque joystick.
++
++ Say Y here if you have an applicable laptop and want to experience
++ the awesome power of applesmc.
++
+ config HWMON_DEBUG_CHIP
+ bool "Hardware Monitoring Chip debugging messages"
+ depends on HWMON
+diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile
+index 65d5cb8..9c3c52d 100644
+--- a/drivers/hwmon/Makefile
++++ b/drivers/hwmon/Makefile
+@@ -19,6 +19,7 @@ obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o
+ obj-$(CONFIG_SENSORS_ADM1026) += adm1026.o
+ obj-$(CONFIG_SENSORS_ADM1031) += adm1031.o
+ obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o
++obj-$(CONFIG_SENSORS_APPLESMC) += applesmc.o
+ obj-$(CONFIG_SENSORS_AMS) += ams/
+ obj-$(CONFIG_SENSORS_ATXP1) += atxp1.o
+ obj-$(CONFIG_SENSORS_CORETEMP) += coretemp.o
+diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
+new file mode 100644
+index 0000000..4060667
+--- /dev/null
++++ b/drivers/hwmon/applesmc.c
+@@ -0,0 +1,917 @@
++/*
++ * drivers/hwmon/applesmc.c - driver for Apple's SMC (accelerometer, temperature
++ * sensors, fan control, keyboard backlight control) used in Intel-based Apple
++ * computers.
++ *
++ * Copyright (C) 2007 Nicolas Boichat <ni...@bo...>
++ *
++ * Based on hdaps.c driver:
++ * Copyright (C) 2005 Robert Love <rm...@no...>
++ * Copyright (C) 2005 Jesper Juhl <jes...@gm...>
++ *
++ * Fan control based on smcFanControl:
++ * Copyright (C) 2006 Hendrik Holtmann <hol...@ma...>
++ *
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License v2 as published by the
++ * Free Software Foundation.
++ *
++ * 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.
++ *
++ * You should have received a copy of the GNU General Public License along with
++ * this program; if not, write to the Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
++ */
++
++#include <linux/delay.h>
++#include <linux/platform_device.h>
++#include <linux/input.h>
++#include <linux/kernel.h>
++#include <linux/module.h>
++#include <linux/timer.h>
++#include <linux/dmi.h>
++#include <linux/mutex.h>
++#include <linux/hwmon-sysfs.h>
++#include <asm/io.h>
++#include <linux/leds.h>
++
++/* data port used by apple SMC */
++#define APPLESMC_DATA_PORT 0x300
++/* command/status port used by apple SMC */
++#define APPLESMC_CMD_PORT 0x304
++
++#define APPLESMC_NR_PORTS 5 /* 0x300-0x304 */
++
++#define APPLESMC_STATUS_MASK 0x0f
++#define APPLESMC_READ_CMD 0x10
++#define APPLESMC_WRITE_CMD 0x11
++
++#define LIGHT_SENSOR_LEFT_KEY "ALV0" /* r-o length 6 */
++#define LIGHT_SENSOR_RIGHT_KEY "ALV1" /* r-o length 6 */
++#define BACKLIGHT_KEY "LKSB" /* w-o */
++
++#define CLAMSHELL_KEY "MSLD" /* r-o length 1 (unused) */
++
++#define MOTION_SENSOR_X_KEY "MO_X" /* r-o length 2 */
++#define MOTION_SENSOR_Y_KEY "MO_Y" /* r-o length 2 */
++#define MOTION_SENSOR_Z_KEY "MO_Z" /* r-o length 2 */
++#define MOTION_SENSOR_KEY "MOCN" /* r/w length 2 */
++
++#define FANS_COUNT "FNum" /* r-o length 1 */
++#define FANS_MANUAL "FS! " /* r-w length 2 */
++#define FAN_ACTUAL_SPEED "F0Ac" /* r-o length 2 */
++#define FAN_MIN_SPEED "F0Mn" /* r-o length 2 */
++#define FAN_MAX_SPEED "F0Mx" /* r-o length 2 */
++#define FAN_SAFE_SPEED "F0Sf" /* r-o length 2 */
++#define FAN_TARGET_SPEED "F0Tg" /* r-w length 2 */
++
++/* Temperature sensors keys. First set for Macbook(Pro), second for Macmini */
++static const char* temperature_sensors_sets[][8] = {
++ { "TB0T", "TC0D", "TC0P", "Th0H", "Ts0P", "Th1H", "Ts1P", NULL },
++ { "TC0D", "TC0P", NULL }
++};
++
++/* List of keys used to read/write fan speeds */
++static const char* fan_speed_keys[] = {
++ FAN_ACTUAL_SPEED,
++ FAN_MIN_SPEED,
++ FAN_MAX_SPEED,
++ FAN_SAFE_SPEED,
++ FAN_TARGET_SPEED
++};
++
++#define INIT_TIMEOUT_MSECS 5000 /* wait up to 5s for device init ... */
++#define INIT_WAIT_MSECS 50 /* ... in 50ms increments */
++
++#define APPLESMC_POLL_PERIOD (HZ/20) /* poll for input every 1/20s */
++#define APPLESMC_INPUT_FUZZ 4 /* input event threshold */
++#define APPLESMC_INPUT_FLAT 4
++
++#define SENSOR_X 0
++#define SENSOR_Y 1
++#define SENSOR_Z 2
++
++/* Structure to be passed to DMI_MATCH function */
++struct dmi_match_data {
++/* Indicates whether this computer has an accelerometer. */
++ int accelerometer;
++/* Indicates whether this computer has light sensors and keyboard backlight. */
++ int light;
++/* Indicates which temperature sensors set to use. */
++ int temperature_set;
++};
++
++static int debug = 0;
++static struct platform_device *pdev;
++static s16 rest_x;
++static s16 rest_y;
++static struct timer_list applesmc_timer;
++static struct input_dev *applesmc_idev;
++
++/* Indicates whether this computer has an accelerometer. */
++static unsigned int applesmc_accelerometer;
++
++/* Indicates whether this computer has light sensors and keyboard backlight. */
++static unsigned int applesmc_light;
++
++/* Indicates which temperature sensors set to use. */
++static unsigned int applesmc_temperature_set;
++
++static struct mutex applesmc_lock;
++
++/*
++ * __wait_status - Wait up to 100ms for the status port to get a certain value
++ * (masked with 0x0f), returning zero if the value is obtained. Callers must
++ * hold applesmc_lock.
++ */
++static int __wait_status(u8 val)
++{
++ unsigned int i;
++
++ val = val & APPLESMC_STATUS_MASK;
++
++ for (i = 0; i < 10000; i++) {
++ if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val)
++ return 0;
++ udelay(10);
++ }
++
++ printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
++ val, inb(APPLESMC_CMD_PORT));
++
++ return -EIO;
++}
++
++/*
++ * applesmc_read_key - reads len bytes from a given key, and put them in buffer.
++ * Returns zero on success or a negative error on failure. Callers must
++ * hold applesmc_lock.
++ */
++static int applesmc_read_key(const char* key, u8* buffer, u8 len)
++{
++ int ret = -EIO;
++ int i;
++
++ outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
++ if (__wait_status(0x0c))
++ goto out;
++
++ for (i = 0; i < 4; i++) {
++ outb(key[i], APPLESMC_DATA_PORT);
++ if (__wait_status(0x04))
++ goto out;
++ }
++ if (debug)
++ printk(KERN_DEBUG "<%s", key);
++
++ outb(len, APPLESMC_DATA_PORT);
++ if (debug)
++ printk(KERN_DEBUG ">%x", len);
++
++ for (i = 0; i < len; i++) {
++ if (__wait_status(0x05))
++ goto out;
++ buffer[i] = inb(APPLESMC_DATA_PORT);
++ if (debug)
++ printk(KERN_DEBUG "<%x", buffer[i]);
++ }
++ if (debug)
++ printk(KERN_DEBUG "\n");
++
++ ret = 0;
++
++out:
++ return ret;
++}
++
++/*
++ * applesmc_write_key - writes len bytes from buffer to a given key.
++ * Returns zero on success or a negative error on failure. Callers must
++ * hold applesmc_lock.
++ */
++static int applesmc_write_key(const char* key, u8* buffer, u8 len)
++{
++ int ret = -EIO;
++ int i;
++
++ outb(APPLESMC_WRITE_CMD, APPLESMC_CMD_PORT);
++ if (__wait_status(0x0c))
++ goto out;
++
++ for (i = 0; i < 4; i++) {
++ outb(key[i], APPLESMC_DATA_PORT);
++ if (__wait_status(0x04))
++ goto out;
++ }
++
++ outb(len, APPLESMC_DATA_PORT);
++
++ for (i = 0; i < len; i++) {
++ if (__wait_status(0x04))
++ goto out;
++ outb(buffer[i], APPLESMC_DATA_PORT);
++ }
++
++ ret = 0;
++out:
++ return ret;
++}
++
++/*
++ * applesmc_read_motion_sensor - Read motion sensor (X, Y or Z). Callers must
++ * hold applesmc_lock.
++ */
++static int applesmc_read_motion_sensor(int index, s16* value)
++{
++ u8 buffer[2];
++ int ret;
++
++ switch (index) {
++ case SENSOR_X:
++ ret = applesmc_read_key(MOTION_SENSOR_X_KEY, buffer, 2);
++ break;
++ case SENSOR_Y:
++ ret = applesmc_read_key(MOTION_SENSOR_Y_KEY, buffer, 2);
++ break;
++ case SENSOR_Z:
++ ret = applesmc_read_key(MOTION_SENSOR_Z_KEY, buffer, 2);
++ break;
++ default:
++ ret = -EINVAL;
++ }
++
++ *value = ((s16)buffer[0] << 8) | buffer[1];
++
++ return ret;
++}
++
++/*
++ * applesmc_device_init - initialize the accelerometer. Returns zero on success
++ * and negative error code on failure. Can sleep.
++ */
++static int applesmc_device_init(void)
++{
++ int total, ret = -ENXIO;
++ u8 buffer[2];
++
++ if (!applesmc_accelerometer)
++ return 0;
++
++ mutex_lock(&applesmc_lock);
++
++ for (total = INIT_TIMEOUT_MSECS; total > 0; total -= INIT_WAIT_MSECS) {
++ if (debug)
++ printk(KERN_DEBUG "applesmc try %d\n", total);
++ if (!applesmc_read_key(MOTION_SENSOR_KEY, buffer, 2) &&
++ (buffer[0] != 0x00 || buffer[1] != 0x00)) {
++ if (total == INIT_TIMEOUT_MSECS) {
++ printk(KERN_DEBUG "applesmc: device has"
++ " already been initialized"
++ " (0x%02x, 0x%02x).\n",
++ buffer[0], buffer[1]);
++ } else {
++ printk(KERN_DEBUG "applesmc: device"
++ " successfully initialized"
++ " (0x%02x, 0x%02x).\n",
++ buffer[0], buffer[1]);
++ }
++ ret = 0;
++ goto out;
++ }
++ buffer[0] = 0xe0;
++ buffer[1] = 0x00;
++ applesmc_write_key(MOTION_SENSOR_KEY, buffer, 2);
++ msleep(INIT_WAIT_MSECS);
++ }
++
++ printk(KERN_WARNING "applesmc: failed to init the device\n");
++
++out:
++ mutex_unlock(&applesmc_lock);
++ return ret;
++}
++
++/*
++ * applesmc_get_fan_count - get the number of fans. Callers must NOT hold
++ * applesmc_lock.
++ */
++static int applesmc_get_fan_count(void)
++{
++ int ret;
++ u8 buffer[1];
++
++ mutex_lock...
[truncated message content] |
|
From: <nbo...@us...> - 2007-04-03 04:32:40
|
Revision: 95
http://svn.sourceforge.net/mactel-linux/?rev=95&view=rev
Author: nboichat
Date: 2007-04-02 21:32:38 -0700 (Mon, 02 Apr 2007)
Log Message:
-----------
Update apply script to allow a patch to depend on another one.
Modified Paths:
--------------
trunk/kernel/mactel-patches-2.6.20/apply
trunk/kernel/mactel-patches-2.6.20/unapply
Modified: trunk/kernel/mactel-patches-2.6.20/apply
===================================================================
--- trunk/kernel/mactel-patches-2.6.20/apply 2007-03-24 18:06:03 UTC (rev 94)
+++ trunk/kernel/mactel-patches-2.6.20/apply 2007-04-03 04:32:38 UTC (rev 95)
@@ -7,21 +7,26 @@
WORK=$PWD
+APPLIED=""
+
cd $1
for i in `ls $WORK/*.patch`
do
patch -p1 --dry-run < $i > /dev/null
if [ "$?" != "0" ]; then
- echo "$i would not apply cleanly"
+ echo -n "$i" | sed -e "s/.*\/\(.*\)$/\1/"
+ echo " would not apply cleanly"
+ for j in $APPLIED
+ do
+ echo "$j" | sed -e "s/.*\/\(.*\)$/Reversing \1.../"
+ patch -s -R -p1 < $j
+ done
exit
fi
-done
-
-for i in `ls $WORK/*.patch`
-do
echo "$i" | sed -e "s/.*\/\(.*\)$/Applying \1.../"
- patch -p1 < $i
+ patch -s -p1 < $i
+ APPLIED="$i $APPLIED"
done
grep "^EXTRAVERSION *=.*-mactel$" Makefile > /dev/null
Modified: trunk/kernel/mactel-patches-2.6.20/unapply
===================================================================
--- trunk/kernel/mactel-patches-2.6.20/unapply 2007-03-24 18:06:03 UTC (rev 94)
+++ trunk/kernel/mactel-patches-2.6.20/unapply 2007-04-03 04:32:38 UTC (rev 95)
@@ -1,27 +1,32 @@
#!/bin/sh
if [ "$1" == "" ]; then
- echo "usage ./apply kerneldir"
+ echo "usage ./unapply kerneldir"
exit 0
fi
WORK=$PWD
+REVERSED=""
+
cd $1
for i in `ls -r $WORK/*.patch`
do
patch -R -p1 --dry-run < $i > /dev/null
if [ "$?" != "0" ]; then
- echo "$i would not unapply cleanly"
+ echo -n "$i" | sed -e "s/.*\/\(.*\)$/\1/"
+ echo " would not reverse cleanly"
+ for j in $REVERSED
+ do
+ echo "$j" | sed -e "s/.*\/\(.*\)$/Applying \1.../"
+ patch -s -p1 < $j
+ done
exit
fi
-done
-
-for i in `ls -r $WORK/*.patch`
-do
echo "$i" | sed -e "s/.*\/\(.*\)$/Reversing \1.../"
- patch -R -p1 < $i
+ patch -s -R -p1 < $i
+ REVERSED="$i $REVERSED"
done
echo "changing version in Makefile"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: Nicolas B. <ni...@bo...> - 2007-03-25 07:29:52
|
nbo...@us... wrote: > Revision: 94 > http://svn.sourceforge.net/mactel-linux/?rev=94&view=rev > Author: nboichat > Date: 2007-03-24 11:06:03 -0700 (Sat, 24 Mar 2007) > > Log Message: > ----------- > /home/nicolas/dev/apple/mactel-linux/kernel/svn-commit.3.tmp Was supposed to be: New patchset for 2.6.20.4. Please test. |
|
From: Michel <mi...@tu...> - 2007-03-26 07:20:18
|
On Sun, 2007-03-25 at 15:29 +0800, Nicolas Boichat wrote: > nbo...@us... wrote: > > Revision: 94 > > http://svn.sourceforge.net/mactel-linux/?rev=94&view=rev > > Author: nboichat > > Date: 2007-03-24 11:06:03 -0700 (Sat, 24 Mar 2007) > > > > Log Message: > > ----------- > > /home/nicolas/dev/apple/mactel-linux/kernel/svn-commit.3.tmp > > Was supposed to be: New patchset for 2.6.20.4. Please test. FWIW, SVN actually allows changing the log message afterwards (though I don't remember exactly how offhand - probably via some property). -- Earthling Michel Dänzer | http://tungstengraphics.com Libre software enthusiast | Debian, X and DRI developer |
|
From: Nicolas B. <ni...@bo...> - 2007-03-26 15:52:02
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Michel Dänzer wrote: > On Sun, 2007-03-25 at 15:29 +0800, Nicolas Boichat wrote: >> nbo...@us... wrote: >>> Revision: 94 >>> http://svn.sourceforge.net/mactel-linux/?rev=94&view=rev >>> Author: nboichat >>> Date: 2007-03-24 11:06:03 -0700 (Sat, 24 Mar 2007) >>> >>> Log Message: >>> ----------- >>> /home/nicolas/dev/apple/mactel-linux/kernel/svn-commit.3.tmp >> Was supposed to be: New patchset for 2.6.20.4. Please test. > > FWIW, SVN actually allows changing the log message afterwards (though I > don't remember exactly how offhand - probably via some property). I quickly googled about that, you're right, you can change the message, but it seems quite tricky, and I don't think I have enough rights on SourceForge SVN to do it. Thanks for the hint anyway. Nicolas -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGB+wB01ajQnpJXgERAqvVAJ44hgMFJLY6lys38dDadQezo6l/NgCfYwaO aLXQhjXCQPxO142Z5XK7XhU= =3v+h -----END PGP SIGNATURE----- |
Thanks for helping keep SourceForge clean.
X