diff options
| author | Théo Lebrun <theo.lebrun@bootlin.com> | 2024-03-06 18:59:26 +0100 |
|---|---|---|
| committer | Andi Shyti <andi.shyti@kernel.org> | 2024-03-12 11:50:44 +0100 |
| commit | c763072ab4533f0669b19c60d8a18b31f2877164 (patch) | |
| tree | 8bf948decf2f56be66a71e4096e39c96155b2036 | |
| parent | 7489cd43a2ea26c963c422c08e943a4a616fdb15 (diff) | |
| download | linux-stable-c763072ab4533f0669b19c60d8a18b31f2877164.tar.gz linux-stable-c763072ab4533f0669b19c60d8a18b31f2877164.tar.bz2 linux-stable-c763072ab4533f0669b19c60d8a18b31f2877164.zip | |
i2c: nomadik: replace jiffies by ktime for FIFO flushing timeout
The FIFO flush function uses a jiffies amount to detect timeouts as the
flushing is async. Replace with ktime to get more accurate precision
and support short timeouts.
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Andi Shyti <andi.shyti@kernel.org>
Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Signed-off-by: Andi Shyti <andi.shyti@kernel.org>
| -rw-r--r-- | drivers/i2c/busses/i2c-nomadik.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 2ba7d082e205..020beb8ffa17 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -225,8 +225,8 @@ static inline void i2c_clr_bit(void __iomem *reg, u32 mask) static int flush_i2c_fifo(struct nmk_i2c_dev *priv) { #define LOOP_ATTEMPTS 10 + ktime_t timeout; int i; - unsigned long timeout; /* * flush the transmit and receive FIFO. The flushing @@ -238,9 +238,9 @@ static int flush_i2c_fifo(struct nmk_i2c_dev *priv) writel((I2C_CR_FTX | I2C_CR_FRX), priv->virtbase + I2C_CR); for (i = 0; i < LOOP_ATTEMPTS; i++) { - timeout = jiffies + priv->adap.timeout; + timeout = ktime_add_us(ktime_get(), priv->timeout_usecs); - while (!time_after(jiffies, timeout)) { + while (ktime_after(timeout, ktime_get())) { if ((readl(priv->virtbase + I2C_CR) & (I2C_CR_FTX | I2C_CR_FRX)) == 0) return 0; |