From: Claudiu Beznea <claudiu.beznea@microchip.com>
To: <mpm@selenic.com>, <herbert@gondor.apana.org.au>,
<nicolas.ferre@microchip.com>, <alexandre.belloni@bootlin.com>,
<linux-crypto@vger.kernel.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
Claudiu Beznea <claudiu.beznea@microchip.com>
Subject: [PATCH 1/7] hwrng: atmel - add wait for ready support on read
Date: Fri, 18 Feb 2022 12:17:06 +0200 [thread overview]
Message-ID: <20220218101712.530576-2-claudiu.beznea@microchip.com> (raw)
In-Reply-To: <20220218101712.530576-1-claudiu.beznea@microchip.com>
Add wait for ready support on read.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
drivers/char/hw_random/atmel-rng.c | 43 +++++++++++++++++++++---------
1 file changed, 30 insertions(+), 13 deletions(-)
diff --git a/drivers/char/hw_random/atmel-rng.c b/drivers/char/hw_random/atmel-rng.c
index ecb71c4317a5..1a4874668c04 100644
--- a/drivers/char/hw_random/atmel-rng.c
+++ b/drivers/char/hw_random/atmel-rng.c
@@ -13,6 +13,7 @@
#include <linux/err.h>
#include <linux/clk.h>
#include <linux/io.h>
+#include <linux/iopoll.h>
#include <linux/hw_random.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
@@ -20,6 +21,7 @@
#define TRNG_CR 0x00
#define TRNG_MR 0x04
#define TRNG_ISR 0x1c
+#define TRNG_ISR_DATRDY BIT(0)
#define TRNG_ODATA 0x50
#define TRNG_KEY 0x524e4700 /* RNG */
@@ -36,25 +38,40 @@ struct atmel_trng {
struct hwrng rng;
};
+static bool atmel_trng_wait_ready(struct atmel_trng *trng, bool wait)
+{
+ int ready;
+
+ ready = readl(trng->base + TRNG_ISR) & TRNG_ISR_DATRDY;
+ if (!ready && wait)
+ readl_poll_timeout(trng->base + TRNG_ISR, ready,
+ ready & TRNG_ISR_DATRDY, 1000, 20000);
+
+ return !!ready;
+}
+
static int atmel_trng_read(struct hwrng *rng, void *buf, size_t max,
bool wait)
{
struct atmel_trng *trng = container_of(rng, struct atmel_trng, rng);
u32 *data = buf;
+ int ret;
+
+ ret = atmel_trng_wait_ready(trng, wait);
+ if (!ret)
+ goto out;
- /* data ready? */
- if (readl(trng->base + TRNG_ISR) & 1) {
- *data = readl(trng->base + TRNG_ODATA);
- /*
- ensure data ready is only set again AFTER the next data
- word is ready in case it got set between checking ISR
- and reading ODATA, so we don't risk re-reading the
- same word
- */
- readl(trng->base + TRNG_ISR);
- return 4;
- } else
- return 0;
+ *data = readl(trng->base + TRNG_ODATA);
+ /*
+ * ensure data ready is only set again AFTER the next data word is ready
+ * in case it got set between checking ISR and reading ODATA, so we
+ * don't risk re-reading the same word
+ */
+ readl(trng->base + TRNG_ISR);
+ ret = 4;
+
+out:
+ return ret;
}
static void atmel_trng_enable(struct atmel_trng *trng)
--
2.32.0
next prev parent reply other threads:[~2022-02-18 10:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 10:17 [PATCH 0/7] hwrnd: atmel - add runtime pm support Claudiu Beznea
2022-02-18 10:17 ` Claudiu Beznea [this message]
2022-02-18 10:17 ` [PATCH 2/7] hwrnd: atmel - disable trng on failure path Claudiu Beznea
2022-02-18 10:17 ` [PATCH 3/7] hwrnd: atmel - rename enable/disable functions to init/cleanup Claudiu Beznea
2022-02-18 10:17 ` [PATCH 4/7] hwrng: atmel - move set of TRNG_HALFR in atmel_trng_init() Claudiu Beznea
2022-02-18 10:17 ` [PATCH 5/7] hwrnd: atmel - use __maybe_unused and pm_ptr() for pm ops Claudiu Beznea
2022-02-18 10:17 ` [PATCH 6/7] hwrnd: atmel - add runtime pm support Claudiu Beznea
2022-02-18 10:17 ` [PATCH 7/7] hwrnd: atmel - remove extra line Claudiu Beznea
2022-02-18 15:24 ` [PATCH 0/7] hwrnd: atmel - add runtime pm support Alexandre Belloni
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=20220218101712.530576-2-claudiu.beznea@microchip.com \
--to=claudiu.beznea@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mpm@selenic.com \
--cc=nicolas.ferre@microchip.com \
/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
all inboxes | Powered by JetHome®