i2c: omap: fix NACK and Arbitration Lost irq handling
commit1d7afc9594
(i2c: omap: ack IRQ in parts) changed the interrupt handler to complete transfers without clearing XRDY (AL case) and ARDY (NACK case) flags. XRDY or ARDY interrupts will be fired again. As a result, ISR keep processing transfer after it was already complete (from the driver code point of view). A didn't see real impacts of the1d7afc9
, but it is really bad idea to have ISR running on user data after transfer was complete. It looks, what1d7afc9
violate TI specs in what how AL and NACK should be handled (see Note 1, sprugn4r, Figure 17-31 and Figure 17-32). According to specs (if I understood correctly), in case of NACK and AL driver must reset NACK, AL, ARDY, RDR, and RRDY (Master Receive Mode), and NACK, AL, ARDY, and XDR (Master Transmitter Mode). All that is done down the code under the if condition: if (stat & (OMAP_I2C_STAT_ARDY | OMAP_I2C_STAT_NACK | OMAP_I2C_STAT_AL)) ... The patch restore pre1d7afc9
logic of handling NACK and AL interrupts, so no interrupts is fired after ISR informs the rest of driver what transfer complete. Note: instead of removing break under NACK case, we could just replace 'break' with 'continue' and allow NACK transfer to finish using ARDY event. I found that NACK and ARDY bits usually set together. That case confirm TI wiki: http://processors.wiki.ti.com/index.php/I2C_Tips#Detecting_and_handling_NACK In order if someone interested in the event traces for NACK and AL cases, I sent them to mailing list. Tested on Beagleboard XM C. Signed-off-by: Alexander Kochetkov <al.kochet@gmail.com> Fixes:1d7afc9
i2c: omap: ack IRQ in parts Cc: <stable@vger.kernel.org> # v3.7+ Acked-by: Felipe Balbi <balbi@ti.com> Tested-by: Aaro Koskinen <aaro.koskinen@iki.fi> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
This commit is contained in:
parent
206c5f60a3
commit
27caca9d2e
|
@ -922,14 +922,12 @@ omap_i2c_isr_thread(int this_irq, void *dev_id)
|
||||||
if (stat & OMAP_I2C_STAT_NACK) {
|
if (stat & OMAP_I2C_STAT_NACK) {
|
||||||
err |= OMAP_I2C_STAT_NACK;
|
err |= OMAP_I2C_STAT_NACK;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_NACK);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (stat & OMAP_I2C_STAT_AL) {
|
if (stat & OMAP_I2C_STAT_AL) {
|
||||||
dev_err(dev->dev, "Arbitration lost\n");
|
dev_err(dev->dev, "Arbitration lost\n");
|
||||||
err |= OMAP_I2C_STAT_AL;
|
err |= OMAP_I2C_STAT_AL;
|
||||||
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
|
omap_i2c_ack_stat(dev, OMAP_I2C_STAT_AL);
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue