Skip to contentSkip to conversation

riscv: Change the default behavior if no -bios option is specified

PATCH Applied Bin Meng 2 participants 7 messages May 1, 2020 – May 21, 2020 RISC-V

lore
Share & tools
lore

Bin Meng

author
#0 lore raw

PATCH 1/1 riscv: Change the default behavior if no -bios option is specified

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

---

 hw/riscv/boot.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)
hw/riscv/boot.c +4 -27
index 726300a..b76b2f3 100644
@@ -41,34 +41,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
 {
     char *firmware_filename = NULL;
 
-    if (!machine->firmware) {
+    if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) {
         /*
-         * The user didn't specify -bios.
-         * At the moment we default to loading nothing when this hapens.
-         * In the future this defaul will change to loading the prebuilt
-         * OpenSBI firmware. Let's warn the user and then continue.
-        */
-        if (!qtest_enabled()) {
-            warn_report("No -bios option specified. Not loading a firmware.");
-            warn_report("This default will change in a future QEMU release. " \
-                        "Please use the -bios option to avoid breakages when "\
-                        "this happens.");
-            warn_report("See QEMU's deprecation documentation for details.");
-        }
-        return;
-    }
-
-    if (!strcmp(machine->firmware, "default")) {
-        /*
-         * The user has specified "-bios default". That means we are going to
-         * load the OpenSBI binary included in the QEMU source.
-         *
-         * We can't load the binary by default as it will break existing users
-         * as users are already loading their own firmware.
-         *
-         * Let's try to get everyone to specify the -bios option at all times,
-         * so then in the future we can make "-bios default" the default option
-         * if no -bios option is set without breaking anything.
+         * The user didn't specify -bios, or has specified "-bios default".
+         * That means we are going to load the OpenSBI binary included in
+         * the QEMU source.
          */
         firmware_filename = riscv_find_firmware(default_machine_firmware);
     } else if (strcmp(machine->firmware, "none")) {
Signature · 1 line
2.7.4
Reviewed-by on v1 1/1 Applied
#1 lore raw
Quoted 8 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Quoted 7 lines

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Thanks!

Applied to the RISC-V tree.

Alistair

Quoted 52 lines

---

 hw/riscv/boot.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)
hw/riscv/boot.c +4 -28
index 726300a..b76b2f3 100644
@@ -41,34 +41,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
 {
     char *firmware_filename = NULL;
 
-    if (!machine->firmware) {
+    if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) {
         /*
-         * The user didn't specify -bios.
-         * At the moment we default to loading nothing when this hapens.
-         * In the future this defaul will change to loading the prebuilt
-         * OpenSBI firmware. Let's warn the user and then continue.
-        */
-        if (!qtest_enabled()) {
-            warn_report("No -bios option specified. Not loading a firmware.");
-            warn_report("This default will change in a future QEMU release. " \
-                        "Please use the -bios option to avoid breakages when "\
-                        "this happens.");
-            warn_report("See QEMU's deprecation documentation for details.");
-        }
-        return;
-    }
-
-    if (!strcmp(machine->firmware, "default")) {
-        /*
-         * The user has specified "-bios default". That means we are going to
-         * load the OpenSBI binary included in the QEMU source.
-         *
-         * We can't load the binary by default as it will break existing users
-         * as users are already loading their own firmware.
-         *
-         * Let's try to get everyone to specify the -bios option at all times,
-         * so then in the future we can make "-bios default" the default option
-         * if no -bios option is set without breaking anything.
+         * The user didn't specify -bios, or has specified "-bios default".
+         * That means we are going to load the OpenSBI binary included in
+         * the QEMU source.
          */
         firmware_filename = riscv_find_firmware(default_machine_firmware);
     } else if (strcmp(machine->firmware, "none")) {
--

2.7.4

#2 lore raw
Quoted 16 lines · Alistair Francis
Quoted 14 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Quoted 7 lines
Quoted 1 line

Thanks!

Applied to the RISC-V tree.

This fails make check

qemu-system-riscv64: Unable to load the RISC-V firmware "opensbi-riscv64-spike-fw_jump.elf"
Broken pipe /scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1

Alistair

Quoted 55 lines

Alistair

Quoted 52 lines

---

 hw/riscv/boot.c | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)
hw/riscv/boot.c +4 -28
index 726300a..b76b2f3 100644
@@ -41,34 +41,11 @@ void riscv_find_and_load_firmware(MachineState *machine,
 {
     char *firmware_filename = NULL;
 
-    if (!machine->firmware) {
+    if ((!machine->firmware) || (!strcmp(machine->firmware, "default"))) {
         /*
-         * The user didn't specify -bios.
-         * At the moment we default to loading nothing when this hapens.
-         * In the future this defaul will change to loading the prebuilt
-         * OpenSBI firmware. Let's warn the user and then continue.
-        */
-        if (!qtest_enabled()) {
-            warn_report("No -bios option specified. Not loading a firmware.");
-            warn_report("This default will change in a future QEMU release. " \
-                        "Please use the -bios option to avoid breakages when "\
-                        "this happens.");
-            warn_report("See QEMU's deprecation documentation for details.");
-        }
-        return;
-    }
-
-    if (!strcmp(machine->firmware, "default")) {
-        /*
-         * The user has specified "-bios default". That means we are going to
-         * load the OpenSBI binary included in the QEMU source.
-         *
-         * We can't load the binary by default as it will break existing users
-         * as users are already loading their own firmware.
-         *
-         * Let's try to get everyone to specify the -bios option at all times,
-         * so then in the future we can make "-bios default" the default option
-         * if no -bios option is set without breaking anything.
+         * The user didn't specify -bios, or has specified "-bios default".
+         * That means we are going to load the OpenSBI binary included in
+         * the QEMU source.
          */
         firmware_filename = riscv_find_firmware(default_machine_firmware);
     } else if (strcmp(machine->firmware, "none")) {
--

2.7.4

author
#3 lore raw

Hi Alistair,

Quoted 28 lines · Alistair Francis
Quoted 16 lines · Alistair Francis
Quoted 14 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Quoted 7 lines
Quoted 1 line

Thanks!

Applied to the RISC-V tree.

This fails make check

Quoted 10 lines

qemu-system-riscv64: Unable to load the RISC-V firmware "opensbi-riscv64-spike-fw_jump.elf"
Broken pipe /scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1

Please apply this patch to fix the "make check" as well.

[5/5] riscv: Suppress the error report for QEMU testing with riscv_find_firmware()
http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Regards,
Bin

#4 lore raw
Quoted 43 lines · Bin Meng

Hi Alistair,

Quoted 28 lines · Alistair Francis
Quoted 16 lines · Alistair Francis
Quoted 14 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Quoted 7 lines
Quoted 1 line

Thanks!

Applied to the RISC-V tree.

This fails make check

Quoted 10 lines

qemu-system-riscv64: Unable to load the RISC-V firmware "opensbi-riscv64-spike-fw_jump.elf"
Broken pipe /scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1

Quoted 5 lines

Please apply this patch to fix the "make check" as well.

[5/5] riscv: Suppress the error report for QEMU testing with riscv_find_firmware()
http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

In future please send all related patches in a single series.

I have applied those two patches.

Alistair

Quoted 3 lines

Regards,
Bin

author
#5 lore raw

Hi Alistair,

Quoted 47 lines · Alistair Francis
Quoted 45 lines · Bin Meng

Hi Alistair,

Quoted 28 lines · Alistair Francis
Quoted 16 lines · Alistair Francis
Quoted 14 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Quoted 7 lines
Quoted 1 line

Thanks!

Applied to the RISC-V tree.

This fails make check

Quoted 10 lines

qemu-system-riscv64: Unable to load the RISC-V firmware "opensbi-riscv64-spike-fw_jump.elf"
Broken pipe /scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1

Please apply this patch to fix the "make check" as well.

Quoted 7 lines
Quoted 3 lines

[5/5] riscv: Suppress the error report for QEMU testing with riscv_find_firmware()
http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

In future please send all related patches in a single series.

I have applied those two patches.

I checked https://github.com/alistair23/qemu/ but could not find where these 2 patches applied. Just make sure I was not looking at the wrong place?

Regards,
Bin

#6 lore raw
Quoted 55 lines · Bin Meng

Hi Alistair,

Quoted 51 lines · Alistair Francis
Quoted 48 lines · Bin Meng

Hi Alistair,

Quoted 28 lines · Alistair Francis
Quoted 16 lines · Alistair Francis
Quoted 14 lines · Bin Meng

From: Bin Meng <[email protected]>

Per QEMU deprecated doc, QEMU 4.1 introduced support for the -bios option in QEMU for RISC-V for the virt machine and sifive_u machine. The default behavior has been that QEMU does not automatically load any firmware if no -bios option is included.

Now 2 releases passed, it's time to change the default behavior to load the default OpenSBI firmware automatically. The firmware is included with the QEMU release and no user interaction is required. All a user needs to do is specify the kernel they want to boot with the -kernel option.

Quoted 7 lines
Quoted 1 line

Thanks!

Applied to the RISC-V tree.

This fails make check

Quoted 10 lines

qemu-system-riscv64: Unable to load the RISC-V firmware "opensbi-riscv64-spike-fw_jump.elf"
Broken pipe /scratch/alistair/software/qemu/tests/qtest/libqtest.c:166:
kill_qemu() tried to terminate QEMU process but encountered exit status 1 (expected 0)
ERROR - too few tests run (expected 7, got 2)
make: *** [/scratch/alistair/software/qemu/tests/Makefile.include:637:
check-qtest-riscv64] Error 1

Please apply this patch to fix the "make check" as well.

[5/5] riscv: Suppress the error report for QEMU testing with riscv_find_firmware()
http://patchwork.ozlabs.org/project/qemu-devel/patch/[email protected]/

Quoted 7 lines
Quoted 3 lines

In future please send all related patches in a single series.

I have applied those two patches.

I checked https://github.com/alistair23/qemu/ but could not find where these 2 patches applied. Just make sure I was not looking at the wrong place?

That's the right place, I just hadn't pushed it there yet.

I have an internal Git instance that does all the testing so I usually push it there.

Alistair

Quoted 3 lines

Regards,
Bin