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 V1 6/6] i2c: tegra: remove BUG, BUG_ON
Date: Fri, 7 Jun 2019 04:55:07 -0700 [thread overview]
Message-ID: <1559908507-31192-6-git-send-email-bbiswas@nvidia.com> (raw)
In-Reply-To: <1559908507-31192-1-git-send-email-bbiswas@nvidia.com>
Remove redundant BUG_ON calls or replace with WARN_ON_ONCE
as needed. Replace BUG() with error handling code.
Define I2C_ERR_UNEXPECTED_STATUS for error handling.
Signed-off-by: Bitan Biswas <bbiswas@nvidia.com>
---
drivers/i2c/busses/i2c-tegra.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 4dfb4c1..c407bd7 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -73,6 +73,7 @@
#define I2C_ERR_NO_ACK BIT(0)
#define I2C_ERR_ARBITRATION_LOST BIT(1)
#define I2C_ERR_UNKNOWN_INTERRUPT BIT(2)
+#define I2C_ERR_UNEXPECTED_STATUS BIT(3)
#define PACKET_HEADER0_HEADER_SIZE_SHIFT 28
#define PACKET_HEADER0_PACKET_ID_SHIFT 16
@@ -515,7 +516,6 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
* prevent overwriting past the end of buf
*/
if (rx_fifo_avail > 0 && buf_remaining > 0) {
- BUG_ON(buf_remaining > 3);
val = i2c_readl(i2c_dev, I2C_RX_FIFO);
val = cpu_to_le32(val);
memcpy(buf, &val, buf_remaining);
@@ -523,7 +523,6 @@ static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
rx_fifo_avail--;
}
- BUG_ON(rx_fifo_avail > 0 && buf_remaining > 0);
i2c_dev->msg_buf_remaining = buf_remaining;
i2c_dev->msg_buf = buf;
@@ -581,7 +580,6 @@ static int tegra_i2c_fill_tx_fifo(struct tegra_i2c_dev *i2c_dev)
* boundary and fault.
*/
if (tx_fifo_avail > 0 && buf_remaining > 0) {
- BUG_ON(buf_remaining > 3);
memcpy(&val, buf, buf_remaining);
val = le32_to_cpu(val);
@@ -847,10 +845,13 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
if (!i2c_dev->is_curr_dma_xfer) {
if (i2c_dev->msg_read && (status & I2C_INT_RX_FIFO_DATA_REQ)) {
- if (i2c_dev->msg_buf_remaining)
+ if (i2c_dev->msg_buf_remaining) {
tegra_i2c_empty_rx_fifo(i2c_dev);
- else
- BUG();
+ } else {
+ dev_err(i2c_dev->dev, "unexpected rx data request\n");
+ i2c_dev->msg_err |= I2C_ERR_UNEXPECTED_STATUS;
+ goto err;
+ }
}
if (!i2c_dev->msg_read && (status & I2C_INT_TX_FIFO_DATA_REQ)) {
@@ -876,7 +877,7 @@ static irqreturn_t tegra_i2c_isr(int irq, void *dev_id)
if (status & I2C_INT_PACKET_XFER_COMPLETE) {
if (i2c_dev->is_curr_dma_xfer)
i2c_dev->msg_buf_remaining = 0;
- BUG_ON(i2c_dev->msg_buf_remaining);
+ WARN_ON_ONCE(i2c_dev->msg_buf_remaining);
complete(&i2c_dev->msg_complete);
}
goto done;
--
2.7.4
next prev parent reply other threads:[~2019-06-07 11:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 11:55 [PATCH V1 1/6] i2c: tegra: clean up macros Bitan Biswas
2019-06-07 11:55 ` [PATCH V1 2/6] i2c: tegra: remove unnecessary variable init Bitan Biswas
2019-06-07 12:03 ` Dmitry Osipenko
2019-06-07 11:55 ` [PATCH V1 3/6] i2c: tegra: fix alignment and spacing violations Bitan Biswas
2019-06-07 12:04 ` Dmitry Osipenko
2019-06-07 11:55 ` [PATCH V1 4/6] i2c: tegra: add spinlock definition comment Bitan Biswas
2019-06-07 12:04 ` Dmitry Osipenko
2019-06-07 11:55 ` [PATCH V1 5/6] i2c: tegra: fix msleep warning Bitan Biswas
2019-06-07 12:05 ` Dmitry Osipenko
2019-06-07 11:55 ` Bitan Biswas [this message]
2019-06-07 12:08 ` [PATCH V1 6/6] i2c: tegra: remove BUG, BUG_ON Dmitry Osipenko
2019-06-07 12:12 ` Dmitry Osipenko
2019-06-07 12:18 ` Dmitry Osipenko
2019-06-07 18:55 ` Bitan Biswas
2019-06-07 19:24 ` Bitan Biswas
2019-06-07 12:03 ` [PATCH V1 1/6] i2c: tegra: clean up macros Dmitry Osipenko
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=1559908507-31192-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).