From: Florian Fainelli <f.fainelli@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Florian Fainelli <f.fainelli@gmail.com>,
Matt Mackall <mpm@selenic.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>, Ray Jui <rjui@broadcom.com>,
Scott Branden <sbranden@broadcom.com>,
bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM
BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...),
Eric Anholt <eric@anholt.net>,
Stefan Wahren <stefan.wahren@i2se.com>,
PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Krzysztof Kozlowski <krzk@kernel.org>,
Harald Freudenberger <freude@linux.vnet.ibm.com>,
Sean Wang <sean.wang@mediatek.com>,
Martin Kaiser <martin@kaiser.cx>,
Steffen Trumtrar <s.trumtrar@pengutronix.de>,
linux-crypto@vger.kernel.org (open list:HARDWARE RANDOM NUMBER
GENERATOR CORE),
devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND
FLATTENED DEVICE TREE BINDINGS),
linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM
BCM2835 ARM ARCHITECTURE),
linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM
BCM2835 ARM ARCHITECTURE)
Subject: [PATCH 08/12] hwrng: bcm2835-rng: Abstract I/O accessors
Date: Wed, 1 Nov 2017 18:04:04 -0700 [thread overview]
Message-ID: <20171102010408.27736-9-f.fainelli@gmail.com> (raw)
In-Reply-To: <20171102010408.27736-1-f.fainelli@gmail.com>
In preparation for allowing BCM63xx to use this driver, we abstract I/O
accessors such that we can easily change those later on.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/char/hw_random/bcm2835-rng.c | 27 +++++++++++++++++++--------
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/drivers/char/hw_random/bcm2835-rng.c b/drivers/char/hw_random/bcm2835-rng.c
index 35928efb52e7..500275d55044 100644
--- a/drivers/char/hw_random/bcm2835-rng.c
+++ b/drivers/char/hw_random/bcm2835-rng.c
@@ -42,6 +42,17 @@ static inline struct bcm2835_rng_priv *to_rng_priv(struct hwrng *rng)
return container_of(rng, struct bcm2835_rng_priv, rng);
}
+static inline u32 rng_readl(struct bcm2835_rng_priv *priv, u32 offset)
+{
+ return readl(priv->base + offset);
+}
+
+static inline void rng_writel(struct bcm2835_rng_priv *priv, u32 val,
+ u32 offset)
+{
+ writel(val, priv->base + offset);
+}
+
static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,
bool wait)
{
@@ -49,18 +60,18 @@ static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,
u32 max_words = max / sizeof(u32);
u32 num_words, count;
- while ((__raw_readl(priv->base + RNG_STATUS) >> 24) == 0) {
+ while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {
if (!wait)
return 0;
cpu_relax();
}
- num_words = readl(priv->base + RNG_STATUS) >> 24;
+ num_words = rng_readl(priv, RNG_STATUS) >> 24;
if (num_words > max_words)
num_words = max_words;
for (count = 0; count < num_words; count++)
- ((u32 *)buf)[count] = readl(priv->base + RNG_DATA);
+ ((u32 *)buf)[count] = rng_readl(priv, RNG_DATA);
return num_words * sizeof(u32);
}
@@ -77,14 +88,14 @@ static int bcm2835_rng_init(struct hwrng *rng)
if (priv->mask_interrupts) {
/* mask the interrupt */
- val = readl(priv->base + RNG_INT_MASK);
+ val = rng_readl(priv, RNG_INT_MASK);
val |= RNG_INT_OFF;
- writel(val, priv->base + RNG_INT_MASK);
+ rng_writel(priv, val, RNG_INT_MASK);
}
/* set warm-up count & enable */
- __raw_writel(RNG_WARMUP_COUNT, priv->base + RNG_STATUS);
- __raw_writel(RNG_RBGEN, priv->base + RNG_CTRL);
+ rng_writel(priv, RNG_WARMUP_COUNT, RNG_STATUS);
+ rng_writel(priv, RNG_RBGEN, RNG_CTRL);
return 0;
}
@@ -94,7 +105,7 @@ static void bcm2835_rng_cleanup(struct hwrng *rng)
struct bcm2835_rng_priv *priv = to_rng_priv(rng);
/* disable rng hardware */
- __raw_writel(0, priv->base + RNG_CTRL);
+ rng_writel(priv, 0, RNG_CTRL);
clk_disable_unprepare(priv->clk);
}
--
2.9.3
next prev parent reply other threads:[~2017-11-02 1:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-02 1:03 [PATCH 00/12] bcm63xx-rng conversion to bcm2835-rng Florian Fainelli
2017-11-02 1:03 ` [PATCH 01/12] hwrng: bcm2835-rng: Obtain base register via resource Florian Fainelli
2017-11-02 1:03 ` [PATCH 02/12] hwrng: bcm2835-rng: Define a driver private context Florian Fainelli
2017-11-02 1:03 ` [PATCH 03/12] hwrng: bcm2835-rng: Move enabling to hwrng::init Florian Fainelli
2017-11-02 1:04 ` [PATCH 04/12] hwrng: bcm2835-rng: Implementation cleanup callback Florian Fainelli
2017-11-02 1:04 ` [PATCH 05/12] hwrng: bcm2835-rng: Use device managed helpers Florian Fainelli
2017-11-02 1:04 ` [PATCH 06/12] hwrng: bcm2835-rng: Rework interrupt masking Florian Fainelli
2017-11-02 1:04 ` [PATCH 07/12] hwrng: bcm2835-rng: Manage an optional clock Florian Fainelli
2017-11-04 13:50 ` Stefan Wahren
2017-11-04 17:59 ` Florian Fainelli
2017-11-04 18:22 ` Stefan Wahren
2017-11-04 19:37 ` Andrew Lunn
2017-11-04 20:08 ` Russell King - ARM Linux
2017-11-04 20:17 ` Andrew Lunn
2017-11-02 1:04 ` Florian Fainelli [this message]
2017-11-03 20:19 ` [PATCH 08/12] hwrng: bcm2835-rng: Abstract I/O accessors Eric Anholt
2017-11-03 22:04 ` Florian Fainelli
2017-11-02 1:04 ` [PATCH 09/12] hwrng: bcm2835-rng: Add Broadcom MIPS " Florian Fainelli
2017-11-02 1:04 ` [PATCH 10/12] dt-bindings: rng: Incorporate brcm,bcm6368.txt binding Florian Fainelli
2017-11-06 21:38 ` Rob Herring
2017-11-02 1:04 ` [PATCH 11/12] hwrng: bcm2835-rng: Enable BCM2835 RNG to work on BCM63xx platforms Florian Fainelli
2017-11-04 18:27 ` Stefan Wahren
2017-11-06 20:16 ` Florian Fainelli
2017-11-07 6:45 ` Stefan Wahren
2017-11-07 23:27 ` Stefan Wahren
2017-11-02 1:04 ` [PATCH 12/12] hwrng: bcm63xx-rng: Remove since bcm2835-rng takes over Florian Fainelli
2017-11-03 20:18 ` Eric Anholt
2017-11-03 21:58 ` Florian Fainelli
2017-11-02 19:00 ` [PATCH 00/12] bcm63xx-rng conversion to bcm2835-rng Stefan Wahren
2017-11-02 19:01 ` Stefan Wahren
2017-11-02 19:06 ` Florian Fainelli
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=20171102010408.27736-9-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=devicetree@vger.kernel.org \
--cc=eric@anholt.net \
--cc=freude@linux.vnet.ibm.com \
--cc=herbert@gondor.apana.org.au \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rpi-kernel@lists.infradead.org \
--cc=mark.rutland@arm.com \
--cc=martin@kaiser.cx \
--cc=mpm@selenic.com \
--cc=prasannatsmkumar@gmail.com \
--cc=rjui@broadcom.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=robh+dt@kernel.org \
--cc=s.trumtrar@pengutronix.de \
--cc=sbranden@broadcom.com \
--cc=sean.wang@mediatek.com \
--cc=stefan.wahren@i2se.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;
as well as URLs for NNTP newsgroup(s).