[i2c] [PATCH] i2c: Fix i2c_smbus_read_i2c_block_data signature
Jean Delvare
khali at linux-fr.org
Fri May 11 20:31:03 CEST 2007
[Grant, can you please try using this patch and confirm that it's what
you need for your Dallas DS1682 driver?]
Let the drivers specify how many bytes they want to read with
i2c_smbus_read_i2c_block_data(). So far, the block count was
hard-coded to I2C_SMBUS_BLOCK_MAX (32), which did not make much sense.
Many driver authors complained about this before, and I believe it's
about time to fix it. Right now, authors have to do technically stupid
things, such as individual byte reads or full-fledged I2C messaging,
to work around the problem. We do not want to encourage that.
I even found that some bus drivers (e.g. i2c-amd8111) already
implemented I2C block read the "right" way, that is, they didn't
follow the old, broken standard. The fact that it was never noticed
before just shows how little i2c_smbus_read_i2c_block_data() was used,
which isn't that surprising given how broken its prototype was so far.
There are some obvious compatiblity considerations:
* This changes the i2c_smbus_read_i2c_block_data() prototype. Users
outside the kernel tree will notice at compilation time, and will
have to update their code.
* User-space has access to i2c_smbus_xfer() directly using i2c-dev, so
the change affects tools such as i2cdump. This isn't necessarily a
bad thing, as the broken i2c_smbus_read_i2c_block_data() prototype
was also hindering user-space applications, so we should update
i2c-dev.h in the same way. I've added a size check in i2c-dev to
catch and reject I2C block reads with invalid sizes. This seems to
be the best way to have people notice the change and update their
user-space code. Worst thing that can happen is a short read
(i2c_smbus_read_i2c_block_data() returning less bytes than the
caller expected), but actually I doubt any other application was
using it anyway.
Signed-off-by: Jean Delvare <khali at linux-fr.org>
---
Documentation/i2c/chips/max6875 | 2 +-
Documentation/i2c/writing-clients | 2 +-
drivers/i2c/busses/i2c-powermac.c | 3 +--
drivers/i2c/busses/i2c-viapro.c | 2 +-
drivers/i2c/busses/scx200_acb.c | 2 --
drivers/i2c/chips/eeprom.c | 5 ++++-
drivers/i2c/chips/max6875.c | 1 +
drivers/i2c/i2c-core.c | 12 +++++++-----
drivers/i2c/i2c-dev.c | 11 +++++++++++
drivers/macintosh/windfarm_smu_sat.c | 28 ++++------------------------
include/linux/i2c.h | 2 +-
11 files changed, 32 insertions(+), 38 deletions(-)
--- linux-2.6.21-git.orig/drivers/i2c/i2c-core.c 2007-05-11 09:48:18.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/i2c-core.c 2007-05-11 13:58:42.000000000 +0200
@@ -1330,10 +1330,14 @@ s32 i2c_smbus_write_block_data(struct i2
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))
@@ -1454,7 +1458,7 @@ static s32 i2c_smbus_xfer_emulated(struc
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) {
@@ -1510,9 +1514,7 @@ static s32 i2c_smbus_xfer_emulated(struc
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:
--- linux-2.6.21-git.orig/Documentation/i2c/chips/max6875 2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-git/Documentation/i2c/chips/max6875 2007-05-11 11:52:39.000000000 +0200
@@ -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.
--- linux-2.6.21-git.orig/Documentation/i2c/writing-clients 2007-05-11 09:48:08.000000000 +0200
+++ linux-2.6.21-git/Documentation/i2c/writing-clients 2007-05-11 11:50:43.000000000 +0200
@@ -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:
--- linux-2.6.21-git.orig/drivers/i2c/chips/eeprom.c 2007-04-26 18:29:52.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/chips/eeprom.c 2007-05-11 11:49:55.000000000 +0200
@@ -89,7 +89,10 @@ static void eeprom_update_client(struct
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)
+ if (i2c_smbus_read_i2c_block_data(client, i,
+ I2C_SMBUS_BLOCK_MAX,
+ data->data + i)
+ != I2C_SMBUS_BLOCK_MAX)
goto exit;
} else {
if (i2c_smbus_write_byte(client, slice << 5)) {
--- linux-2.6.21-git.orig/drivers/i2c/chips/max6875.c 2007-02-04 19:44:54.000000000 +0100
+++ linux-2.6.21-git/drivers/i2c/chips/max6875.c 2007-05-11 11:48:34.000000000 +0200
@@ -106,6 +106,7 @@ static void max6875_update_slice(struct
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;
}
--- linux-2.6.21-git.orig/include/linux/i2c.h 2007-05-11 09:57:13.000000000 +0200
+++ linux-2.6.21-git/include/linux/i2c.h 2007-05-11 11:47:13.000000000 +0200
@@ -90,7 +90,7 @@ extern s32 i2c_smbus_write_block_data(st
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);
--- linux-2.6.21-git.orig/drivers/macintosh/windfarm_smu_sat.c 2007-05-11 09:48:23.000000000 +0200
+++ linux-2.6.21-git/drivers/macintosh/windfarm_smu_sat.c 2007-05-11 15:43:41.000000000 +0200
@@ -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_
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_s
{
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
--- linux-2.6.21-git.orig/drivers/i2c/busses/i2c-powermac.c 2007-04-26 18:29:52.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/busses/i2c-powermac.c 2007-05-11 15:57:25.000000000 +0200
@@ -121,8 +121,7 @@ static s32 i2c_powermac_smbus_xfer( stru
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:
--- linux-2.6.21-git.orig/drivers/i2c/busses/i2c-viapro.c 2007-05-11 09:48:18.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/busses/i2c-viapro.c 2007-05-11 13:51:48.000000000 +0200
@@ -235,7 +235,7 @@ static s32 vt596_access(struct i2c_adapt
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);
--- linux-2.6.21-git.orig/drivers/i2c/busses/scx200_acb.c 2007-05-11 09:57:15.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/busses/scx200_acb.c 2007-05-11 13:55:15.000000000 +0200
@@ -310,8 +310,6 @@ static s32 scx200_acb_smbus_xfer(struct
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;
--- linux-2.6.21-git.orig/drivers/i2c/i2c-dev.c 2007-05-11 09:48:18.000000000 +0200
+++ linux-2.6.21-git/drivers/i2c/i2c-dev.c 2007-05-11 16:46:22.000000000 +0200
@@ -329,10 +329,21 @@ static int i2cdev_ioctl(struct inode *in
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_DATA) &&
+ ((data_arg.data->block[0] == 0) ||
+ (data_arg.data->block[0] > I2C_SMBUS_BLOCK_MAX))) {
+ dev_err(&client->adapter->dev,
+ "Invalid I2C block length (%d) in ioctl I2C_SMBUS\n",
+ (int)data_arg.data->block[0]);
+ dev_err(&client->adapter->dev,
+ "Fix your application!\n");
+ return -EFAULT;
+ }
res = i2c_smbus_xfer(client->adapter,client->addr,client->flags,
data_arg.read_write,
data_arg.command,data_arg.size,&temp);
--
Jean Delvare
More information about the i2c
mailing list