mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
Fix RPI compilation
This commit is contained in:
parent
8fef49e538
commit
d4dc8a5b5a
3 changed files with 0 additions and 116 deletions
|
@ -1,26 +0,0 @@
|
||||||
From b79ceb0a74c81774308f083c9d543b82fc9e4825 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
Date: Tue, 21 Mar 2023 16:43:22 +0000
|
|
||||||
Subject: [PATCH] Revert "hwrng: bcm2835 - use hwrng_msleep() instead of
|
|
||||||
cpu_relax()"
|
|
||||||
|
|
||||||
This reverts commit 96cb9d0554457086664d3bd10630b11193d863f1.
|
|
||||||
|
|
||||||
See: https://github.com/raspberrypi/linux/issues/5390
|
|
||||||
|
|
||||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
---
|
|
||||||
drivers/char/hw_random/bcm2835-rng.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
+++ b/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
@@ -71,7 +71,7 @@ static int bcm2835_rng_read(struct hwrng
|
|
||||||
while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {
|
|
||||||
if (!wait)
|
|
||||||
return 0;
|
|
||||||
- hwrng_msleep(rng, 1000);
|
|
||||||
+ cpu_relax();
|
|
||||||
}
|
|
||||||
|
|
||||||
num_words = rng_readl(priv, RNG_STATUS) >> 24;
|
|
|
@ -1,24 +0,0 @@
|
||||||
From 0d41e5de102d1a77fb0e027c2598258c4e220ec0 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
Date: Wed, 22 Mar 2023 15:47:30 +0000
|
|
||||||
Subject: [PATCH] Revert "Revert "hwrng: bcm2835 - use hwrng_msleep() instead
|
|
||||||
of cpu_relax()""
|
|
||||||
|
|
||||||
This reverts commit a9d98e9f7d84d7d66b02fdae9c37b19cd516c894.
|
|
||||||
|
|
||||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
---
|
|
||||||
drivers/char/hw_random/bcm2835-rng.c | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
+++ b/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
@@ -71,7 +71,7 @@ static int bcm2835_rng_read(struct hwrng
|
|
||||||
while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {
|
|
||||||
if (!wait)
|
|
||||||
return 0;
|
|
||||||
- cpu_relax();
|
|
||||||
+ hwrng_msleep(rng, 1000);
|
|
||||||
}
|
|
||||||
|
|
||||||
num_words = rng_readl(priv, RNG_STATUS) >> 24;
|
|
|
@ -1,66 +0,0 @@
|
||||||
From 52e517bf8e7c3e92aa760a624732ff589bd30201 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
Date: Wed, 22 Mar 2023 15:30:38 +0000
|
|
||||||
Subject: [PATCH] hwrng: bcm2835 - sleep more intelligently
|
|
||||||
|
|
||||||
While waiting for random data, use sleeps that are proportional
|
|
||||||
to the amount of data expected. Prevent indefinite waits by
|
|
||||||
giving up if nothing is received for a second.
|
|
||||||
|
|
||||||
See: https://github.com/raspberrypi/linux/issues/5390
|
|
||||||
|
|
||||||
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
||||||
---
|
|
||||||
drivers/char/hw_random/bcm2835-rng.c | 20 ++++++++++++++------
|
|
||||||
1 file changed, 14 insertions(+), 6 deletions(-)
|
|
||||||
|
|
||||||
--- a/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
+++ b/drivers/char/hw_random/bcm2835-rng.c
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
#include <linux/printk.h>
|
|
||||||
#include <linux/clk.h>
|
|
||||||
#include <linux/reset.h>
|
|
||||||
+#include <linux/delay.h>
|
|
||||||
|
|
||||||
#define RNG_CTRL 0x0
|
|
||||||
#define RNG_STATUS 0x4
|
|
||||||
@@ -28,6 +29,9 @@
|
|
||||||
|
|
||||||
#define RNG_INT_OFF 0x1
|
|
||||||
|
|
||||||
+#define RNG_FIFO_WORDS 4
|
|
||||||
+#define RNG_US_PER_WORD 34 /* Tuned for throughput */
|
|
||||||
+
|
|
||||||
struct bcm2835_rng_priv {
|
|
||||||
struct hwrng rng;
|
|
||||||
void __iomem *base;
|
|
||||||
@@ -64,19 +68,23 @@ static inline void rng_writel(struct bcm
|
|
||||||
static int bcm2835_rng_read(struct hwrng *rng, void *buf, size_t max,
|
|
||||||
bool wait)
|
|
||||||
{
|
|
||||||
+ u32 retries = 1000000/(RNG_FIFO_WORDS * RNG_US_PER_WORD);
|
|
||||||
struct bcm2835_rng_priv *priv = to_rng_priv(rng);
|
|
||||||
u32 max_words = max / sizeof(u32);
|
|
||||||
u32 num_words, count;
|
|
||||||
|
|
||||||
- while ((rng_readl(priv, RNG_STATUS) >> 24) == 0) {
|
|
||||||
- if (!wait)
|
|
||||||
+ num_words = rng_readl(priv, RNG_STATUS) >> 24;
|
|
||||||
+
|
|
||||||
+ while (!num_words) {
|
|
||||||
+ if (!wait || !retries)
|
|
||||||
return 0;
|
|
||||||
- hwrng_msleep(rng, 1000);
|
|
||||||
+ retries--;
|
|
||||||
+ usleep_range((u32)RNG_US_PER_WORD,
|
|
||||||
+ (u32)RNG_US_PER_WORD * RNG_FIFO_WORDS);
|
|
||||||
+ num_words = rng_readl(priv, RNG_STATUS) >> 24;
|
|
||||||
}
|
|
||||||
|
|
||||||
- num_words = rng_readl(priv, RNG_STATUS) >> 24;
|
|
||||||
- if (num_words > max_words)
|
|
||||||
- num_words = max_words;
|
|
||||||
+ num_words = min(num_words, max_words);
|
|
||||||
|
|
||||||
for (count = 0; count < num_words; count++)
|
|
||||||
((u32 *)buf)[count] = rng_readl(priv, RNG_DATA);
|
|
Loading…
Reference in a new issue