From: Bitan Biswas <bbiswas@nvidia.com>
To: Laxman Dewangan <ldewangan@nvidia.com>,
Thierry Reding <treding@nvidia.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
<linux-i2c@vger.kernel.org>, <linux-tegra@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, Peter Rosin <peda@axentia.se>,
Wolfram Sang <wsa@the-dreams.de>,
Dmitry Osipenko <digetx@gmail.com>
Cc: Shardar Mohammed <smohammed@nvidia.com>,
Sowjanya Komatineni <skomatineni@nvidia.com>,
Mantravadi Karthik <mkarthik@nvidia.com>,
Bitan Biswas <bbiswas@nvidia.com>
Subject: [PATCH V5 6/7] i2c: tegra: fix PIO rx/tx residual transfer check
Date: Tue, 11 Jun 2019 03:51:13 -0700 [thread overview]
Message-ID: <1560250274-18499-6-git-send-email-bbiswas@nvidia.com> (raw)
In-Reply-To: <1560250274-18499-1-git-send-email-bbiswas@nvidia.com>
Fix expression for residual bytes(less than word) transfer
in I2C PIO mode RX/TX.
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
---
drivers/i2c/busses/i2c-tegra.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 4dfb4c1..0596c12 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -514,7 +514,8 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
* If there is a partial word at the end of buf, handle it manually to
* prevent overwriting past the end of buf
*/
- if (rx_fifo_avail > 0 && buf_remaining > 0) {
+ if (rx_fifo_avail > 0 &&
+ (buf_remaining > 0 && buf_remaining < BYTES_PER_FIFO_WORD)) {
BUG_ON(buf_remaining > 3);
val = i2c_readl(i2c_dev, I2C_RX_FIFO);
val = cpu_to_le32(val);
@@ -557,11 +558,10 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
words_to_transfer = tx_fifo_avail;
/*
- * Update state before writing to FIFO. If this casues us
+ * Update state before writing to FIFO. If this causes us
* to finish writing all bytes (AKA buf_remaining goes to 0) we
* have a potential for an interrupt (PACKET_XFER_COMPLETE is
- * not maskable). We need to make sure that the isr sees
- * buf_remaining as 0 and doesn't call us back re-entrantly.
+ * not maskable).
*/
buf_remaining -= words_to_transfer * BYTES_PER_FIFO_WORD;
tx_fifo_avail -= words_to_transfer;
@@ -580,7 +580,8 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
* prevent reading past the end of buf, which could cross a page
* boundary and fault.
*/
- if (tx_fifo_avail > 0 && buf_remaining > 0) {
+ if (tx_fifo_avail > 0 &&
+ (buf_remaining > 0 && buf_remaining < BYTES_PER_FIFO_WORD)) {
BUG_ON(buf_remaining > 3);
memcpy(&val, buf, buf_remaining);
val = le32_to_cpu(val);
--
2.7.4
next prev parent reply other threads:[~2019-06-11 10:54 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-11 10:51 [PATCH V5 1/7] i2c: tegra: clean up macros Bitan Biswas
2019-06-11 10:51 ` [PATCH V5 2/7] i2c: tegra: remove unnecessary variable init Bitan Biswas
2019-06-12 10:21 ` Wolfram Sang
2019-06-11 10:51 ` [PATCH V5 3/7] i2c: tegra: fix alignment and spacing violations Bitan Biswas
2019-06-12 10:21 ` Wolfram Sang
2019-06-11 10:51 ` [PATCH V5 4/7] i2c: tegra: add spinlock definition comment Bitan Biswas
2019-06-12 10:21 ` Wolfram Sang
2019-06-11 10:51 ` [PATCH V5 5/7] i2c: tegra: fix msleep warning Bitan Biswas
2019-06-12 10:21 ` Wolfram Sang
2019-06-11 10:51 ` Bitan Biswas [this message]
2019-06-12 10:24 ` [PATCH V5 6/7] i2c: tegra: fix PIO rx/tx residual transfer check Wolfram Sang
2019-06-13 11:43 ` Bitan Biswas
2019-06-13 11:52 ` Laxman Dewangan
2019-06-13 13:13 ` Wolfram Sang
2019-06-12 13:55 ` Dmitry Osipenko
2019-06-13 9:59 ` Bitan Biswas
2019-06-12 14:30 ` Dmitry Osipenko
2019-06-13 11:30 ` Bitan Biswas
2019-06-13 12:28 ` Dmitry Osipenko
2019-06-14 9:50 ` Bitan Biswas
2019-06-14 13:02 ` Dmitry Osipenko
2019-06-18 5:21 ` Bitan Biswas
2019-06-11 10:51 ` [PATCH V5 7/7] i2c: tegra: remove BUG, BUG_ON Bitan Biswas
2019-06-11 11:38 ` Dmitry Osipenko
2019-06-12 10:21 ` [PATCH V5 1/7] i2c: tegra: clean up macros 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=1560250274-18499-6-git-send-email-bbiswas@nvidia.com \
--to=bbiswas@nvidia.com \
--cc=digetx@gmail.com \
--cc=jonathanh@nvidia.com \
--cc=ldewangan@nvidia.com \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mkarthik@nvidia.com \
--cc=peda@axentia.se \
--cc=skomatineni@nvidia.com \
--cc=smohammed@nvidia.com \
--cc=treding@nvidia.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).