Changeset 3139

Timestamp:

10/29/05 21:48:20 (8 years ago)

Author:

khali

Message:

Support I2C block read when possible. This is a backport from
Linux 2.6.

Files:

• lm-sensors/trunk/kernel/busses/i2c-viapro.c (modified) (9 diffs)

lm-sensors/trunk/kernel/busses/i2c-viapro.c

@@ -5 +5 @@
     Philip Edelbrock <phil@netroedge.com>, Kyösti Mälkki <kmalkki@cc.hut.fi>,
     Mark D. Studebaker <mdsxyz123@yahoo.com>
+    Copyright (C) 2005  Jean Delvare <khali@linux-fr.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -88 +89 @@
 #define VT596_WORD_DATA         0x0C
 #define VT596_BLOCK_DATA        0x14
+#define VT596_I2C_BLOCK_DATA    0x34
 
 
@@ -106 +108 @@
 
 static struct i2c_adapter vt596_adapter;
+
+#define FEATURE_I2CBLOCK        (1<<0)
+static unsigned int vt596_features;
 
 /* Another internally used function */
@@ -221 +226 @@
                 size = VT596_WORD_DATA;
                 break;
+        case I2C_SMBUS_I2C_BLOCK_DATA:
+                if (!(vt596_features & FEATURE_I2CBLOCK))
+                        return -1;
+                if (read_write == I2C_SMBUS_READ)
+                        outb_p(I2C_SMBUS_BLOCK_MAX, SMBHSTDAT0);
+                /* Fall through */
         case I2C_SMBUS_BLOCK_DATA:
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
@@ -236 +247 @@
                                 outb_p(data->block[i], SMBBLKDAT);
                 }
-                size = VT596_BLOCK_DATA;
+                size = (size == I2C_SMBUS_I2C_BLOCK_DATA) ?
+                       VT596_I2C_BLOCK_DATA : VT596_BLOCK_DATA;
                 break;
         default:
@@ -243 +255 @@
         }
 
-        outb_p((size & 0x1C) + (ENABLE_INT9 & 1), SMBHSTCNT);
+        outb_p((size & 0x3C) + (ENABLE_INT9 & 1), SMBHSTCNT);
 
         if (vt596_transaction()) /* Error in transaction */
@@ -265 +277 @@
                 data->word = inb_p(SMBHSTDAT0) + (inb_p(SMBHSTDAT1) << 8);
                 break;
+        case VT596_I2C_BLOCK_DATA:
         case VT596_BLOCK_DATA:
                 data->block[0] = inb_p(SMBHSTDAT0);
@@ -293 +306 @@
 static u32 vt596_func(struct i2c_adapter *adapter)
 {
-        return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+        u32 func = I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
             I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
             I2C_FUNC_SMBUS_BLOCK_DATA;
+
+        if (vt596_features & FEATURE_I2CBLOCK)
+                func |= I2C_FUNC_SMBUS_I2C_BLOCK;
+        return func;
 }
 
@@ -395 +412 @@
         dev_dbg(pdev, "VT596_smba = 0x%X\n", vt596_smba);
 
+        switch (id->device) {
+        case PCI_DEVICE_ID_VIA_8237:
+        case PCI_DEVICE_ID_VIA_8235:
+        case PCI_DEVICE_ID_VIA_8233A:
+        case PCI_DEVICE_ID_VIA_8233_0:
+                vt596_features |= FEATURE_I2CBLOCK;
+                break;
+        case PCI_DEVICE_ID_VIA_82C686_4:
+                /* The VT82C686B (rev 0x40) does support I2C block
+                   transactions, but the VT82C686A (rev 0x30) doesn't */
+                if (!pci_read_config_byte(pdev, PCI_REVISION_ID, &temp)
+                 && temp >= 0x40)
+                        vt596_features |= FEATURE_I2CBLOCK;
+                break;
+        }
+
         snprintf(vt596_adapter.name, 32,
                  "SMBus Via Pro adapter at %04x", vt596_smba);