1 files changed, 82 insertions, 27 deletions

diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c
index b06b8e090a27..bc011da79e14 100644
--- a/drivers/hwmon/applesmc.c
+++ b/drivers/hwmon/applesmc.c
@@ -49,6 +49,9 @@
 
 #define APPLESMC_MAX_DATA_LENGTH 32
 
+#define APPLESMC_MIN_WAIT       0x0040
+#define APPLESMC_MAX_WAIT       0x8000
+
 #define APPLESMC_STATUS_MASK    0x0f
 #define APPLESMC_READ_CMD       0x10
 #define APPLESMC_WRITE_CMD      0x11
@@ -57,8 +60,8 @@
 
 #define KEY_COUNT_KEY           "#KEY" /* r-o ui32 */
 
-#define LIGHT_SENSOR_LEFT_KEY   "ALV0" /* r-o {alv (6 bytes) */
-#define LIGHT_SENSOR_RIGHT_KEY  "ALV1" /* r-o {alv (6 bytes) */
+#define LIGHT_SENSOR_LEFT_KEY   "ALV0" /* r-o {alv (6-10 bytes) */
+#define LIGHT_SENSOR_RIGHT_KEY  "ALV1" /* r-o {alv (6-10 bytes) */
 #define BACKLIGHT_KEY           "LKSB" /* w-o {lkb (2 bytes) */
 
 #define CLAMSHELL_KEY           "MSLD" /* r-o ui8 (unused) */
@@ -104,6 +107,15 @@ static const char* temperature_sensors_sets[][36] = {
 /* Set 6: Macbook3 set */
         { "TB0T", "TC0D", "TC0P", "TM0P", "TN0P", "TTF0", "TW0P", "Th0H",
           "Th0S", "Th1H", NULL },
+/* Set 7: Macbook Air */
+        { "TB0T", "TB1S", "TB1T", "TB2S", "TB2T", "TC0D", "TC0P", "TCFP",
+          "TTF0", "TW0P", "Th0H", "Tp0P", "TpFP", "Ts0P", "Ts0S", NULL },
+/* Set 8: Macbook Pro 4,1 (Penryn) */
+        { "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P", "Th0H",
+          "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
+/* Set 9: Macbook Pro 3,1 (Santa Rosa) */
+        { "TALP", "TB0T", "TC0D", "TC0P", "TG0D", "TG0H", "TTF0", "TW0P",
+          "Th0H", "Th1H", "Th2H", "Tm0P", "Ts0P", NULL },
 };
 
 /* List of keys used to read/write fan speeds */
@@ -163,25 +175,25 @@ static unsigned int key_at_index;
 static struct workqueue_struct *applesmc_led_wq;
 
 /*
- * __wait_status - Wait up to 2ms for the status port to get a certain value
+ * __wait_status - Wait up to 32ms 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;
+        int us;
 
         val = val & APPLESMC_STATUS_MASK;
 
-        for (i = 0; i < 200; i++) {
+        for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
+                udelay(us);
                 if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == val) {
                         if (debug)
                                 printk(KERN_DEBUG
-                                                "Waited %d us for status %x\n",
-                                                i*10, val);
+                                        "Waited %d us for status %x\n",
+                                        2 * us - APPLESMC_MIN_WAIT, val);
                         return 0;
                 }
-                udelay(10);
         }
 
         printk(KERN_WARNING "applesmc: wait status failed: %x != %x\n",
@@ -191,6 +203,25 @@ static int __wait_status(u8 val)
 }
 
 /*
+ * special treatment of command port - on newer macbooks, it seems necessary
+ * to resend the command byte before polling the status again. Callers must
+ * hold applesmc_lock.
+ */
+static int send_command(u8 cmd)
+{
+        int us;
+        for (us = APPLESMC_MIN_WAIT; us < APPLESMC_MAX_WAIT; us <<= 1) {
+                outb(cmd, APPLESMC_CMD_PORT);
+                udelay(us);
+                if ((inb(APPLESMC_CMD_PORT) & APPLESMC_STATUS_MASK) == 0x0c)
+                        return 0;
+        }
+        printk(KERN_WARNING "applesmc: command failed: %x -> %x\n",
+                cmd, 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.
@@ -205,8 +236,7 @@ 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))
+        if (send_command(APPLESMC_READ_CMD))
                 return -EIO;
 
         for (i = 0; i < 4; i++) {
@@ -249,8 +279,7 @@ static int applesmc_write_key(const char* key, u8* buffer, u8 len)
                 return -EINVAL;
         }
 
-        outb(APPLESMC_WRITE_CMD, APPLESMC_CMD_PORT);
-        if (__wait_status(0x0c))
+        if (send_command(APPLESMC_WRITE_CMD))
                 return -EIO;
 
         for (i = 0; i < 4; i++) {
@@ -284,8 +313,7 @@ static int applesmc_get_key_at_index(int index, char* key)
         readkey[2] = index >> 8;
         readkey[3] = index;
 
-        outb(APPLESMC_GET_KEY_BY_INDEX_CMD, APPLESMC_CMD_PORT);
-        if (__wait_status(0x0c))
+        if (send_command(APPLESMC_GET_KEY_BY_INDEX_CMD))
                 return -EIO;
 
         for (i = 0; i < 4; i++) {
@@ -315,8 +343,7 @@ static int applesmc_get_key_type(char* key, char* type)
 {
         int i;
 
-        outb(APPLESMC_GET_KEY_TYPE_CMD, APPLESMC_CMD_PORT);
-        if (__wait_status(0x0c))
+        if (send_command(APPLESMC_GET_KEY_TYPE_CMD))
                 return -EIO;
 
         for (i = 0; i < 4; i++) {
@@ -325,7 +352,7 @@ static int applesmc_get_key_type(char* key, char* type)
                         return -EIO;
         }
 
-        outb(5, APPLESMC_DATA_PORT);
+        outb(6, APPLESMC_DATA_PORT);
 
         for (i = 0; i < 6; i++) {
                 if (__wait_status(0x05))
@@ -527,17 +554,27 @@ out:
 static ssize_t applesmc_light_show(struct device *dev,
                                 struct device_attribute *attr, char *sysfsbuf)
 {
+        static int data_length;
         int ret;
         u8 left = 0, right = 0;
-        u8 buffer[6];
+        u8 buffer[10], query[6];
 
         mutex_lock(&applesmc_lock);
 
-        ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, 6);
+        if (!data_length) {
+                ret = applesmc_get_key_type(LIGHT_SENSOR_LEFT_KEY, query);
+                if (ret)
+                        goto out;
+                data_length = clamp_val(query[0], 0, 10);
+                printk(KERN_INFO "applesmc: light sensor data length set to "
+                        "%d\n", data_length);
+        }
+
+        ret = applesmc_read_key(LIGHT_SENSOR_LEFT_KEY, buffer, data_length);
         left = buffer[2];
         if (ret)
                 goto out;
-        ret = applesmc_read_key(LIGHT_SENSOR_RIGHT_KEY, buffer, 6);
+        ret = applesmc_read_key(LIGHT_SENSOR_RIGHT_KEY, buffer, data_length);
         right = buffer[2];
 
 out:
@@ -1233,39 +1270,57 @@ static __initdata struct dmi_match_data applesmc_dmi_data[] = {
         { .accelerometer = 0, .light = 0, .temperature_set = 5 },
 /* MacBook3: accelerometer and temperature set 6 */
         { .accelerometer = 1, .light = 0, .temperature_set = 6 },
+/* MacBook Air: accelerometer, backlight and temperature set 7 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 7 },
+/* MacBook Pro 4: accelerometer, backlight and temperature set 8 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 8 },
+/* MacBook Pro 3: accelerometer, backlight and temperature set 9 */
+        { .accelerometer = 1, .light = 1, .temperature_set = 9 },
 };
 
 /* Note that DMI_MATCH(...,"MacBook") will match "MacBookPro1,1".
  * So we need to put "Apple MacBook Pro" before "Apple MacBook". */
 static __initdata struct dmi_system_id applesmc_whitelist[] = {
+        { applesmc_dmi_match, "Apple MacBook Air", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBookAir") },
+                &applesmc_dmi_data[7]},
+        { applesmc_dmi_match, "Apple MacBook Pro 4", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro4") },
+                &applesmc_dmi_data[8]},
+        { applesmc_dmi_match, "Apple MacBook Pro 3", {
+          DMI_MATCH(DMI_BOARD_VENDOR, "Apple"),
+          DMI_MATCH(DMI_PRODUCT_NAME, "MacBookPro3") },
+                &applesmc_dmi_data[9]},
         { applesmc_dmi_match, "Apple MacBook Pro", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBookPro") },
-                (void*)&applesmc_dmi_data[0]},
+                &applesmc_dmi_data[0]},
         { applesmc_dmi_match, "Apple MacBook (v2)", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook2") },
-                (void*)&applesmc_dmi_data[1]},
+                &applesmc_dmi_data[1]},
         { applesmc_dmi_match, "Apple MacBook (v3)", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook3") },
-                (void*)&applesmc_dmi_data[6]},
+                &applesmc_dmi_data[6]},
         { applesmc_dmi_match, "Apple MacBook", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacBook") },
-                (void*)&applesmc_dmi_data[2]},
+                &applesmc_dmi_data[2]},
         { applesmc_dmi_match, "Apple Macmini", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"Macmini") },
-                (void*)&applesmc_dmi_data[3]},
+                &applesmc_dmi_data[3]},
         { applesmc_dmi_match, "Apple MacPro2", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"MacPro2") },
-                (void*)&applesmc_dmi_data[4]},
+                &applesmc_dmi_data[4]},
         { applesmc_dmi_match, "Apple iMac", {
           DMI_MATCH(DMI_BOARD_VENDOR,"Apple"),
           DMI_MATCH(DMI_PRODUCT_NAME,"iMac") },
-                (void*)&applesmc_dmi_data[5]},
+                &applesmc_dmi_data[5]},
         { .ident = NULL }
 };