From: Dmitry Osipenko <digetx@gmail.com>
To: "Thierry Reding" <thierry.reding@gmail.com>,
"Jonathan Hunter" <jonathanh@nvidia.com>,
"Laxman Dewangan" <ldewangan@nvidia.com>,
"Wolfram Sang" <wsa@the-dreams.de>,
"Michał Mirosław" <mirq-linux@rere.qmqm.pl>,
"Andy Shevchenko" <andy.shevchenko@gmail.com>
Cc: linux-i2c@vger.kernel.org, linux-tegra@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v9 01/32] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer
Date: Wed, 30 Sep 2020 01:18:44 +0300 [thread overview]
Message-ID: <20200929221915.10979-2-digetx@gmail.com> (raw)
In-Reply-To: <20200929221915.10979-1-digetx@gmail.com>
The tegra_i2c_flush_fifos() shouldn't sleep in atomic transfer and jiffies
are not updating if interrupts are disabled. Let's switch to use iopoll
API helpers for register-polling. The iopoll API provides helpers for both
atomic and non-atomic cases.
Note that this patch doesn't fix any known problem because normally FIFO
is flushed at the time of starting a new transfer.
Reviewed-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 00d3e4d7a01e..ab88cdd70376 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -470,9 +470,9 @@ static int tegra_i2c_init_dma(struct tegra_i2c_dev *i2c_dev)
static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
{
- unsigned long timeout = jiffies + HZ;
- unsigned int offset;
- u32 mask, val;
+ u32 mask, val, offset, reg_offset;
+ void __iomem *addr;
+ int err;
if (i2c_dev->hw->has_mst_fifo) {
mask = I2C_MST_FIFO_CONTROL_TX_FLUSH |
@@ -488,12 +488,19 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
val |= mask;
i2c_writel(i2c_dev, val, offset);
- while (i2c_readl(i2c_dev, offset) & mask) {
- if (time_after(jiffies, timeout)) {
- dev_warn(i2c_dev->dev, "timeout waiting for fifo flush\n");
- return -ETIMEDOUT;
- }
- usleep_range(1000, 2000);
+ reg_offset = tegra_i2c_reg_addr(i2c_dev, offset);
+ addr = i2c_dev->base + reg_offset;
+
+ if (i2c_dev->is_curr_atomic_xfer)
+ err = readl_relaxed_poll_timeout_atomic(addr, val, !(val & mask),
+ 1000, 1000000);
+ else
+ err = readl_relaxed_poll_timeout(addr, val, !(val & mask),
+ 1000, 1000000);
+
+ if (err) {
+ dev_err(i2c_dev->dev, "failed to flush FIFO\n");
+ return err;
}
return 0;
}
--
2.27.0
next prev parent reply other threads:[~2020-09-29 22:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-29 22:18 [PATCH v9 00/32] Improvements for Tegra I2C driver Dmitry Osipenko
2020-09-29 22:18 ` Dmitry Osipenko [this message]
2020-09-29 22:18 ` [PATCH v9 02/32] i2c: tegra: Add missing pm_runtime_put() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 03/32] i2c: tegra: Handle potential error of tegra_i2c_flush_fifos() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 04/32] i2c: tegra: Mask interrupt in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 05/32] i2c: tegra: Initialize div-clk rate unconditionally Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 06/32] i2c: tegra: Remove i2c_dev.clk_divisor_non_hs_mode member Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 07/32] i2c: tegra: Runtime PM always available on Tegra Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 08/32] i2c: tegra: Remove error message used for devm_request_irq() failure Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 09/32] i2c: tegra: Use reset_control_reset() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 10/32] i2c: tegra: Use devm_platform_get_and_ioremap_resource() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 11/32] i2c: tegra: Use platform_get_irq() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 12/32] i2c: tegra: Use clk-bulk helpers Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 13/32] i2c: tegra: Move out all device-tree parsing into tegra_i2c_parse_dt() Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 14/32] i2c: tegra: Clean up probe function Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 15/32] i2c: tegra: Reorder location of functions in the code Dmitry Osipenko
2020-09-29 22:18 ` [PATCH v9 16/32] i2c: tegra: Clean up variable types Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 17/32] i2c: tegra: Remove outdated barrier() Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 18/32] i2c: tegra: Remove likely/unlikely from the code Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 19/32] i2c: tegra: Remove redundant check in tegra_i2c_issue_bus_clear() Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 20/32] i2c: tegra: Remove "dma" variable from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 21/32] i2c: tegra: Rename wait/poll functions Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 22/32] i2c: tegra: Factor out error recovery from tegra_i2c_xfer_msg() Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 23/32] i2c: tegra: Factor out packet header setup " Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 24/32] i2c: tegra: Factor out register polling into separate function Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 25/32] i2c: tegra: Factor out hardware initialization " Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 26/32] i2c: tegra: Check errors for both positive and negative values Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 27/32] i2c: tegra: Improve formatting of variables Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 28/32] i2c: tegra: Clean up variable names Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 29/32] i2c: tegra: Clean up printk messages Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 30/32] i2c: tegra: Clean up and improve comments Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 31/32] i2c: tegra: Clean up whitespaces, newlines and indentation Dmitry Osipenko
2020-09-29 22:19 ` [PATCH v9 32/32] i2c: tegra: Improve driver module description Dmitry Osipenko
2020-10-05 20:52 ` [PATCH v9 00/32] Improvements for Tegra I2C driver Wolfram Sang
2020-10-05 23:16 ` Dmitry Osipenko
2020-10-06 4:48 ` 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=20200929221915.10979-2-digetx@gmail.com \
--to=digetx@gmail.com \
--cc=andy.shevchenko@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=mirq-linux@rere.qmqm.pl \
--cc=thierry.reding@gmail.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).