From: Pierre Yves MORDRET <pierre-yves.mordret@st.com>
To: Phil Reid <preid@electromag.com.au>,
Wolfram Sang <wsa@the-dreams.de>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
<linux-i2c@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>
Subject: Re: [RESEND PATCH v1 6/6] i2c: i2c-stm32f7: Implement I2C recovery mechanism
Date: Mon, 19 Mar 2018 17:25:20 +0100 [thread overview]
Message-ID: <ceeba3e9-7912-c47a-02e2-f22cdaef5041@st.com> (raw)
In-Reply-To: <c9b7a9c9-4924-cadc-c539-0775aab23368@electromag.com.au>
On 03/19/2018 10:36 AM, Phil Reid wrote:
> On 12/03/2018 18:53, Pierre-Yves MORDRET wrote:
>> Feature prevents I2C lock-ups. Mechanism resets I2C state machine
>> and releases SCL/SDA signals but preserves I2C registers.
>>
>> Signed-off-by: Pierre-Yves MORDRET <pierre-yves.mordret@st.com>
>> ---
>> Version history:
>> v1:
>> * Initial
>> ---
>> ---
>> drivers/i2c/busses/i2c-stm32f7.c | 32 +++++++++++++++++++++++++++++---
>> 1 file changed, 29 insertions(+), 3 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c
>> index 69a2e5e..3808bc9 100644
>> --- a/drivers/i2c/busses/i2c-stm32f7.c
>> +++ b/drivers/i2c/busses/i2c-stm32f7.c
>> @@ -718,6 +718,20 @@ static void stm32f7_i2c_smbus_reload(struct stm32f7_i2c_dev *i2c_dev)
>> writel_relaxed(cr2, i2c_dev->base + STM32F7_I2C_CR2);
>> }
>>
>> +static int stm32f7_i2c_recover_bus(struct i2c_adapter *i2c_adap)
>> +{
>> + struct stm32f7_i2c_dev *i2c_dev = i2c_get_adapdata(i2c_adap);
>> +
>> + dev_info(i2c_dev->dev, "Trying to recover bus\n");
>> +
>> + stm32f7_i2c_clr_bits(i2c_dev->base + STM32F7_I2C_CR1,
>> + STM32F7_I2C_CR1_PE);
>
> This only "releases" the scl / sda on the stm32f7 end (outputs are hiz I guess).
> It doesn't trigger the scl clocking needed to recover a stuck device via i2c recovery
> from what I can see in the data sheet.
>
Correct. This mechanism resets the core IP and not the slave.
>
>> +
>> + stm32f7_i2c_hw_config(i2c_dev);
>
> Nothing in here either I think.
>
>
>> +
>> + return 0;
>> +}
>> +
>> static int stm32f7_i2c_wait_free_bus(struct stm32f7_i2c_dev *i2c_dev)
>> {
>> u32 status;
>> @@ -727,12 +741,18 @@ static int stm32f7_i2c_wait_free_bus(struct stm32f7_i2c_dev *i2c_dev)
>> status,
>> !(status & STM32F7_I2C_ISR_BUSY),
>> 10, 1000);
>> + if (!ret)
>> + return 0;
>> +
>> + dev_info(i2c_dev->dev, "bus busy\n");
>> +
>> + ret = i2c_recover_bus(&i2c_dev->adap);
>> if (ret) {
>> - dev_dbg(i2c_dev->dev, "bus busy\n");
>> - ret = -EBUSY;
>> + dev_err(i2c_dev->dev, "Failed to recover the bus (%d)\n", ret);
>> + return ret;
>> }
>>
>> - return ret;
>> + return -EBUSY;
>> }
>>
>> static void stm32f7_i2c_xfer_msg(struct stm32f7_i2c_dev *i2c_dev,
>> @@ -1476,6 +1496,7 @@ static irqreturn_t stm32f7_i2c_isr_error(int irq, void *data)
>> if (status & STM32F7_I2C_ISR_BERR) {
>> dev_err(dev, "<%s>: Bus error\n", __func__);
>> writel_relaxed(STM32F7_I2C_ICR_BERRCF, base + STM32F7_I2C_ICR);
>> + i2c_recover_bus(&i2c_dev->adap);
>> f7_msg->result = -EIO;
>> }
>>
>> @@ -1760,6 +1781,10 @@ static struct i2c_algorithm stm32f7_i2c_algo = {
>> .unreg_slave = stm32f7_i2c_unreg_slave,
>> };
>>
>> +static struct i2c_bus_recovery_info stm32f7_i2c_recovery_info = {
>> + .recover_bus = stm32f7_i2c_recover_bus,
>> +};
>> +
>> static int stm32f7_i2c_probe(struct platform_device *pdev)
>> {
>> struct device_node *np = pdev->dev.of_node;
>> @@ -1879,6 +1904,7 @@ static int stm32f7_i2c_probe(struct platform_device *pdev)
>> adap->algo = &stm32f7_i2c_algo;
>> adap->dev.parent = &pdev->dev;
>> adap->dev.of_node = pdev->dev.of_node;
>> + adap->bus_recovery_info = &stm32f7_i2c_recovery_info;
>>
>> init_completion(&i2c_dev->complete);
>>
>>
>
>
next prev parent reply other threads:[~2018-03-19 16:25 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-12 10:53 [RESEND PATCH v1 0/6] Add different features for I2C Pierre-Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 1/6] i2c: i2c-stm32f7: Add 10-bit address support Pierre-Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 2/6] i2c: i2c-stm32f7: Add slave support Pierre-Yves MORDRET
2018-03-17 20:51 ` Wolfram Sang
2018-03-19 8:41 ` Pierre Yves MORDRET
2018-03-20 9:52 ` Wolfram Sang
2018-03-20 10:17 ` Pierre Yves MORDRET
2018-03-21 10:47 ` Pierre Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 3/6] i2c: i2c-stm32f7: Add initial SMBus protocols support Pierre-Yves MORDRET
2018-03-13 12:52 ` [PATCH] i2c: i2c-stm32f7: fix semicolon.cocci warnings kbuild test robot
2018-03-13 12:52 ` [RESEND PATCH v1 3/6] i2c: i2c-stm32f7: Add initial SMBus protocols support kbuild test robot
2018-03-12 10:53 ` [RESEND PATCH v1 4/6] i2c: i2c-stm32: Add generic DMA API Pierre-Yves MORDRET
2018-03-12 10:53 ` [RESEND PATCH v1 5/6] i2c: i2c-stm32f7: Add DMA support Pierre-Yves MORDRET
2018-03-14 9:06 ` kbuild test robot
2018-03-12 10:53 ` [RESEND PATCH v1 6/6] i2c: i2c-stm32f7: Implement I2C recovery mechanism Pierre-Yves MORDRET
2018-03-17 20:47 ` Wolfram Sang
2018-03-19 8:51 ` Pierre Yves MORDRET
2018-03-20 9:31 ` Pierre Yves MORDRET
2018-03-20 9:42 ` Wolfram Sang
2018-03-20 9:45 ` Pierre Yves MORDRET
2018-03-19 9:36 ` Phil Reid
2018-03-19 16:25 ` Pierre Yves MORDRET [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-02-27 9:48 [RESEND PATCH v1 0/6] Add different features for I2C Pierre-Yves MORDRET
2018-02-27 9:48 ` [RESEND PATCH v1 6/6] i2c: i2c-stm32f7: Implement I2C recovery mechanism Pierre-Yves MORDRET
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=ceeba3e9-7912-c47a-02e2-f22cdaef5041@st.com \
--to=pierre-yves.mordret@st.com \
--cc=alexandre.torgue@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=preid@electromag.com.au \
--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).