Changeset 1391

Timestamp:

06/12/02 04:53:33 (6 years ago)

Author:

mds

Message:

ich4 software pec support. Still cleanups to be done but enough for ARP.

Files:

• lm-sensors/trunk/doc/busses/i2c-i801 (modified) (1 diff)
• lm-sensors/trunk/kernel/busses/i2c-i801.c (modified) (24 diffs)

lm-sensors/trunk/doc/busses/i2c-i801

@@ -52 +52 @@
-
-
+I2C Block Read Support
+----------------------
+
+The devices support a special 2-byte address I2C block read.
+The driver and the kernel i2c protocol stack do not yet
+support this.
+
+
+SMBus 2.0 Support
+-----------------
+
+The 82801DB (ICH4) supports several SMBus 2.0 features.
+Kernel and driver support are as follows:
+
+Feature         Kernel          Driver
+Slave mode      no              no
+Host notify     no              no
+Block PEC       yes             yes
+Hardware PEC    yes             no
+
+
+Other ICH4 Features
+-------------------
+
+The following additional ICH4 features are not yet supported:
+
+32 Byte buffer
+
+
-**********************
-The lm_sensors project gratefully acknowledges the support of
-
+
+
+
+

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

@@ -49 +49 @@
-#include "version.h"
-
+#define DEBUG 1
-#ifdef MODULE_LICENSE
-MODULE_LICENSE("GPL");
+#endif
+
+#ifdef I2C_FUNC_SMBUS_BLOCK_DATA_PEC
+#define HAVE_PEC
-#endif
-
@@ -80 +85 @@
-#define SMBHSTDAT1 (6 + i801_smba)
-#define SMBBLKDAT (7 + i801_smba)
+#define SMBPEC    (8 + i801_smba)       /* ICH4 only */
+#define SMBAUXSTS (12 + i801_smba)      /* ICH4 only */
+#define SMBAUXCTL (13 + i801_smba)      /* ICH4 only */
-
-/* PCI Address Constants */
@@ -92 +100 @@
-
-/* Other settings */
-5
- ENABLE_INT9 0
+1
+ENABLE_INT9 0  /* set to 0x01 to enable - untested */
-
-/* I801 command constants */
@@ -104 +112 @@
-#define I801_BLOCK_LAST     0x34
-#define I801_I2C_BLOCK_LAST 0x38        /* unimplemented */
+#define I801_START          0x40
+#define I801_PEC_EN         0x80        /* ICH4 only */
-
-/* insmod parameters */
@@ -170 +180 @@
-static unsigned short i801_smba = 0;
-static struct pci_dev *I801_dev = NULL;
-
+
-
-/* Detect whether a I801 can be found, and initialize it, where necessary.
@@ -208 +218 @@
-                goto END;
-        }
+        isich4 = *num == PCI_DEVICE_ID_INTEL_82801DB_SMBUS;
-
-/* Determine the address of the SMBus areas */
@@ -218 +229 @@
-        }
-
-8
+(isich4 ? 16 : 8)
-                printk
-                    (KERN_ERR "i2c-i801.o: I801_smb region 0x%x already in use!\n",
@@ -238 +249 @@
-        } else if ((temp & 1) == 0) {
-                if (force) {
-
-
-
+
-   done by the Bios!  Don't complain if your hardware does weird 
-   things after enabling this. :') Check for Bios updates before
@@ -259 +268 @@
-        /* note: we assumed that the BIOS picked SMBus or I2C Bus timing
-           appropriately (bit 2 in SMBHSTCFG) */
-
-
+
-
-#ifdef DEBUG
@@ -280 +288 @@
-
-
-/* Internally used pause function */
-void i801_do_pause(unsigned int amount)
-{
@@ -287 +294 @@
-}
-
-/* Another internally used function */
-int i801_transaction(void)
-{
@@ -309 +315 @@
-#endif
-                outb_p(temp, SMBHSTSTS);
-inb_p(SMBHSTSTS
+(0x1f & inb_p(SMBHSTSTS)
-#ifdef DEBUG
-                        printk(KERN_DEBUG "i2c-i801.o: Failed! (%02x)\n", temp);
@@ -321 +327 @@
-        }
-
-
-
+
-
-        /* We will always wait for a fraction of a second! */
@@ -381 +386 @@
-/* All-inclusive block transaction function */
-int i801_block_transaction(union i2c_smbus_data *data, char read_write, 
-i2c_enable
+command
-{
-        int i, len;
@@ -387 +392 @@
-        int temp;
-        int result = 0;
- = 0
+
-        unsigned char hostc, errmask;
-
-i2c_enable
+command == I2C_SMBUS_I2C_BLOCK_DATA
-                if (read_write == I2C_SMBUS_WRITE) {
-                        /* set I2C_EN bit in configuration register */
@@ -420 +425 @@
-                else
-                        smbcmd = I801_BLOCK_DATA;
-
-
+
+
+
+
+
-
-#ifdef DEBUG
@@ -462 +470 @@
-                }
-
-
-
+
+
+
+
+
+
+
+
+
-
-                /* We will always wait for a fraction of a second! */
+                timeout = 0;
-                do {
-                        temp = inb_p(SMBHSTSTS);
-                        i801_do_pause(1);
-                }
-
-
-
+
-                           && (timeout++ < MAX_TIMEOUT));
-
@@ -491 +505 @@
-                } else if (temp & 0x08) {
-                        result = -1;
-
-
-
-
+
-                } else if (temp & 0x04) {
-                        result = -1;
@@ -517 +528 @@
-                        outb_p(data->block[i+1], SMBBLKDAT);
-                if ((temp & 0x9e) != 0x00)
-                        
-
-
+                       
+
+
-                if ((temp = (0x1e & inb_p(SMBHSTSTS))) != 0x00) {
-#ifdef DEBUG
-                        printk
-Failed reset at end of transaction (%02x)
+Bad status (%02x) at end of transaction
-                             temp);
-
-
-
+
-                printk
-                    (KERN_DEBUG "i2c-i801.o: Block (post %d): CNT=%02x, CMD=%02x, ADD=%02x, "
@@ -535 +543 @@
-#endif
-
- {
+
-                        goto END;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        result = 0;
-END:
-i2c_enable
+command == I2C_SMBUS_I2C_BLOCK_DATA
-                /* restore saved configuration register value */
-                pci_write_config_byte(I801_dev, SMBHSTCFG, hostc);
@@ -548 +578 @@
-}
-
-See smbus.h for more information 
+
-s32 i801_access(struct i2c_adapter * adap, u16 addr, unsigned short flags,
-                char read_write, u8 command, int size,
@@ -555 +585 @@
-
-        switch (size) {
-        case I2C_SMBUS_PROC_CALL:
-                printk(KERN_ERR "i2c-i801.o: I2C_SMBUS_PROC_CALL not supported!\n");
-                return -1;
-        case I2C_SMBUS_QUICK:
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
@@ -590 +617 @@
-        case I2C_SMBUS_BLOCK_DATA:
-        case I2C_SMBUS_I2C_BLOCK_DATA:
+#ifdef HAVE_PEC
+        case I2C_SMBUS_BLOCK_DATA_PEC:
+#endif
-                outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
-                       SMBHSTADD);
-                outb_p(command, SMBHSTCMD);
-/* Block transactions are very different from piix4 block
-          and from the other i801 transactions. Handle in the
-          i801_block_transaction() routine. */
-return i801_block_transaction(data, read_write, 
-                                              size==I2C_SMBUS_I2C_BLOCK_DATA)
+return i801_block_transaction(data, read_write, size);
+case I2C_SMBUS_PROC_CALL:
+default:
+printk(KERN_ERR "i2c-i801.o: Unsupported transaction %d\n", size);
+               return -1
-        }
-
-        /* 'size' is really the transaction type */
-(size & 0x3C) + (ENABLE_INT9 & 1)
+size | ENABLE_INT9
-
-        if (i801_transaction()) /* Error in transaction */
@@ -686 +716 @@
-        }
-        if (i801_initialized >= 1) {
-8
+(isich4 ? 16 : 8)
-                i801_initialized--;
-        }