From: Pierre Yves MORDRET <pierre-yves.mordret@st.com>
To: Fabrice Gasnier <fabrice.gasnier@st.com>, <wsa@the-dreams.de>
Cc: alexandre.torgue@st.com, linux-kernel@vger.kernel.org,
alain.volmat@st.com, linux-i2c@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH] i2c: i2c-stm32f7: fix a race in slave mode with arbitration loss irq
Date: Tue, 1 Oct 2019 14:21:16 +0200 [thread overview]
Message-ID: <e30de80a-6ecd-a2a6-8742-8dcdd1c3253c@st.com> (raw)
In-Reply-To: <1569919869-3218-1-git-send-email-fabrice.gasnier@st.com>
Hi
Reviewed-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
Thx
On 10/1/19 10:51 AM, Fabrice Gasnier wrote:
> 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: 60d609f30de2 ("i2c: i2c-stm32f7: Add slave support")
>
> Signed-off-by: Fabrice Gasnier <fabrice.gasnier@st.com>
> ---
> drivers/i2c/busses/i2c-stm32f7.c | 17 ++++++++++-------
> 1 file changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
> index 266d1c2..3a8ab0c 100644
> --- a/drivers/i2c/busses/i2c-stm32f7.c
> +++ b/drivers/i2c/busses/i2c-stm32f7.c
> @@ -1501,7 +1501,7 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data)
> void __iomem *base = i2c_dev->base;
> struct device *dev = i2c_dev->dev;
> struct stm32_i2c_dma *dma = i2c_dev->dma;
> - u32 mask, status;
> + u32 status;
>
> status = readl_relaxed(i2c_dev->base + STM32F7_I2C_ISR);
>
> @@ -1526,12 +1526,15 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data)
> f7_msg->result = -EINVAL;
> }
>
> - /* Disable interrupts */
> - if (stm32f7_i2c_is_slave_registered(i2c_dev))
> - mask = STM32F7_I2C_XFER_IRQ_MASK;
> - else
> - mask = STM32F7_I2C_ALL_IRQ_MASK;
> - stm32f7_i2c_disable_irq(i2c_dev, mask);
> + if (!i2c_dev->slave_running) {
> + u32 mask;
> + /* Disable interrupts */
> + if (stm32f7_i2c_is_slave_registered(i2c_dev))
> + mask = STM32F7_I2C_XFER_IRQ_MASK;
> + else
> + mask = STM32F7_I2C_ALL_IRQ_MASK;
> + stm32f7_i2c_disable_irq(i2c_dev, mask);
> + }
>
> /* Disable dma */
> if (i2c_dev->use_dma) {
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-10-01 12:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-01 8:51 [PATCH] i2c: i2c-stm32f7: fix a race in slave mode with arbitration loss irq Fabrice Gasnier
2019-10-01 12:21 ` Pierre Yves MORDRET [this message]
2019-10-15 12:21 ` Fabrice Gasnier
2019-10-21 13:59 ` Wolfram Sang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e30de80a-6ecd-a2a6-8742-8dcdd1c3253c@st.com \
--to=pierre-yves.mordret@st.com \
--cc=alain.volmat@st.com \
--cc=alexandre.torgue@st.com \
--cc=fabrice.gasnier@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).