i2c: Make test for force on client probe possible
PATCH 1/1 i2c: Make test for force on client probe possible
Hi,
in new driver model 'kind' is no more provided for client's probe function. The driver frame work creates the path sys/bus/i2c/devices/[bus]-[dev]/ and populates it with the entries modalias, name, subsystem@ and uevent. If probe fails (because the device is not on bus at the moment) the client's sysFs-entries are not created, but the entries above remain.
This patch provides means to get modules force parameter in probe function. Clients should test and create entries despite test fail. Of course entry callbacks should return -EIO as long as device stays unreachable.
--- drivers/i2c/i2c-core.c | 29 ++ include/linux/i2c.h | 2 + 2 files changed, 31 insertions(+), 0 deletion(-)
--- linux-2.6.28.7_org/drivers/i2c/i2c-core.c 2009-02-20
23:41:27.000000000 +0100
+++ linux-2.6.28.7/drivers/i2c/i2c-core.c 2009-03-12
13:08:35.000000000 +0100
@@ -323,6 +323,34 @@
}
EXPORT_SYMBOL_GPL(i2c_unregister_device);
+int i2c_client_is_forced (struct i2c_client *client) +{
+ int forced = 0;
+
+ if (client->driver->address_data->forces) {
+ int adap_id = i2c_adapter_id(client->adapter);
+ const unsigned short * const *forces =client->driver->address_data->forces;
+ int kind, i;
+
+ for (kind = 0; forces[kind]; kind++) {
+ for (i = 0; forces[kind][i] != I2C_CLIENT_END;
+ i += 2) {
+ if ((forces[kind][i] == adap_id
+ || forces[kind][i] == ANY_I2C_BUS)
+ && forces[kind][i+1] == client->addr) {
+ dev_dbg(&client->dev, "forced "
+ "probe for adapter %d, " + "addr 0x%02x, kind %d\n", + adap_id, forces[kind][i
+ 1],
+ kind);
+ forced = 1;
+ }
+ }
+ }
+ }
+ return forced;
+}
+EXPORT_SYMBOL_GPL(i2c_client_is_forced);
static const struct i2c_device_id dummy_id[] = {
{ "dummy", 0 },--- linux-2.6.28.7_org/include/linux/i2c.h 2009-02-20
23:41:27.000000000 +0100
+++ linux-2.6.28.7/include/linux/i2c.h 2009-03-13 11:07:43.000000000 +0100 @@ -301,6 +301,8 @@
extern void i2c_unregister_device(struct i2c_client *);
+extern int i2c_client_is_forced(struct i2c_client *client);
+
/* Mainboard arch_initcall() code should register all its I2C devices.
* This is done at arch_initcall time, before declaring any i2c adapters.
* Modules for add-on boards must use other calls.
Hi Michael,
I don't know how you sent this mail, but that's not OK. If you intend to do kernel development, you have to use a real e-mail addresses all along the way.
Quoted 6 lines · Michael Lawnick
in new driver model 'kind' is no more provided for client's probe function. The driver frame work creates the path sys/bus/i2c/devices/[bus]-[dev]/ and populates it with the entries modalias, name, subsystem@ and uevent. If probe fails (because the device is not on bus at the moment) the client's sysFs-entries are not created, but the entries above remain.
This is correct, and this is by design. This is how the Linux device driver model works, BTW, nothing i2c-specific there.
Quoted 4 lines
This patch provides means to get modules force parameter in probe function. Clients should test and create entries despite test fail. Of course entry callbacks should return
-EIOas long as device stays unreachable.
Nack. You are abusing the model to start with, and now you want to add an API to make this abuse more comfortable. This isn't going to happen, sorry. You are not supposed to use force module parameters on devices which are not present. The only purpose of these parameters is to let one force a driver to bind to a device which isn't explicitly supported by is known to be compatible. And if it is really compatible, the probe() function will succeed.
Note that these module parameters (force, ignore, etc.) are scheduled for middle-term removal. Once the sysfs interface to instantiate devices is implemented (we have already discussed about it), they will be redundant so we will be able to remove them (and good riddance.)
Quoted 2 lines
Cc Jean Delvare <khali-PUYAD+kWke1g9hUCZPvPmw-XMD5yJDbdMReXY1tMh2IBg@public.gmane.org>
Nice try, but no.
Quoted 25 lines
--- drivers/i2c/i2c-core.c | 29 ++ include/linux/i2c.h | 2 + 2 files changed, 31 insertions(+), 0 deletion(-)---
linux-2.6.28.7_org/drivers/i2c/i2c-core.c2009-02-20
23:41:27.000000000 +0100
+++linux-2.6.28.7/drivers/i2c/i2c-core.c2009-03-12
13:08:35.000000000 +0100(quoted diff) +11
-0@@ -323,6 +323,34 @@ } EXPORT_SYMBOL_GPL(i2c_unregister_device); +int i2c_client_is_forced (struct i2c_client *client) +{ + int forced = 0; + + if (client->driver->address_data->forces) { + int adap_id = i2c_adapter_id(client->adapter); + const unsigned short * const *forces = client->driver->address_data->forces; + int kind, i; + + for (kind = 0; forces[kind]; kind++) { + for (i = 0; forces[kind][i] != I2C_CLIENT_END;
Review line 347
Quoted 10 lines
(quoted diff) +10
-0+ i += 2) { + if ((forces[kind][i] == adap_id + || forces[kind][i] == ANY_I2C_BUS) + && forces[kind][i+1] == client->addr) { + dev_dbg(&client->dev, "forced " + "probe for adapter %d, " + "addr 0x%02x, kind %d\n", + adap_id, forces[kind][i + 1], + kind);
What a nicely formatted piece of code ;)
Quoted 25 lines
(quoted diff) +8
-1+ forced = 1; + } + } + } + } + return forced; +} +EXPORT_SYMBOL_GPL(i2c_client_is_forced); static const struct i2c_device_id dummy_id[] = { { "dummy", 0 }, --- linux-2.6.28.7_org/include/linux/i2c.h 2009-02-2023:41:27.000000000 +0100
+++linux-2.6.28.7/include/linux/i2c.h2009-03-13 11:07:43.000000000 +0100(quoted diff) +2
-0@@ -301,6 +301,8 @@ extern void i2c_unregister_device(struct i2c_client *); +extern int i2c_client_is_forced(struct i2c_client *client); + /* Mainboard arch_initcall() code should register all its I2C devices. * This is done at arch_initcall time, before declaring any i2c adapters. * Modules for add-on boards must use other calls.
Signature · 1 line
Jean Delvare
Sorry for the delay, had to fix a bug in u-boot...
Jean Delvare said the following:
Quoted 6 lines
Hi Michael,
I don't know how you sent this mail, but that's not OK. If you intend to do kernel development, you have to use a real e-mail addresses all along the way.
Discussed in PM.
Quoted 11 lines · Michael Lawnick
Quoted 6 lines
in new driver model 'kind' is no more provided for client's probe function. The driver frame work creates the path sys/bus/i2c/devices/[bus]-[dev]/ and populates it with the entries modalias, name, subsystem@ and uevent. If probe fails (because the device is not on bus at the moment) the client's sysFs-entries are not created, but the entries above remain.
This is correct, and this is by design. This is how the Linux device driver model works, BTW, nothing i2c-specific there.
Even if this is by (current linux) design, I think it is not ok ;-) It leaves an inconsistent (not instable) system. IMHO either the entries should be completely removed or completely created but not that half the way.
Should we CC another list?
Signature · 2 lines
Regards, Michael
Quoted 9 lines · Michael Lawnick
Jean Delvare said the following:
Quoted 8 lines · Michael Lawnick
Quoted 6 lines
in new driver model 'kind' is no more provided for client's probe function. The driver frame work creates the path sys/bus/i2c/devices/[bus]-[dev]/ and populates it with the entries modalias, name, subsystem@ and uevent. If probe fails (because the device is not on bus at the moment) the client's sysFs-entries are not created, but the entries above remain.
Quoted 8 lines
Quoted 2 lines
This is correct, and this is by design. This is how the Linux device driver model works, BTW, nothing i2c-specific there.
Even if this is by (current linux) design, I think it is not ok ;-) It leaves an inconsistent (not instable) system. IMHO either the entries should be completely removed or completely created but not that half the way.
Should we CC another list?
Feel free to go discuss this on LKML, but don't even bother Cc'ing me. I really do not have time to waste on a discussion which will not lead anywhere. I don't mean to offend you here but really, the Linux 2.6 device driver model has been carefully designed and has proved its strength for 5 years or so, and it's not going to be changed just to please your expectations.
The only thing I would blame the model for is that the probe() and remove() methods should really have been named bind() and unbind(). Other than that it's really great.
Signature · 1 line
Jean Delvare