From: Tali Perry <tali.perry1@gmail.com>
To: kunyi@google.com, xqiu@google.com, benjaminfair@google.com,
avifishman70@gmail.com, joel@jms.id.au, tmaimon77@gmail.com,
wsa@the-dreams.de
Cc: linux-i2c@vger.kernel.org, openbmc@lists.ozlabs.org,
linux-kernel@vger.kernel.org, Tali Perry <tali.perry1@gmail.com>
Subject: [PATCH v2] i2c: npcm7xx: bug fix timeout (usec instead of msec)
Date: Sun, 30 Aug 2020 15:20:51 +0300 [thread overview]
Message-ID: <20200830122051.197892-1-tali.perry1@gmail.com> (raw)
i2c: npcm7xx: bug fix timeout (usec instead of msec)
Signed-off-by: Tali Perry <tali.perry1@gmail.com>
---
drivers/i2c/busses/i2c-npcm7xx.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-npcm7xx.c b/drivers/i2c/busses/i2c-npcm7xx.c
index 75f07138a6fa..abb334492a3d 100644
--- a/drivers/i2c/busses/i2c-npcm7xx.c
+++ b/drivers/i2c/busses/i2c-npcm7xx.c
@@ -2093,8 +2093,13 @@ static int npcm_i2c_master_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
}
}
- /* Adaptive TimeOut: astimated time in usec + 100% margin */
- timeout_usec = (2 * 10000 / bus->bus_freq) * (2 + nread + nwrite);
+ /*
+ * Adaptive TimeOut: estimated time in usec + 100% margin:
+ * 2: double the timeout for clock stretching case
+ * 9: bits per transaction (including the ack/nack)
+ * 1000000: micro second in a second
+ */
+ timeout_usec = (2 * 9 * 1000000 / bus->bus_freq) * (2 + nread + nwrite);
timeout = max(msecs_to_jiffies(35), usecs_to_jiffies(timeout_usec));
if (nwrite >= 32 * 1024 || nread >= 32 * 1024) {
dev_err(bus->dev, "i2c%d buffer too big\n", bus->num);
base-commit: d012a7190fc1fd72ed48911e77ca97ba4521bccd
--
2.22.0
next reply other threads:[~2020-08-30 12:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-30 12:20 Tali Perry [this message]
2020-08-30 12:47 ` [PATCH v2] i2c: npcm7xx: bug fix timeout (usec instead of msec) Avi Fishman
2020-08-30 18:01 ` Andy Shevchenko
2020-08-31 7:57 ` Avi Fishman
2020-08-31 12:03 ` Avi Fishman
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=20200830122051.197892-1-tali.perry1@gmail.com \
--to=tali.perry1@gmail.com \
--cc=avifishman70@gmail.com \
--cc=benjaminfair@google.com \
--cc=joel@jms.id.au \
--cc=kunyi@google.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=openbmc@lists.ozlabs.org \
--cc=tmaimon77@gmail.com \
--cc=wsa@the-dreams.de \
--cc=xqiu@google.com \
/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