From e145f5565dc48ccaf4cb50b7cfc48777bed8c100 Mon Sep 17 00:00:00 2001
From: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
Date: Mon, 1 Feb 2021 16:14:59 +0100
Subject: [PATCH] hwrng: timeriomem - Fix cooldown period calculation
Git-commit: e145f5565dc48ccaf4cb50b7cfc48777bed8c100
Patch-mainline: v5.12-rc1
References: git-fixes
Ensure cooldown period tolerance of 1% is actually accounted for.
Fixes: ca3bff70ab32 ("hwrng: timeriomem - Improve performance...")
Signed-off-by: Jan Henrik Weinstock <jan.weinstock@rwth-aachen.de>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Acked-by: Takashi Iwai <tiwai@suse.de>
---
drivers/char/hw_random/timeriomem-rng.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/char/hw_random/timeriomem-rng.c b/drivers/char/hw_random/timeriomem-rng.c
index e262445fed5f..f35f0f31f52a 100644
--- a/drivers/char/hw_random/timeriomem-rng.c
+++ b/drivers/char/hw_random/timeriomem-rng.c
@@ -69,7 +69,7 @@ static int timeriomem_rng_read(struct hwrng *hwrng, void *data,
*/
if (retval > 0)
usleep_range(period_us,
- period_us + min(1, period_us / 100));
+ period_us + max(1, period_us / 100));
*(u32 *)data = readl(priv->io_base);
retval += sizeof(u32);
--
2.26.2