11 files changed, 32 insertions, 40 deletions

diff --git a/Documentation/i2c/chips/max6875 b/Documentation/i2c/chips/max6875
index 96fec562a8e9..a0cd8af2f408 100644
--- a/Documentation/i2c/chips/max6875
+++ b/Documentation/i2c/chips/max6875
@@ -99,7 +99,7 @@ And then read the data
 
   or
 
-  count = i2c_smbus_read_i2c_block_data(fd, 0x84, buffer);
+  count = i2c_smbus_read_i2c_block_data(fd, 0x84, 16, buffer);
 
 The block read should read 16 bytes.
 0x84 is the block read command.
diff --git a/Documentation/i2c/writing-clients b/Documentation/i2c/writing-clients
index 3d8d36b0ad12..2c170032bf37 100644
--- a/Documentation/i2c/writing-clients
+++ b/Documentation/i2c/writing-clients
@@ -571,7 +571,7 @@ SMBus communication
                                         u8 command, u8 length,
                                         u8 *values);
   extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
-                                           u8 command, u8 *values);
+                                           u8 command, u8 length, u8 *values);
 
 These ones were removed in Linux 2.6.10 because they had no users, but could
 be added back later if needed:
diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-powermac.c
index 1425d2245c82..0ab4f2627c26 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -121,8 +121,7 @@ static s32 i2c_powermac_smbus_xfer(	struct i2c_adapter*	adap,
                 if (rc)
                         goto bail;
                 rc = pmac_i2c_xfer(bus, addrdir, 1, command,
-                                   read ? data->block : &data->block[1],
-                                   data->block[0]);
+                                   &data->block[1], data->block[0]);
                 break;
 
         default:
diff --git a/drivers/i2c/busses/i2c-viapro.c b/drivers/i2c/busses/i2c-viapro.c
index 7a2bc06304fc..a0f7e4a303b5 100644
--- a/drivers/i2c/busses/i2c-viapro.c
+++ b/drivers/i2c/busses/i2c-viapro.c
@@ -235,7 +235,7 @@ static s32 vt596_access(struct i2c_adapter *adap, u16 addr,
                 if (!(vt596_features & FEATURE_I2CBLOCK))
                         goto exit_unsupported;
                 if (read_write == I2C_SMBUS_READ)
-                        outb_p(I2C_SMBUS_BLOCK_MAX, SMBHSTDAT0);
+                        outb_p(data->block[0], SMBHSTDAT0);
                 /* Fall through */
         case I2C_SMBUS_BLOCK_DATA:
                 outb_p(command, SMBHSTCMD);
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
index dc64f8b6b24a..e6c4a2b762ec 100644
--- a/drivers/i2c/busses/scx200_acb.c
+++ b/drivers/i2c/busses/scx200_acb.c
@@ -310,8 +310,6 @@ static s32 scx200_acb_smbus_xfer(struct i2c_adapter *adapter,
                 break;
 
         case I2C_SMBUS_I2C_BLOCK_DATA:
-                if (rw == I2C_SMBUS_READ)
-                        data->block[0] = I2C_SMBUS_BLOCK_MAX; /* For now */
                 len = data->block[0];
                 if (len == 0 || len > I2C_SMBUS_BLOCK_MAX)
                         return -EINVAL;
diff --git a/drivers/i2c/chips/eeprom.c b/drivers/i2c/chips/eeprom.c
index bfce13c8f1ff..48f857ae8748 100644
--- a/drivers/i2c/chips/eeprom.c
+++ b/drivers/i2c/chips/eeprom.c
@@ -88,8 +88,10 @@ static void eeprom_update_client(struct i2c_client *client, u8 slice)
                 dev_dbg(&client->dev, "Starting eeprom update, slice %u\n", slice);
 
                 if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
-                        for (i = slice << 5; i < (slice + 1) << 5; i += I2C_SMBUS_BLOCK_MAX)
-                                if (i2c_smbus_read_i2c_block_data(client, i, data->data + i) != I2C_SMBUS_BLOCK_MAX)
+                        for (i = slice << 5; i < (slice + 1) << 5; i += 32)
+                                if (i2c_smbus_read_i2c_block_data(client, i,
+                                                        32, data->data + i)
+                                                        != 32)
                                         goto exit;
                 } else {
                         if (i2c_smbus_write_byte(client, slice << 5)) {
diff --git a/drivers/i2c/chips/max6875.c b/drivers/i2c/chips/max6875.c
index 76645c142977..e9e9e5171b53 100644
--- a/drivers/i2c/chips/max6875.c
+++ b/drivers/i2c/chips/max6875.c
@@ -106,6 +106,7 @@ static void max6875_update_slice(struct i2c_client *client, int slice)
                                             I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
                         if (i2c_smbus_read_i2c_block_data(client,
                                                           MAX6875_CMD_BLK_READ,
+                                                          SLICE_SIZE,
                                                           buf) != SLICE_SIZE) {
                                 goto exit_up;
                         }
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index cccfa8678245..6971a62397db 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -1344,10 +1344,14 @@ s32 i2c_smbus_write_block_data(struct i2c_client *client, u8 command,
 EXPORT_SYMBOL(i2c_smbus_write_block_data);
 
 /* Returns the number of read bytes */
-s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command, u8 *values)
+s32 i2c_smbus_read_i2c_block_data(struct i2c_client *client, u8 command,
+                                  u8 length, u8 *values)
 {
         union i2c_smbus_data data;
 
+        if (length > I2C_SMBUS_BLOCK_MAX)
+                length = I2C_SMBUS_BLOCK_MAX;
+        data.block[0] = length;
         if (i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                               I2C_SMBUS_READ,command,
                               I2C_SMBUS_I2C_BLOCK_DATA,&data))
@@ -1468,7 +1472,7 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
                 break;
         case I2C_SMBUS_I2C_BLOCK_DATA:
                 if (read_write == I2C_SMBUS_READ) {
-                        msg[1].len = I2C_SMBUS_BLOCK_MAX;
+                        msg[1].len = data->block[0];
                 } else {
                         msg[0].len = data->block[0] + 1;
                         if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 1) {
@@ -1524,9 +1528,7 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr,
                                 data->word = msgbuf1[0] | (msgbuf1[1] << 8);
                                 break;
                         case I2C_SMBUS_I2C_BLOCK_DATA:
-                                /* fixed at 32 for now */
-                                data->block[0] = I2C_SMBUS_BLOCK_MAX;
-                                for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)
+                                for (i = 0; i < data->block[0]; i++)
                                         data->block[i+1] = msgbuf1[i];
                                 break;
                         case I2C_SMBUS_BLOCK_DATA:
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index e7a709710592..64eee9551b22 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -283,6 +283,7 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
                     (data_arg.size != I2C_SMBUS_WORD_DATA) &&
                     (data_arg.size != I2C_SMBUS_PROC_CALL) &&
                     (data_arg.size != I2C_SMBUS_BLOCK_DATA) &&
+                    (data_arg.size != I2C_SMBUS_I2C_BLOCK_BROKEN) &&
                     (data_arg.size != I2C_SMBUS_I2C_BLOCK_DATA) &&
                     (data_arg.size != I2C_SMBUS_BLOCK_PROC_CALL)) {
                         dev_dbg(&client->adapter->dev,
@@ -329,10 +330,18 @@ static int i2cdev_ioctl(struct inode *inode, struct file *file,
 
                 if ((data_arg.size == I2C_SMBUS_PROC_CALL) ||
                     (data_arg.size == I2C_SMBUS_BLOCK_PROC_CALL) ||
+                    (data_arg.size == I2C_SMBUS_I2C_BLOCK_DATA) ||
                     (data_arg.read_write == I2C_SMBUS_WRITE)) {
                         if (copy_from_user(&temp, data_arg.data, datasize))
                                 return -EFAULT;
                 }
+                if (data_arg.size == I2C_SMBUS_I2C_BLOCK_BROKEN) {
+                        /* Convert old I2C block commands to the new
+                           convention. This preserves binary compatibility. */
+                        data_arg.size = I2C_SMBUS_I2C_BLOCK_DATA;
+                        if (data_arg.read_write == I2C_SMBUS_READ)
+                                temp.block[0] = I2C_SMBUS_BLOCK_MAX;
+                }
                 res = i2c_smbus_xfer(client->adapter,client->addr,client->flags,
                       data_arg.read_write,
                       data_arg.command,data_arg.size,&temp);
diff --git a/drivers/macintosh/windfarm_smu_sat.c b/drivers/macintosh/windfarm_smu_sat.c
index 1043b39aa123..351982bcec1b 100644
--- a/drivers/macintosh/windfarm_smu_sat.c
+++ b/drivers/macintosh/windfarm_smu_sat.c
@@ -67,26 +67,6 @@ static struct i2c_driver wf_sat_driver = {
         .detach_client  = wf_sat_detach,
 };
 
-/*
- * XXX i2c_smbus_read_i2c_block_data doesn't pass the requested
- * length down to the low-level driver, so we use this, which
- * works well enough with the SMU i2c driver code...
- */
-static int sat_read_block(struct i2c_client *client, u8 command,
-                          u8 *values, int len)
-{
-        union i2c_smbus_data data;
-        int err;
-
-        data.block[0] = len;
-        err = i2c_smbus_xfer(client->adapter, client->addr, client->flags,
-                             I2C_SMBUS_READ, command, I2C_SMBUS_I2C_BLOCK_DATA,
-                             &data);
-        if (!err)
-                memcpy(values, data.block, len);
-        return err;
-}
-
 struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id,
                                                   unsigned int *size)
 {
@@ -124,8 +104,8 @@ struct smu_sdbp_header *smu_sat_get_sdb_partition(unsigned int sat_id, int id,
                 return NULL;
 
         for (i = 0; i < len; i += 4) {
-                err = sat_read_block(&sat->i2c, 0xa, data, 4);
-                if (err) {
+                err = i2c_smbus_read_i2c_block_data(&sat->i2c, 0xa, 4, data);
+                if (err < 0) {
                         printk(KERN_ERR "smu_sat_get_sdb_part rd err %d\n",
                                err);
                         goto fail;
@@ -157,8 +137,8 @@ static int wf_sat_read_cache(struct wf_sat *sat)
 {
         int err;
 
-        err = sat_read_block(&sat->i2c, 0x3f, sat->cache, 16);
-        if (err)
+        err = i2c_smbus_read_i2c_block_data(&sat->i2c, 0x3f, 16, sat->cache);
+        if (err < 0)
                 return err;
         sat->last_read = jiffies;
 #ifdef LOTSA_DEBUG
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 44f2ecf47d9f..2eaba21b9b1a 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -90,7 +90,7 @@ extern s32 i2c_smbus_write_block_data(struct i2c_client * client,
                                       const u8 *values);
 /* Returns the number of read bytes */
 extern s32 i2c_smbus_read_i2c_block_data(struct i2c_client * client,
-                                         u8 command, u8 *values);
+                                         u8 command, u8 length, u8 *values);
 extern s32 i2c_smbus_write_i2c_block_data(struct i2c_client * client,
                                           u8 command, u8 length,
                                           const u8 *values);
@@ -524,8 +524,9 @@ union i2c_smbus_data {
 #define I2C_SMBUS_WORD_DATA         3
 #define I2C_SMBUS_PROC_CALL         4
 #define I2C_SMBUS_BLOCK_DATA        5
-#define I2C_SMBUS_I2C_BLOCK_DATA    6
+#define I2C_SMBUS_I2C_BLOCK_BROKEN  6
 #define I2C_SMBUS_BLOCK_PROC_CALL   7           /* SMBus 2.0 */
+#define I2C_SMBUS_I2C_BLOCK_DATA    8
 
 
 /* ----- commands for the ioctl like i2c_command call: