| Message ID | 20180723202617.15230-3-wsa+renesas@sang-engineering.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | i2c: quirks: add zero length checks and update drivers | expand |
On 07/23/2018 11:26 PM, Wolfram Sang wrote: > And don't reimplement in the driver. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > --- > > Only build tested. > > drivers/i2c/busses/i2c-designware-master.c | 12 +++++------- > 1 file changed, 5 insertions(+), 7 deletions(-) > I tested this with patch 1 and I like it since with these patches the test is done before firing up the HW, waiting for an interrupt and then see the length is invalid for us. i2ctransfer -f 8 r0@0x10 Before (with i2c_designware debugging on): [ 15.607283] i2c_designware i2c_designware.1: i2c_dw_xfer: msgs: 1 [ 15.711988] i2c_designware i2c_designware.1: enabled=0x1 stat=0x10 [ 15.712002] i2c_designware i2c_designware.1: i2c_dw_xfer_msg: invalid message length Error: Sending messages failed: Invalid argument After: [ 25.838661] i2c i2c-8: adapter quirk: no zero length (addr 0x0010, size 0, read) Error: Sending messages failed: Operation not supported Tested-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
On Mon, Jul 23, 2018 at 10:26:06PM +0200, Wolfram Sang wrote: > And don't reimplement in the driver. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-designware-master.c b/drivers/i2c/busses/i2c-designware-master.c index fc7c255c80af..a1717bff06a8 100644 --- a/drivers/i2c/busses/i2c-designware-master.c +++ b/drivers/i2c/busses/i2c-designware-master.c @@ -274,13 +274,6 @@ i2c_dw_xfer_msg(struct dw_i2c_dev *dev) break; } - if (msgs[dev->msg_write_idx].len == 0) { - dev_err(dev->dev, - "%s: invalid message length\n", __func__); - dev->msg_err = -EINVAL; - break; - } - if (!(dev->status & STATUS_WRITE_IN_PROGRESS)) { /* new i2c_msg */ buf = msgs[dev->msg_write_idx].buf; @@ -523,6 +516,10 @@ static const struct i2c_algorithm i2c_dw_algo = { .functionality = i2c_dw_func, }; +static const struct i2c_adapter_quirks i2c_dw_quirks = { + .flags = I2C_AQ_NO_ZERO_LEN, +}; + static u32 i2c_dw_read_clear_intrbits(struct dw_i2c_dev *dev) { u32 stat; @@ -718,6 +715,7 @@ int i2c_dw_probe(struct dw_i2c_dev *dev) "Synopsys DesignWare I2C adapter"); adap->retries = 3; adap->algo = &i2c_dw_algo; + adap->quirks = &i2c_dw_quirks; adap->dev.parent = dev->dev; i2c_set_adapdata(adap, dev);
And don't reimplement in the driver. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Only build tested. drivers/i2c/busses/i2c-designware-master.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)