Changeset 3176

Timestamp:

11/05/05 13:24:30 (8 years ago)

Author:

khali

Message:

Backport SMBus PEC support rewrite from Linux 2.6:

Discard I2C_FUNC_SMBUS_*_PEC defines. i2c clients are not supposed to
check for PEC support of i2c bus drivers on individual SMBus
transactions, and i2c bus drivers are not supposed to advertise them.

Location:

lm-sensors/trunk

Files:

• kernel/busses/i2c-i801.c (modified) (2 diffs)
• kernel/chips/smbus-arp.c (modified) (1 diff)
• kernel/include/i2c-dev.h (modified) (3 diffs)
• prog/dump/i2cdump.c (modified) (2 diffs)

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

@@ -92 +92 @@
 #endif
 
-#ifdef I2C_FUNC_SMBUS_BLOCK_DATA_PEC
+#ifdef I2C_CLIENT_PEC
 #define HAVE_PEC
 #endif
@@ -596 +596 @@
             I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_WRITE_I2C_BLOCK
 #ifdef HAVE_PEC
-             | (isich4 ? I2C_FUNC_SMBUS_BLOCK_DATA_PEC |
-                         I2C_FUNC_SMBUS_HWPEC_CALC
-                       : 0)
+             | (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0)
 #endif
 #if 0

lm-sensors/trunk/kernel/chips/smbus-arp.c

@@ -186 +186 @@
                 I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_SMBUS_HWPEC_CALC)) &&
             (!i2c_check_functionality(adapter,
-                I2C_FUNC_SMBUS_BLOCK_DATA_PEC)))
+                I2C_FUNC_SMBUS_BLOCK_DATA | I2C_FUNC_I2C)))
                 return(0);
 

lm-sensors/trunk/kernel/include/i2c-dev.h

@@ -54 +54 @@
 #define I2C_FUNC_PROTOCOL_MANGLING      0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
 #define I2C_FUNC_SMBUS_HWPEC_CALC       0x00000008 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_READ_WORD_DATA_PEC  0x00000800 /* SMBus 2.0 */ 
-#define I2C_FUNC_SMBUS_WRITE_WORD_DATA_PEC 0x00001000 /* SMBus 2.0 */ 
-#define I2C_FUNC_SMBUS_PROC_CALL_PEC    0x00002000 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_BLOCK_PROC_CALL_PEC 0x00004000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL  0x00008000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_QUICK            0x00010000 
@@ -73 +69 @@
 #define I2C_FUNC_SMBUS_READ_I2C_BLOCK_2  0x10000000 /* I2C-like block xfer  */
 #define I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2 0x20000000 /* w/ 2-byte reg. addr. */
-#define I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC  0x40000000 /* SMBus 2.0 */
-#define I2C_FUNC_SMBUS_WRITE_BLOCK_DATA_PEC 0x80000000 /* SMBus 2.0 */
 
 #define I2C_FUNC_SMBUS_BYTE (I2C_FUNC_SMBUS_READ_BYTE | \
@@ -88 +82 @@
 #define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \
                                     I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2)
-#define I2C_FUNC_SMBUS_BLOCK_DATA_PEC (I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC | \
-                                       I2C_FUNC_SMBUS_WRITE_BLOCK_DATA_PEC)
-#define I2C_FUNC_SMBUS_WORD_DATA_PEC  (I2C_FUNC_SMBUS_READ_WORD_DATA_PEC | \
-                                       I2C_FUNC_SMBUS_WRITE_WORD_DATA_PEC)
-
-#define I2C_FUNC_SMBUS_READ_BYTE_PEC            I2C_FUNC_SMBUS_READ_BYTE_DATA
-#define I2C_FUNC_SMBUS_WRITE_BYTE_PEC           I2C_FUNC_SMBUS_WRITE_BYTE_DATA
-#define I2C_FUNC_SMBUS_READ_BYTE_DATA_PEC       I2C_FUNC_SMBUS_READ_WORD_DATA
-#define I2C_FUNC_SMBUS_WRITE_BYTE_DATA_PEC      I2C_FUNC_SMBUS_WRITE_WORD_DATA
-#define I2C_FUNC_SMBUS_BYTE_PEC                 I2C_FUNC_SMBUS_BYTE_DATA
-#define I2C_FUNC_SMBUS_BYTE_DATA_PEC            I2C_FUNC_SMBUS_WORD_DATA
 
 /* 

lm-sensors/trunk/prog/dump/i2cdump.c

@@ -184 +184 @@
         switch(size) {
         case I2C_SMBUS_BYTE:
-                if (pec) {
-                        if (!(funcs & I2C_FUNC_SMBUS_BYTE_PEC)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have byte w/ PEC "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
-                } else {
-                        if (!(funcs & I2C_FUNC_SMBUS_BYTE)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have byte capability\n",
-                                        i2cbus);
-                                exit(1);
-                        }
+                if (!((funcs & I2C_FUNC_SMBUS_BYTE) == I2C_FUNC_SMBUS_BYTE)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have byte capability\n", i2cbus);
+                        exit(1);
                 }
                 break;
 
         case I2C_SMBUS_BYTE_DATA:
-                if (pec) {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA_PEC)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have byte read w/ PEC "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
-                } else {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have byte read "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
+                if (!(funcs & I2C_FUNC_SMBUS_READ_BYTE_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have byte read capability\n", i2cbus);
+                        exit(1);
                 }
                 break;
 
         case I2C_SMBUS_WORD_DATA:
-                if (pec) {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA_PEC)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have word read w/ PEC "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
-                } else {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have word read "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
+                if (!(funcs & I2C_FUNC_SMBUS_READ_WORD_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have word read capability\n", i2cbus);
+                        exit(1);
                 }
                 break;
 
         case I2C_SMBUS_BLOCK_DATA:
-                if (pec) {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA_PEC)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have smbus block read "
-                                        "w/ PEC capability\n", i2cbus);
-                                exit(1);
-                        }
-                } else {
-                        if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
-                                fprintf(stderr, "Error: Adapter for i2c bus "
-                                        "%d does not have smbus block read "
-                                        "capability\n", i2cbus);
-                                exit(1);
-                        }
+                if (!(funcs & I2C_FUNC_SMBUS_READ_BLOCK_DATA)) {
+                        fprintf(stderr, "Error: Adapter for i2c bus %d does "
+                                "not have smbus block read capability\n",
+                                i2cbus);
+                        exit(1);
                 }
                 break;
@@ -278 +239 @@
                                 strerror(errno));
                         exit(1);
+                }
+                if (!(funcs & (I2C_FUNC_SMBUS_HWPEC_CALC | I2C_FUNC_I2C))) {
+                        fprintf(stderr, "Warning: Adapter for i2c bus %d does "
+                                "not seem to actually support PEC\n", i2cbus);
                 }
         }