From khali@linux-fr.org Tue Aug 9 11:32:42 2005
Date: Tue, 9 Aug 2005 20:28:10 +0200
From: Jean Delvare <khali@linux-fr.org>
To: Greg KH <greg@kroah.com>
Subject: [PATCH 2.6] I2C: Centralize 24RF08 corruption prevention
Message-Id: <20050809202810.692bf808.khali@linux-fr.org>
The 24RF08 corruption would better be prevented at i2c-core level than
at chip driver level, for several reasons:
* The second quick write should happen as soon as possible after the
first one, so as to limit the risk that another command is issued on
the bus inbetween, causing the corruption.
* As a matter of fact, the protection code at driver level was reworked
at least three times already, which proves how hard it is to get it
right there, while it's straightforward at i2c-core level.
* It's easy to add a new driver that would need the protection, and
forget to add it. This did happen already.
* As additional probing addresses can be passed to most i2c chip drivers
as module parameters, virtually every i2c chip driver would need the
protection if we want to be really safe.
* Why duplicate code when we can easily avoid it?
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
Documentation/i2c/porting-clients | 2 ++
drivers/i2c/chips/eeprom.c | 5 -----
drivers/i2c/chips/max6875.c | 5 -----
drivers/i2c/i2c-core.c | 13 ++++++++++---
4 files changed, 12 insertions(+), 13 deletions(-)
--- gregkh-2.6.orig/Documentation/i2c/porting-clients 2005-08-09 14:34:14.000000000 -0700
+++ gregkh-2.6/Documentation/i2c/porting-clients 2005-08-09 16:41:34.000000000 -0700
@@ -90,6 +90,8 @@
device_create_file. Move the driver initialization before any
sysfs file creation.
Drop client->id.
+ Drop any 24RF08 corruption prevention you find, as this is now done
+ at the i2c-core level, and doing it twice voids it.
* [Init] Limits must not be set by the driver (can be done later in
user-space). Chip should not be reset default (although a module
--- gregkh-2.6.orig/drivers/i2c/chips/eeprom.c 2005-08-09 14:34:13.000000000 -0700
+++ gregkh-2.6/drivers/i2c/chips/eeprom.c 2005-08-09 16:41:34.000000000 -0700
@@ -161,11 +161,6 @@
struct eeprom_data *data;
int err = 0;
- /* prevent 24RF08 corruption */
- if (kind < 0)
- i2c_smbus_xfer(adapter, address, 0, 0, 0,
- I2C_SMBUS_QUICK, NULL);
-
/* There are three ways we can read the EEPROM data:
(1) I2C block reads (faster, but unsupported by most adapters)
(2) Consecutive byte reads (100% overhead)
--- gregkh-2.6.orig/drivers/i2c/chips/max6875.c 2005-08-09 14:34:13.000000000 -0700
+++ gregkh-2.6/drivers/i2c/chips/max6875.c 2005-08-09 16:41:57.000000000 -0700
@@ -171,11 +171,6 @@
struct max6875_data *data;
int err = 0;
- /* Prevent 24rf08 corruption (in case of user error) */
- if (kind < 0)
- i2c_smbus_xfer(adapter, address, 0, 0, 0,
- I2C_SMBUS_QUICK, NULL);
-
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_BYTE_DATA
| I2C_FUNC_SMBUS_READ_BYTE))
return 0;
--- gregkh-2.6.orig/drivers/i2c/i2c-core.c 2005-08-09 16:41:04.000000000 -0700
+++ gregkh-2.6/drivers/i2c/i2c-core.c 2005-08-09 16:41:34.000000000 -0700
@@ -679,9 +679,16 @@
return 0;
/* Make sure there is something at this address, unless forced */
- if (kind < 0
- && i2c_smbus_xfer(adapter, addr, 0, 0, 0, I2C_SMBUS_QUICK, NULL) < 0)
- return 0;
+ if (kind < 0) {
+ if (i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+ I2C_SMBUS_QUICK, NULL) < 0)
+ return 0;
+
+ /* prevent 24RF08 corruption */
+ if ((addr & ~0x0f) == 0x50)
+ i2c_smbus_xfer(adapter, addr, 0, 0, 0,
+ I2C_SMBUS_QUICK, NULL);
+ }
/* Finally call the custom detection function */
err = found_proc(adapter, addr, kind);