hw/openrisc: pass random seed to fdt
PATCH 1/1 hw/openrisc: pass random seed to fdt
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
--- hw/openrisc/openrisc_sim.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/openrisc/openrisc_sim.c +6 -0
@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/guest-random.h" #include "qapi/error.h" #include "cpu.h" #include "hw/irq.h"
@@ -115,6 +116,7 @@ static void openrisc_create_fdt(Or1ksimState *state,int cpu;char *nodename;int pic_ph; +uint8_t rng_seed[32 ]; fdt = state->fdt =create_device_tree (&state->fdt_size);if (!fdt) {
@@ -165,6 +167,10 @@ static void openrisc_create_fdt(Or1ksimState *state,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } +/* Pass seed to RNG. */ +qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed)); +qemu_fdt_setprop (fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed)); +/* Create aliases node for use by devices. */ qemu_fdt_add_subnode (fdt,"/aliases" ); }
Signature · 1 line
2.35.1
Quoted 32 lines · Jason A. Donenfeld
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
Cc Stafford Horne <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- hw/openrisc/openrisc_sim.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/openrisc/openrisc_sim.c +2
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/guest-random.h" #include "qapi/error.h" #include "cpu.h" #include "hw/irq.h" @@ -115,6 +116,7 @@ static void openrisc_create_fdt(Or1ksimState *state,int cpu;char *nodename;int pic_ph; +uint8_t rng_seed[32 ]; fdt = state->fdt =create_device_tree (&state->fdt_size);if (!fdt) {
hw/openrisc/openrisc_sim.c static void openrisc_create_fdt(Or1ksimState *state, · line 176
Quoted 10 lines
hw/openrisc/openrisc_sim.c +4
-0@@ -165,6 +167,10 @@ static void openrisc_create_fdt(Or1ksimState *state,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } +/* Pass seed to RNG. */ +qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed)); +qemu_fdt_setprop (fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed)); +/* Create aliases node for use by devices. */ qemu_fdt_add_subnode (fdt,"/aliases" ); }
This all looks fine to me. I will queue it with my current changes. Since this is only applying to openrisc_sim I would like to also apply it to virt. To do that I need to have a common core openrisc system creation api. That way I don't end up copying and pasting this to every platform.
-Stafford
Quoted 36 lines · Stafford Horne
Quoted 35 lines · Jason A. Donenfeld
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
Cc Stafford Horne <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- hw/openrisc/openrisc_sim.c | 6 ++++++ 1 file changed, 6 insertions(+)hw/openrisc/openrisc_sim.c +2
-0@@ -20,6 +20,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/guest-random.h" #include "qapi/error.h" #include "cpu.h" #include "hw/irq.h" @@ -115,6 +116,7 @@ static void openrisc_create_fdt(Or1ksimState *state,int cpu;char *nodename;int pic_ph; +uint8_t rng_seed[32 ]; fdt = state->fdt =create_device_tree (&state->fdt_size);if (!fdt) {@@ -165,6 +167,10 @@ static void openrisc_create_fdt(Or1ksimState *state,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); }
Quoted 15 lines
Quoted 8 lines
hw/openrisc/openrisc_sim.c +4
-0+/* Pass seed to RNG. */ +qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed)); +qemu_fdt_setprop (fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed)); +/* Create aliases node for use by devices. */ qemu_fdt_add_subnode (fdt,"/aliases" );}
This all looks fine to me. I will queue it with my current changes. Since this
is only applying toopenrisc_simI would like to also apply it to virt. To do
that I need to have a common core openrisc system creation api. That way I don't end up copying and pasting this to every platform.
Sure. Or just do it on the virt board only if that's easier.
Jason
Quoted 13 lines · Jason A. Donenfeld
Quoted 11 lines · Stafford Horne
Quoted 10 lines · Jason A. Donenfeld
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
Cc Stafford Horne <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>--- hw/openrisc/openrisc_sim.c | 6 ++++++ 1 file changed, 6 insertions(+)
Quoted 6 lines
Quoted 6 lines
This all looks fine to me. I will queue it with my current changes. Since this
is only applying toopenrisc_simI would like to also apply it to virt. To do
that I need to have a common core openrisc system creation api. That way I don't end up copying and pasting this to every platform.
Looking at commit cb57df6f7f ("hw/arm/raspi: Make machines children of abstract RaspiMachineClass") and around could help.
Quoted 5 lines
Sure. Or just do it on the virt board only if that's easier.
Jason
PATCH v2 1/1 hw/openrisc: virt: pass random seed to fdt
In reply to Jason A. DonenfeldIf the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
---
Changes v1->v2:
- This is rebased on top of your "or1k-virt-2" branch.
- It makes the change to the new "virt" platform, since that's where it makes most sense to have.
hw/openrisc/virt.c | 6 ++++++ 1 file changed, 6 insertions(+)
hw/openrisc/virt.c +6 -0
@@ -19,6 +19,7 @@#include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/guest-random.h" #include "qapi/error.h" #include "cpu.h" #include "exec/address-spaces.h"
@@ -141,6 +142,7 @@ static void openrisc_create_fdt(OR1KVirtState *state,void *fdt;int cpu;char *nodename; +uint8_t rng_seed[32 ]; fdt = state->fdt =create_device_tree (&state->fdt_size);if (!fdt) {
@@ -197,6 +199,10 @@ static void openrisc_create_fdt(OR1KVirtState *state,qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); } +/* Pass seed to RNG. */ +qemu_guest_getrandom_nofail (rng_seed,sizeof (rng_seed)); +qemu_fdt_setprop (fdt,"/chosen" ,"rng-seed" , rng_seed,sizeof (rng_seed)); +/* Create aliases node for use by devices. */ qemu_fdt_add_subnode (fdt,"/aliases" ); }
Signature · 1 line
2.35.1
Re: [PATCH v2] hw/openrisc: virt: pass random seed to fdt
Quoted 5 lines · Jason A. Donenfeld
If the FDT contains /chosen/rng-seed, then the Linux RNG will use it to initialize early. Set this using the usual guest random number generation function. This is confirmed to successfully initialize the RNG on Linux 5.19-rc2.
Quoted 7 lines
Cc Stafford Horne <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>---
Changesv1->v2:
- This is rebased on top of your "or1k-virt-2" branch.
- It makes the change to the new "virt" platform, since that's where it makes most sense to have.
Thanks I have placed this on my or1k-virt-2 branch.
-Stafford