Changeset 856

Timestamp:

08/12/00 18:33:25 (13 years ago)

Author:

mds

Message:

(mds) smbus block write fixes, i2c block write support from Rickard Westman.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-i801.c (modified) (15 diffs)

lm-sensors/trunk/CHANGES

@@ -16 +16 @@
 2.5.3 (2000????)
   Module i2c-i801: support Intel 82801BA (815E chipset)
+  Module i2c-i801: add i2c block support, fix smbus block bugs
+                   (requires i2c 2.5.3 package)
   Programs i2cdetect, i2cdump: Improve error reporting
   Program sensors: new switch -u (--unknown)

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

@@ -66 +66 @@
 #define SMBREV    0x008
 
+/* Host configuration bits for SMBHSTCFG */
+#define SMBHSTCFG_HST_EN      1
+#define SMBHSTCFG_SMB_SMI_EN  2
+#define SMBHSTCFG_I2C_EN      4
+
 /* Other settings */
 #define MAX_TIMEOUT 500
@@ -104 +109 @@
 static int i801_transaction(void);
 static int i801_block_transaction(union i2c_smbus_data *data,
-                                  char read_write);
+                                  char read_write, int i2c_enable);
 static void i801_inc(struct i2c_adapter *adapter);
 static void i801_dec(struct i2c_adapter *adapter);
@@ -118 +123 @@
         /* id */ I2C_ALGO_SMBUS,
         /* master_xfer */ NULL,
-        /* smbus_access */ i801_access,
+        /* smbus_xfer */ i801_access,
         /* slave_send */ NULL,
         /* slave_rcv */ NULL,
@@ -138 +143 @@
 static int __initdata i801_initialized;
 static unsigned short i801_smba = 0;
+static struct pci_dev *I801_dev = NULL;
 
 
@@ -148 +154 @@
         int error_return = 0;
         unsigned char temp;
-
-        struct pci_dev *I801_dev;
 
         /* First check whether we can access PCI at all */
@@ -359 +363 @@
 
 /* All-inclusive block transaction function */
-int i801_block_transaction(union i2c_smbus_data *data, char read_write)
+int i801_block_transaction(union i2c_smbus_data *data, char read_write, 
+                           int i2c_enable)
 {
         int i, len;
@@ -366 +371 @@
         int result = 0;
         int timeout = 0;
+        unsigned char hostc, errmask;
+
+        if (i2c_enable) {
+                if (read_write == I2C_SMBUS_WRITE) {
+                        /* set I2C_EN bit in configuration register */
+                        pci_read_config_byte(I801_dev, SMBHSTCFG, &hostc);
+                        pci_write_config_byte(I801_dev, SMBHSTCFG, 
+                                              hostc | SMBHSTCFG_I2C_EN);
+                } else {
+                        printk("i2c-i801.o: "
+                               "I2C_SMBUS_I2C_BLOCK_READ not supported!\n");
+                        return -1;
+                }
+        }
 
         if (read_write == I2C_SMBUS_WRITE) {
@@ -384 +403 @@
                 else
                         smbcmd = I801_BLOCK_DATA;
-                if (read_write == I2C_SMBUS_WRITE)
-                        outb_p(data->block[i], SMBBLKDAT);
+
                 outb_p((smbcmd & 0x3C) + (ENABLE_INT9 & 1), SMBHSTCNT);
 
@@ -391 +409 @@
                 printk
                     ("i2c-i801.o: Transaction (pre): CNT=%02x, CMD=%02x, ADD=%02x, "
-                     "DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT),
+                     "DAT0=%02x, BLKDAT=%02x\n", inb_p(SMBHSTCNT),
                      inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
-                     inb_p(SMBHSTDAT1));
+                     inb_p(SMBBLKDAT));
 #endif
 
                 /* Make sure the SMBus host is ready to start transmitting */
-                /* 0x1f = Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
-                /* 0x9e = Byte_Done, Failed, Bus_Err, Dev_Err, Intr */
                 temp = inb_p(SMBHSTSTS);
-                if (((i == 1) && ((temp & 0x1f) != 0x00)) ||
-                    ((i != 1) && ((temp & 0x9e) != 0x00))) {
+                if (i == 1) {
+                    /* Erronenous conditions before transaction: 
+                     * Byte_Done, Failed, Bus_Err, Dev_Err, Intr, Host_Busy */
+                    errmask=0x9f; 
+                } else {
+                    /* Erronenous conditions during transaction: 
+                     * Failed, Bus_Err, Dev_Err, Intr */
+                    errmask=0x1e; 
+                }
+                if (temp & errmask) {
 #ifdef DEBUG
                         printk
@@ -408 +432 @@
 #endif
                         outb_p(temp, SMBHSTSTS);
-                        if (((temp = inb_p(SMBHSTSTS)) & 0x9f) != 0x00) {
+                        if (((temp = inb_p(SMBHSTSTS)) & errmask) != 0x00) {
                                 printk
                                     ("i2c-i801.o: Reset failed! (%02x)\n",
                                      temp);
-                                return -1;
+                                result = -1;
+                                goto END;
                         }
-                        if (i != 1)
-                                return -1;      /* if die in middle of block transaction, fail */
+                        if (i != 1) {
+                                result = -1;  /* if die in middle of block transaction, fail */
+                                goto END;
+                        }
                 }
 
                 /* start the transaction by setting bit 6 */
-                outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT);
+                if (i==1) outb_p(inb(SMBHSTCNT) | 0x040, SMBHSTCNT);
 
                 /* We will always wait for a fraction of a second! */
                 do {
+                        temp = inb_p(SMBHSTSTS);
                         i801_do_pause(1);
-                        temp = inb_p(SMBHSTSTS);
                 }
                     while (
                            (((i >= len) && (temp & 0x01))
-                            || ((i < len) && (temp & 0x80)))
+                            || ((i < len) && !(temp & 0x80)))
                            && (timeout++ < MAX_TIMEOUT));
 
@@ -456 +483 @@
                         printk("i2c-i801.o: Error: no response!\n");
 #endif
-                } else if (temp & 0x80) {
-                        result = -1;
-#ifdef DEBUG
-                        printk
-                            ("i2c-i801.o: Error: Failed in middle of block!\n");
-#endif
-                }
-
-                if ((temp & 0x9f) != 0x00)
-                        outb_p(temp, SMBHSTSTS);
-
-                if ((temp = (0x9f & inb_p(SMBHSTSTS))) != 0x00) {
-#ifdef DEBUG
-                        printk
-                            ("i2c-i801.o: Failed reset at end of transaction (%02x)\n",
-                             temp);
-#endif
-                }
-#ifdef DEBUG
-                printk
-                    ("i2c-i801.o: Transaction (post): CNT=%02x, CMD=%02x, ADD=%02x, "
-                     "DAT0=%02x, DAT1=%02x\n", inb_p(SMBHSTCNT),
-                     inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
-                     inb_p(SMBHSTDAT1));
-#endif
+                }
 
                 if (i == 1 && read_write == I2C_SMBUS_READ) {
@@ -490 +493 @@
                         data->block[0] = len;
                 }
+
+                /* Retrieve/store value in SMBBLKDAT */
                 if (read_write == I2C_SMBUS_READ)
                         data->block[i] = inb_p(SMBBLKDAT);
-
-                if (result < 0)
-                        return (result);
-        }
-        return (0);
+                if (read_write == I2C_SMBUS_WRITE && i+1 <= len)
+                        outb_p(data->block[i+1], SMBBLKDAT);
+                if ((temp & 0x9e) != 0x00)
+                        outb_p(temp, SMBHSTSTS);  /* signals SMBBLKDAT ready */
+
+                temp = inb_p(SMBHSTSTS);
+                if ((temp = (0x1e & inb_p(SMBHSTSTS))) != 0x00) {
+#ifdef DEBUG
+                        printk
+                            ("i2c-i801.o: Failed reset at end of transaction (%02x)\n",
+                             temp);
+#endif
+                }
+#ifdef DEBUG
+                printk
+                    ("i2c-i801.o: Transaction (post): CNT=%02x, CMD=%02x, ADD=%02x, "
+                     "DAT0=%02x, BLKDAT=%02x\n", inb_p(SMBHSTCNT),
+                     inb_p(SMBHSTCMD), inb_p(SMBHSTADD), inb_p(SMBHSTDAT0),
+                     inb_p(SMBBLKDAT));
+#endif
+
+                if (result < 0) {
+                        goto END;
+                }
+        }
+        result = 0;
+END:
+        if (i2c_enable) {
+                /* restore saved configuration register value */
+                pci_write_config_byte(I801_dev, SMBHSTCFG, hostc);
+        }
+        return result;
 }
 
@@ -540 +572 @@
                 break;
         case I2C_SMBUS_BLOCK_DATA:
+        case I2C_SMBUS_I2C_BLOCK_DATA:
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMBHSTADD);
@@ -546 +579 @@
                    and from the other i801 transactions. Handle in the
                    i801_block_transaction() routine. */
-                return (i801_block_transaction(data, read_write));
+                return i801_block_transaction(data, read_write, 
+                                              size==I2C_SMBUS_I2C_BLOCK_DATA);
         }
 
@@ -587 +621 @@
         return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
             I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
-            I2C_FUNC_SMBUS_BLOCK_DATA;
+            I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK;
 }