baad22eed3
As usual these patches were extracted and rebased from the raspberry pi repo: https://github.com/raspberrypi/linux/tree/rpi-4.9.y - Remove led1 from diag.sh for RPi3 since it causes boot issues. - Fix modules.mk typos. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
26 lines
958 B
Diff
26 lines
958 B
Diff
From ecba31015228961644ad8e17bcf132eea9c7a7f3 Mon Sep 17 00:00:00 2001
|
|
From: popcornmix <popcornmix@gmail.com>
|
|
Date: Tue, 6 Dec 2016 17:05:39 +0000
|
|
Subject: [PATCH] bcm2835-rng: Avoid initialising if already enabled
|
|
|
|
Avoids the 0x40000 cycles of warmup again if firmware has already used it
|
|
---
|
|
drivers/char/hw_random/bcm2835-rng.c | 7 ++++---
|
|
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/char/hw_random/bcm2835-rng.c
|
|
+++ b/drivers/char/hw_random/bcm2835-rng.c
|
|
@@ -102,9 +102,10 @@ static int bcm2835_rng_probe(struct plat
|
|
rng_setup(rng_base);
|
|
|
|
/* set warm-up count & enable */
|
|
- __raw_writel(RNG_WARMUP_COUNT, rng_base + RNG_STATUS);
|
|
- __raw_writel(RNG_RBGEN, rng_base + RNG_CTRL);
|
|
-
|
|
+ if (!(__raw_readl(rng_base + RNG_CTRL) & RNG_RBGEN)) {
|
|
+ __raw_writel(RNG_WARMUP_COUNT, rng_base + RNG_STATUS);
|
|
+ __raw_writel(RNG_RBGEN, rng_base + RNG_CTRL);
|
|
+ }
|
|
/* register driver */
|
|
err = hwrng_register(&bcm2835_rng_ops);
|
|
if (err) {
|