[Mactel-linux-devel] SF.net SVN: mactel-linux: [140] trunk/kernel/mactel-patches-2.6.22

[<nbo...@us...>]

Revision: 140
          http://mactel-linux.svn.sourceforge.net/mactel-linux/?rev=140&view=rev
Author:   nboichat
Date:     2007-09-07 00:43:37 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
Update to 2.6.22.6.
AppleSMC: Retry when accessing keys, should fix some problems with monitoring applications.

Modified Paths:
--------------
    trunk/kernel/mactel-patches-2.6.22/series

Added Paths:
-----------
    trunk/kernel/mactel-patches-2.6.22/applesmc-retry-when-accessing-keys.patch

Added: trunk/kernel/mactel-patches-2.6.22/applesmc-retry-when-accessing-keys.patch
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/applesmc-retry-when-accessing-keys.patch	                        (rev 0)
+++ trunk/kernel/mactel-patches-2.6.22/applesmc-retry-when-accessing-keys.patch	2007-09-07 07:43:37 UTC (rev 140)
@@ -0,0 +1,115 @@
+Retry up to 200 ms when reading or writing keys.
+
+From: Nicolas Boichat <ni...@bo...>
+
+
+---
+
+ drivers/hwmon/applesmc.c |   69 +++++++++++++++++++++++++++++++---------------
+ 1 files changed, 47 insertions(+), 22 deletions(-)
+
+diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
+index 5d184a1..4451c9e 100644
+--- a/drivers/hwmon/applesmc.c
++++ b/drivers/hwmon/applesmc.c
+@@ -124,6 +124,9 @@ static const char* fan_speed_keys[] = {
+ #define INIT_TIMEOUT_MSECS	5000	/* wait up to 5s for device init ... */
+ #define INIT_WAIT_MSECS		50	/* ... in 50ms increments */
+ 
++#define ACCESS_TIMEOUT_MSECS	500	/* wait up to 500ms when accessing a key */
++#define ACCESS_WAIT_MSECS	5	/* ... in 5ms increments */
++
+ #define APPLESMC_POLL_INTERVAL	50	/* msecs */
+ #define APPLESMC_INPUT_FUZZ	4	/* input event threshold */
+ #define APPLESMC_INPUT_FLAT	4
+@@ -198,12 +201,13 @@ static int __wait_status(u8 val)
+ 
+ /*
+  * applesmc_read_key - reads len bytes from a given key, and put them in buffer.
++ * Tries up to ACCESS_WAIT_MSECS to read the value.
+  * 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 i;
++	int i, total, ret;
+ 
+ 	if (len > APPLESMC_MAX_DATA_LENGTH) {
+ 		printk(KERN_ERR	"applesmc_read_key: cannot read more than "
+@@ -211,33 +215,54 @@ static int applesmc_read_key(const char* key, u8* buffer, u8 len)
+ 		return -EINVAL;
+ 	}
+ 
+-	outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
+-	if (__wait_status(0x0c))
+-		return -EIO;
++	for (total = ACCESS_TIMEOUT_MSECS; total > 0;
++						total -= ACCESS_WAIT_MSECS) {
++		ret = 0;
++		outb(APPLESMC_READ_CMD, APPLESMC_CMD_PORT);
++		if (__wait_status(0x0c)) {
++			ret = -EIO;
++			goto wait_fail;
++		}
+ 
+-	for (i = 0; i < 4; i++) {
+-		outb(key[i], APPLESMC_DATA_PORT);
+-		if (__wait_status(0x04))
+-			return -EIO;
+-	}
+-	if (debug)
+-		printk(KERN_DEBUG "<%s", key);
++		for (i = 0; i < 4; i++) {
++			outb(key[i], APPLESMC_DATA_PORT);
++			if (__wait_status(0x04)) {
++				ret = -EIO;
++				goto wait_fail;
++			}
++		}
++		if (debug)
++			printk(KERN_DEBUG "<%s", key);
+ 
+-	outb(len, APPLESMC_DATA_PORT);
+-	if (debug)
+-		printk(KERN_DEBUG ">%x", len);
++		outb(len, APPLESMC_DATA_PORT);
++		if (debug)
++			printk(KERN_DEBUG ">%x", len);
+ 
+-	for (i = 0; i < len; i++) {
+-		if (__wait_status(0x05))
+-			return -EIO;
+-		buffer[i] = inb(APPLESMC_DATA_PORT);
++		for (i = 0; i < len; i++) {
++			if (__wait_status(0x05)) {
++				ret = -EIO;
++				goto wait_fail;
++			}
++			buffer[i] = inb(APPLESMC_DATA_PORT);
++			if (debug)
++				printk(KERN_DEBUG "<%x", buffer[i]);
++		}
+ 		if (debug)
+-			printk(KERN_DEBUG "<%x", buffer[i]);
++			printk(KERN_DEBUG "\n");
++
++		break;
++
++wait_fail:
++		msleep(ACCESS_WAIT_MSECS);
++		continue;		
+ 	}
+-	if (debug)
+-		printk(KERN_DEBUG "\n");
+ 
+-	return 0;
++	if (total != ACCESS_TIMEOUT_MSECS) {
++		printk(KERN_DEBUG "Read: Waited %d ms for the value\n",
++						ACCESS_TIMEOUT_MSECS-total);
++	}
++
++	return ret;
+ }
+ 
+ /*

Modified: trunk/kernel/mactel-patches-2.6.22/series
===================================================================
--- trunk/kernel/mactel-patches-2.6.22/series	2007-08-12 07:25:09 UTC (rev 139)
+++ trunk/kernel/mactel-patches-2.6.22/series	2007-09-07 07:43:37 UTC (rev 140)
@@ -1,4 +1,4 @@
-# This series applies on GIT commit f44bba1a92e01bbab6ca9817b86ddf9e1744a616
+# This series applies on GIT commit 14d33e7fa86a09138b745030097a48c396cf4e57
 applesmc-use-input-polldev.patch
 applesmc-add-macbook-temperature-keys.patch
 sigmatel-backport-2.6.23.patch
@@ -6,3 +6,4 @@
 appletouch.patch
 appleir-undo-hid-blacklist.patch
 appletouch-shut-up-when-it-has-nothing-to-say.patch
+applesmc-retry-when-accessing-keys.patch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.