Skip to content

Commit 6d6b0d0

Browse files
Fabrice GasnierWolfram Sang
authored andcommitted
i2c: stm32f7: fix a race in slave mode with arbitration loss irq
When in slave mode, an arbitration loss (ARLO) may be detected before the slave had a chance to detect the stop condition (STOPF in ISR). This is seen when two master + slave adapters switch their roles. It provokes the i2c bus to be stuck, busy as SCL line is stretched. - the I2C_SLAVE_STOP event is never generated due to STOPF flag is set but don't generate an irq (race with ARLO irq, STOPIE is masked). STOPF flag remains set until next master xfer (e.g. when STOPIE irq get unmasked). In this case, completion is generated too early: immediately upon new transfer request (then it doesn't send all data). - Some data get stuck in TXDR register. As a consequence, the controller stretches the SCL line: the bus gets busy until a future master transfer triggers the bus busy / recovery mechanism (this can take time... and may never happen at all) So choice is to let the STOPF being detected by the slave isr handler, to properly handle this stop condition. E.g. don't mask IRQs in error handler, when the slave is running. Fixes: 60d609f ("i2c: i2c-stm32f7: Add slave support") Signed-off-by: Fabrice Gasnier <[email protected]> Reviewed-by: Pierre-Yves MORDRET <[email protected]> Signed-off-by: Wolfram Sang <[email protected]>
1 parent 02e6427 commit 6d6b0d0

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

drivers/i2c/busses/i2c-stm32f7.c

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1503,7 +1503,7 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data)
15031503
void __iomem *base = i2c_dev->base;
15041504
struct device *dev = i2c_dev->dev;
15051505
struct stm32_i2c_dma *dma = i2c_dev->dma;
1506-
u32 mask, status;
1506+
u32 status;
15071507

15081508
status = readl_relaxed(i2c_dev->base + STM32F7_I2C_ISR);
15091509

@@ -1528,12 +1528,15 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data)
15281528
f7_msg->result = -EINVAL;
15291529
}
15301530

1531-
/* Disable interrupts */
1532-
if (stm32f7_i2c_is_slave_registered(i2c_dev))
1533-
mask = STM32F7_I2C_XFER_IRQ_MASK;
1534-
else
1535-
mask = STM32F7_I2C_ALL_IRQ_MASK;
1536-
stm32f7_i2c_disable_irq(i2c_dev, mask);
1531+
if (!i2c_dev->slave_running) {
1532+
u32 mask;
1533+
/* Disable interrupts */
1534+
if (stm32f7_i2c_is_slave_registered(i2c_dev))
1535+
mask = STM32F7_I2C_XFER_IRQ_MASK;
1536+
else
1537+
mask = STM32F7_I2C_ALL_IRQ_MASK;
1538+
stm32f7_i2c_disable_irq(i2c_dev, mask);
1539+
}
15371540

15381541
/* Disable dma */
15391542
if (i2c_dev->use_dma) {

0 commit comments

Comments
 (0)