i2c: designware: prevent signals from aborting I2C transfers
Subsystems (3)
Mika Westerberg
maintainerPATCH 1/1 i2c: designware: prevent signals from aborting I2C transfers
If a process receives signal while it is waiting for I2C transfer to complete, an error is returned to the caller and the transfer is aborted. This can cause the driver to fail subsequent transfers. Also according to commit d295a86eab2 (i2c: mv64xxx: work around signals causing I2C transactions to be aborted) I2C drivers aren't supposed to abort transactions on signals.
To prevent this switch to use wait_for_completion_timeout() instead of wait_for_completion_interruptible_timeout() in the designware I2C driver.
--- drivers/i2c/busses/i2c-designware-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/i2c/busses/i2c-designware-core.c +2 -3
@@ -580,14 +580,13 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)i2c_dw_xfer_init (dev);/* wait for tx to complete */ - ret =wait_for_completion_interruptible_timeout (&dev->cmd_complete,HZ ); + ret =wait_for_completion_timeout (&dev->cmd_complete,HZ );if (ret ==0 ) {dev_err (dev->dev,"controller timed out\n" );i2c_dw_init (dev); ret = -ETIMEDOUT ; goto done; - }else if (ret <0 ) - goto done; + }if (dev->msg_err) { ret = dev->msg_err;
Signature · 1 line
1.7.10.4
Quoted 11 lines · Mika Westerberg
If a process receives signal while it is waiting for I2C transfer to complete, an error is returned to the caller and the transfer is aborted. This can cause the driver to fail subsequent transfers. Also according to commit
d295a86eab2(i2c: mv64xxx: work around signals causing I2C transactions to be aborted) I2C drivers aren't supposed to abort transactions on signals.To prevent this switch to use
wait_for_completion_timeout()instead ofwait_for_completion_interruptible_timeout()in the designware I2C driver.
Quoted 26 lines
---
drivers/i2c/busses/i2c-designware-core.c| 5 ++---1 file changed, 2 insertions(+), 3 deletions(-)drivers/i2c/busses/i2c-designware-core.c +2
-3@@ -580,14 +580,13 @@ i2c_dw_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num)i2c_dw_xfer_init (dev);/* wait for tx to complete */ - ret =wait_for_completion_interruptible_timeout (&dev->cmd_complete,HZ ); + ret =wait_for_completion_timeout (&dev->cmd_complete,HZ );if (ret ==0 ) {dev_err (dev->dev,"controller timed out\n" );i2c_dw_init (dev); ret = -ETIMEDOUT ; goto done; - }else if (ret <0 ) - goto done; + }if (dev->msg_err) { ret = dev->msg_err;
Signature · 4 lines
Christian Ruppert , <[email protected]> /| Tel: +41/(0)22 816 19-42 //| 3, Chemin du Pré-Fleuri _// | bilis Systems CH-1228 Plan-les-Ouates
Wolfram Sang
AppliedQuoted 11 lines · Mika Westerberg
If a process receives signal while it is waiting for I2C transfer to complete, an error is returned to the caller and the transfer is aborted. This can cause the driver to fail subsequent transfers. Also according to commit
d295a86eab2(i2c: mv64xxx: work around signals causing I2C transactions to be aborted) I2C drivers aren't supposed to abort transactions on signals.To prevent this switch to use
wait_for_completion_timeout()instead ofwait_for_completion_interruptible_timeout()in the designware I2C driver.Signed-off-by Mika Westerberg <[email protected]>
Applied to for-next, thanks!