Skip to content

Commit aa7172a

Browse files
Update LRNG
Signed-off-by: Nicholas Sun <nicholas-sun@outlook.com>
1 parent 42d8d51 commit aa7172a

8 files changed

Lines changed: 17 additions & 17 deletions

PATCH/LRNG/696-29-v50-07-add_random_ready_callbacks.patch renamed to PATCH/LRNG/696-29-v51-07-add_random_ready_callbacks.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/char/lrng/lrng_es_mgr.c
22
+++ b/drivers/char/lrng/lrng_es_mgr.c
3-
@@ -287,6 +287,7 @@ static void lrng_set_operational(void)
3+
@@ -218,6 +218,7 @@ static void lrng_set_operational(void)
44
*/
55
if (lrng_state.lrng_fully_seeded) {
66
lrng_state.lrng_operational = true;
@@ -10,19 +10,19 @@
1010
}
1111
--- a/drivers/char/lrng/lrng_interface_random_kernel.c
1212
+++ b/drivers/char/lrng/lrng_interface_random_kernel.c
13-
@@ -21,6 +21,10 @@
14-
15-
static ATOMIC_NOTIFIER_HEAD(random_ready_notifier);
13+
@@ -19,6 +19,10 @@
14+
#include "lrng_interface_dev_common.h"
15+
#include "lrng_interface_random_kernel.h"
1616

1717
+static RAW_NOTIFIER_HEAD(lrng_ready_chain);
1818
+static DEFINE_SPINLOCK(lrng_ready_chain_lock);
1919
+static unsigned int lrng_ready_chain_used = 0;
2020
+
2121
/********************************** Helper ***********************************/
2222

23-
static bool lrng_trust_bootloader __initdata =
24-
@@ -70,6 +74,33 @@ void lrng_kick_random_ready(void)
25-
atomic_notifier_call_chain(&random_ready_notifier, 0, NULL);
23+
int __init random_init(const char *command_line)
24+
@@ -29,6 +33,33 @@ int __init random_init(const char *comma
25+
return ret;
2626
}
2727

2828
+bool lrng_ready_chain_has_sleeper(void)
@@ -55,7 +55,7 @@
5555
/************************ LRNG kernel input interfaces ************************/
5656

5757
/*
58-
@@ -166,6 +197,58 @@ void add_interrupt_randomness(int irq) {
58+
@@ -125,6 +156,58 @@ void add_interrupt_randomness(int irq) {
5959
EXPORT_SYMBOL(add_interrupt_randomness);
6060
#endif
6161

@@ -114,7 +114,7 @@
114114
#if IS_ENABLED(CONFIG_VMGENID)
115115
static BLOCKING_NOTIFIER_HEAD(lrng_vmfork_chain);
116116

117-
@@ -236,6 +319,43 @@ int wait_for_random_bytes(void)
117+
@@ -195,6 +278,43 @@ int wait_for_random_bytes(void)
118118
EXPORT_SYMBOL(wait_for_random_bytes);
119119

120120
/*
@@ -173,4 +173,4 @@
173173
+static inline void lrng_process_ready_list(void) { }
174174
static inline void invalidate_batched_entropy(void) { }
175175
static inline void lrng_kick_random_ready(void) { }
176-
#endif /* CONFIG_LRNG_RANDOM_IF */
176+
#endif /* CONFIG_LRNG_RANDOM_IF */

PATCH/LRNG/696-30-v50-08-revert-arch_get_random_long.patch renamed to PATCH/LRNG/696-30-v51-08-revert-arch_get_random_long.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- a/drivers/char/lrng/lrng_es_cpu.c
22
+++ b/drivers/char/lrng/lrng_es_cpu.c
3-
@@ -66,8 +66,7 @@ static u32 lrng_cpu_poolsize(void)
3+
@@ -65,8 +65,7 @@ static u32 lrng_cpu_poolsize(void)
44

55
static u32 lrng_get_cpu_data(u8 *outbuf, u32 requested_bits)
66
{
@@ -10,7 +10,7 @@
1010

1111
/* operate on full blocks */
1212
BUILD_BUG_ON(LRNG_DRNG_SECURITY_STRENGTH_BYTES % sizeof(unsigned long));
13-
@@ -75,14 +74,10 @@ static u32 lrng_get_cpu_data(u8 *outbuf,
13+
@@ -74,14 +73,10 @@ static u32 lrng_get_cpu_data(u8 *outbuf, u32 requested_bits)
1414
/* ensure we have aligned buffers */
1515
BUILD_BUG_ON(LRNG_KCAPI_ALIGN % sizeof(unsigned long));
1616

@@ -29,7 +29,7 @@
2929
cpu_entropy = 0;
3030
return 0;
3131
}
32-
@@ -181,7 +176,7 @@ static u32 lrng_cpu_multiplier(void)
32+
@@ -180,7 +175,7 @@ static u32 lrng_cpu_multiplier(void)
3333
if (data_multiplier > 0)
3434
return data_multiplier;
3535

@@ -40,7 +40,7 @@
4040
* one reseed making it logically equivalent to RDSEED.
4141
--- a/drivers/char/lrng/lrng_es_mgr.c
4242
+++ b/drivers/char/lrng/lrng_es_mgr.c
43-
@@ -390,19 +390,12 @@ void __init lrng_rand_initialize_early(v
43+
@@ -376,19 +376,12 @@ void __init lrng_rand_initialize_early(v
4444
sizeof(unsigned long))];
4545
struct new_utsname utsname;
4646
} seed __aligned(LRNG_KCAPI_ALIGN);
@@ -63,4 +63,4 @@
6363
+ seed.data[i] = random_get_entropy();
6464
}
6565
memcpy(&seed.utsname, init_utsname(), sizeof(*(init_utsname())));
66-
66+

PATCH/LRNG/696-31-v50-09-revert-split-random_init.patch renamed to PATCH/LRNG/696-31-v51-09-revert-split-random_init.patch

File renamed without changes.

PATCH/LRNG/696-32-v50-10-revert_add_hwgenerator_randomness_update.patch renamed to PATCH/LRNG/696-32-v51-10-revert_add_hwgenerator_randomness_update.patch

File renamed without changes.

SCRIPTS/02_prepare_package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ cp -rf ../PATCH/LRNG/* ./target/linux/generic/hack-5.15/
5151
echo '
5252
# CONFIG_RANDOM_DEFAULT_IMPL is not set
5353
CONFIG_LRNG=y
54-
CONFIG_LRNG_IRQ=y
54+
# CONFIG_LRNG_IRQ is not set
5555
CONFIG_LRNG_JENT=y
5656
CONFIG_LRNG_CPU=y
57-
CONFIG_LRNG_SCHED=y
57+
# CONFIG_LRNG_SCHED is not set
5858
' >>./target/linux/generic/config-5.15
5959
# Netifd
6060
mkdir -p package/network/config/netifd/patches

0 commit comments

Comments
 (0)