[PATCH v3 01/22] i2c: tegra: Make tegra_i2c_flush_fifos() usable in atomic transfer

Dmitry Osipenko
2020-09-03T00:54:17Z

The tegra_i2c_flush_fifos() shouldn't sleep in atomic transfer and jiffies
are not updating if interrupts are disabled. Hence let's use proper delay
functions and use ktime API in order not to hang atomic transfer. Note
that this patch doesn't fix any known problem because normally FIFO is
flushed at the time of starting a new transfer.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
---
drivers/i2c/busses/i2c-tegra.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 00d3e4d7a01e..72f03ded2eae 100644
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -470,7 +470,7 @@ 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;
+ ktime_t ktime, ktimeout;
unsigned int offset;
u32 mask, val;

@@ -488,14 +488,34 @@ static int tegra_i2c_flush_fifos(struct tegra_i2c_dev *i2c_dev)
val |= mask;
i2c_writel(i2c_dev, val, offset);

+ /*
+ * ktime_get() may take up to couple milliseconds in a worst case
+ * and normally FIFOs are flushed, hence let's check the state before
+ * proceeding to polling.
+ */
+ if (!(i2c_readl(i2c_dev, offset) & mask))
+ return 0;
+
+ ktime = ktime_get();
+ ktimeout = ktime_add_ms(ktime, 1000);
+
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);
+ if (ktime_after(ktime, ktimeout))
+ goto err_timeout;
+
+ if (i2c_dev->is_curr_atomic_xfer)
+ mdelay(1);
+ else
+ fsleep(1000);
+
+ ktime = ktime_get();
}
return 0;
+
+err_timeout:
+ dev_err(i2c_dev->dev, "FIFO flushing timed out\n");
+
+ return -ETIMEDOUT;
}

static int tegra_i2c_empty_rx_fifo(struct tegra_i2c_dev *i2c_dev)
--
2.27.0