| Message ID | 20201011182254.17776-2-rayagonda.kokatanur@broadcom.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fix iproc driver to handle master read request | expand |
On 10/11/2020 11:22 AM, Rayagonda Kokatanur wrote: > Handle Master aborted error by flushing tx and rx fifo > and reinitializing the hw. > > Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> > --- > drivers/i2c/busses/i2c-bcm-iproc.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c > index d8295b1c379d..834a98caeada 100644 > --- a/drivers/i2c/busses/i2c-bcm-iproc.c > +++ b/drivers/i2c/busses/i2c-bcm-iproc.c > @@ -93,6 +93,7 @@ > #define S_CMD_STATUS_MASK 0x07 > #define S_CMD_STATUS_SUCCESS 0x0 > #define S_CMD_STATUS_TIMEOUT 0x5 > +#define S_CMD_STATUS_MASTER_ABORT 0x7 > > #define IE_OFFSET 0x38 > #define IE_M_RX_FIFO_FULL_SHIFT 31 > @@ -311,9 +312,10 @@ static void bcm_iproc_i2c_check_slave_status( > return; > > val = (val >> S_CMD_STATUS_SHIFT) & S_CMD_STATUS_MASK; > - if (val == S_CMD_STATUS_TIMEOUT) { > - dev_err(iproc_i2c->device, "slave random stretch time timeout\n"); > - > + if (val == S_CMD_STATUS_TIMEOUT || val == S_CMD_STATUS_MASTER_ABORT) { > + dev_err(iproc_i2c->device, (val == S_CMD_STATUS_TIMEOUT) ? > + "slave random stretch time timeout\n" : > + "Master aborted read transaction\n"); > /* re-initialize i2c for recovery */ > bcm_iproc_i2c_enable_disable(iproc_i2c, false); > bcm_iproc_i2c_slave_init(iproc_i2c, true); > This looks fine to me. Thanks. Acked-by: Ray Jui <ray.jui@broadcom.com>
diff --git a/drivers/i2c/busses/i2c-bcm-iproc.c b/drivers/i2c/busses/i2c-bcm-iproc.c index d8295b1c379d..834a98caeada 100644 --- a/drivers/i2c/busses/i2c-bcm-iproc.c +++ b/drivers/i2c/busses/i2c-bcm-iproc.c @@ -93,6 +93,7 @@ #define S_CMD_STATUS_MASK 0x07 #define S_CMD_STATUS_SUCCESS 0x0 #define S_CMD_STATUS_TIMEOUT 0x5 +#define S_CMD_STATUS_MASTER_ABORT 0x7 #define IE_OFFSET 0x38 #define IE_M_RX_FIFO_FULL_SHIFT 31 @@ -311,9 +312,10 @@ static void bcm_iproc_i2c_check_slave_status( return; val = (val >> S_CMD_STATUS_SHIFT) & S_CMD_STATUS_MASK; - if (val == S_CMD_STATUS_TIMEOUT) { - dev_err(iproc_i2c->device, "slave random stretch time timeout\n"); - + if (val == S_CMD_STATUS_TIMEOUT || val == S_CMD_STATUS_MASTER_ABORT) { + dev_err(iproc_i2c->device, (val == S_CMD_STATUS_TIMEOUT) ? + "slave random stretch time timeout\n" : + "Master aborted read transaction\n"); /* re-initialize i2c for recovery */ bcm_iproc_i2c_enable_disable(iproc_i2c, false); bcm_iproc_i2c_slave_init(iproc_i2c, true);
Handle Master aborted error by flushing tx and rx fifo and reinitializing the hw. Signed-off-by: Rayagonda Kokatanur <rayagonda.kokatanur@broadcom.com> --- drivers/i2c/busses/i2c-bcm-iproc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)