* [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images
@ 2020-08-03 7:30 Bin Meng
2020-08-03 7:30 ` [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
` (6 more replies)
0 siblings, 7 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
The RISC-V generic platform is a flattened device tree (FDT) based
platform where all platform specific functionality is provided based
on FDT passed by previous booting stage. The support was added in
the upstream OpenSBI v0.8 release recently.
This series updates QEMU to switch to use generic platform of opensbi
bios images. With the recent fw_dynamic image support, let's replace
the fw_jump images with fw_dynamic ones too.
The patch emails do not contain binary bits, please grab all updates
at https://github.com/lbmeng/qemu.git bios branch.
Note:
1. To test 32-bit Linux kernel on QEMU 'sifive_u' 32-bit machine,
the following patch is needed:
http://lists.infradead.org/pipermail/linux-riscv/2020-July/001213.html
2. To test 64-bit Linux 5.3 kernel on QEMU 'virt' or 'sifive_u' 64-bit
machines, the following commit should be cherry-picked to 5.3:
commit 922b0375fc93fb1a20c5617e37c389c26bbccb70
Author: Albert Ou <aou@eecs.berkeley.edu>
Date: Fri Sep 27 16:14:18 2019 -0700
riscv: Fix memblock reservation for device tree blob
Linux 5.4 or above already contains this commit/fix.
Changes in v6:
- Rebased on https://github.com/alistair23/qemu/commits/riscv-to-apply.next
- Add information about Linux kernel tested
- Squash the Makefile ELF changes into patch 5
Changes in v5:
- Include the generic fw_dynamic.bin in the Makefile for `make install` bisection
Changes in v4:
- Remove old binaries in the Makefile for `make install` bisection
Changes in v3:
- Change fw_jump to fw_dynamic in the make rules
- Change to fw_dynamic.bin for virt & sifive_u
- Change to fw_dynamic.elf for Spike
- Generate fw_dynamic images in the artifacts
Changes in v2:
- new patch: configure: Create symbolic links for pc-bios/*.elf files
- Upgrade OpenSBI to v0.8 release
- Copy the ELF images too in the make rules
- Include ELF images in the artifacts
Bin Meng (6):
configure: Create symbolic links for pc-bios/*.elf files
roms/opensbi: Upgrade from v0.7 to v0.8
roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
hw/riscv: Use pre-built bios image of generic platform for virt &
sifive_u
hw/riscv: spike: Change the default bios to use generic platform image
gitlab-ci/opensbi: Update GitLab CI to build generic platform
.gitlab-ci.d/opensbi.yml | 28 ++++++++--------------
Makefile | 4 ++--
configure | 1 +
hw/riscv/sifive_u.c | 4 ++--
hw/riscv/spike.c | 9 +++++--
hw/riscv/virt.c | 4 ++--
pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 0 -> 62144 bytes
pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 0 -> 558668 bytes
pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes
pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin 49504 -> 0 bytes
pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 0 -> 70792 bytes
pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 0 -> 620424 bytes
pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes
pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 57920 -> 0 bytes
roms/Makefile | 32 ++++++++-----------------
roms/opensbi | 2 +-
16 files changed, 35 insertions(+), 49 deletions(-)
create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin
create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
--
2.7.4
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-03 7:30 ` [PATCH v6 2/6] roms/opensbi: Upgrade from v0.7 to v0.8 Bin Meng
` (5 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
Now we need to ship the OpenSBI fw_dynamic.elf image for the
RISC-V Spike machine, it requires us to create symbolic links
for pc-bios/*.elf files.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v2)
Changes in v2:
- new patch: configure: Create symbolic links for pc-bios/*.elf files
configure | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure b/configure
index 2acc4d1..790b21d 100755
--- a/configure
+++ b/configure
@@ -8545,6 +8545,7 @@ LINKS="$LINKS tests/qemu-iotests/check"
LINKS="$LINKS python"
for bios_file in \
$source_path/pc-bios/*.bin \
+ $source_path/pc-bios/*.elf \
$source_path/pc-bios/*.lid \
$source_path/pc-bios/*.rom \
$source_path/pc-bios/*.dtb \
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 2/6] roms/opensbi: Upgrade from v0.7 to v0.8
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
2020-08-03 7:30 ` [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-03 7:30 ` [PATCH v6 3/6] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware Bin Meng
` (4 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
Upgrade OpenSBI from v0.7 to v0.8.
The v0.8 release includes the following commits:
1bb00ab lib: No need to provide default PMP region using platform callbacks
a9eac67 include: sbi_platform: Combine reboot and shutdown into one callback
6585fab lib: utils: Add SiFive test device
4781545 platform: Add Nuclei UX600 platform
3a326af scripts: adapt binary archive script for Nuclei UX600
5bdf022 firmware: fw_base: Remove CSR_MTVEC update check
e6c1345 lib: utils/serial: Skip baudrate config if input frequency is zero
01a8c8e lib: utils: Improve fdt_parse_uart8250() API
0a0093b lib: utils: Add fdt_parse_uart8250_node() function
243b0d0 lib: utils: Remove redundant clint_ipi_sync() declaration
e3ad7c1 lib: utils: Rename fdt_parse_clint() to fdt_parse_compat_addr()
a39cd6f lib: utils: Add FDT match table based node lookup
dd33b9e lib: utils: Make fdt_get_node_addr_size() public function
66185b3 lib: utils: Add fdt_parse_sifive_uart_node() function
19e966b lib: utils: Add fdt_parse_hart_id() function
44dd7be lib: utils: Add fdt_parse_max_hart_id() API
f0eb503 lib: utils: Add fdt_parse_plic_node() function
1ac794c include: Add array_size() macro
8ff2b94 lib: utils: Add simple FDT timer framework
76f0f81 lib: utils: Add simple FDT ipi framework
75322a6 lib: utils: Add simple FDT irqchip framework
76a8940 lib: utils: Add simple FDT serial framework
7cc6fa4 lib: utils: Add simple FDT reset framework
4d06353 firmware: fw_base: Introduce optional fw_platform_init()
f1aa9e5 platform: Add generic FDT based platform support
1f21b99 lib: sbi: Print platform hart count at boot time
2ba7087 scripts: Add generic platform to create-binary-archive.sh
4f18c6e platform: generic: Add Sifive FU540 TLB flush range limit override
13717a8 platform: Remove qemu/virt directory
65c06b0 platform: Remove spike directory
d626037 docs: Add missing links in platform.md
7993ca2 include: sbi: Remove redundant page table related defines
5338679 lib: sbi_tlb: Fix remote TLB HFENCE VVMA implementation
dc38929 lib: sbi: Improve misa_string() implementation
433bac7 docs: platform/generic: Add details about stdout-path DT property
b4efa70 docs: platform/generic: Add details about IPI and timer expectations
dfd9dd6 docs: Add platform requirements document
c2286b6 docs: Fix ordering of pages in table of contents
7be75f5 docs: Don't use italic text in page title
63a513e lib: Rename unprivileged trap handler
aef9a60 lib: Add csr detect support
13ca20d lib: Create a separate math helper function file
79d0fad lib: utils: Update reserved memory fdt node even if PMP is not present
6a053f6 lib: Add support for hart specific features
b2df751 platform: Move platform features to hart
4938024 platform: fpga: Remove redundant platform specific features
ec0d2a7 lib: timer: Provide a hart based timer feature
1f235ec lib: Add platform features in boot time print
22c4334 lib: Add hart features in boot time print
36833ab lib: Optimize inline assembly for unprivilege access functions
38a4b54 firmware: Correct spelling mistakes
28b4052 lib: sbi: detect features before everything else in sbi_hart_init()
4984183 lib: sbi: Improve get_feature_str() implementation and usage
3aa1036 lib: sbi: Remove extra spaces from boot time prints
3a8fc81 lib: sbi: Print platform HART count just before boot HART id
63b0f5f include: sbi: Use scratch pointer as parmeter in HART feature APIs
2966510 lib: sbi: Few cosmetic improvements to HART feature detection
a38bea9 lib: sbi_hart: Detect number of supported PMP regions
89ba634 include: sbi: Add firmware extension constants
73d6ef3 lib: utils: Remove redundant parameters from PLIC init functions
446a9c6 lib: utils: Allow PLIC functions to be used for multiple PLICs
2c685c2 lib: utils: Extend fdt_find_match() Implementation
d30bb68 lib: utils/irqchip: Initialize all matching irqchip DT nodes
a9a9751 lib: utils: Allow CLINT functions to be used for multiple CLINTs
569dd64 lib: utils: Add fdt_parse_clint_node() function
6956e83 lib: utils/ipi: Initialize all matching ipi DT nodes
a63f05f lib: utils/timer: Initialize all matching timer DT nodes
30b6040 Makefile: Fix builtin DTB compilation for out-of-tree platforms
64f1408 firmware: fw_base: Make builtin DTB available to fw_platform_init()
4ce6b7a firmware: fw_base: Don't OR forced FW_OPTIONS
86ec534 firmware: Allow fw_platform_init() to return updated FDT location
c6c65ee Makefile: Preprocess builtin DTS
4e3876d Makefile: Add mechanism for platforms to have multiple builtin DTBs
72019ee platform: kendryte/k210: Use new mechanism of builtin DTB
51f0e4a firmware: Remove FW_PAYLOAD_FDT and related documentation
1b8c012 lib: Add RISC-V hypervisor v0.6.1 support
79bfd67 docs: Use doxygen config to mark the main page
106b888 docs: Remove redundant documentation about combined payload use case
9802906 platform: Add AE350 platform specific SBI handler
32f87e5 platform: Add AE350 cache control SBIs
e2c3f01 lib: Fix __sbi_hfence_gvma_vmid_gpa() and __sbi_hfence_vvma_asid_va()
6966ad0 platform/lib: Allow the OS to map the regions that are protected by PMP
518e85c platform: Update Nuclei ux600 platform support
d5725c2 lib: Don't print delegation CSRs if there is no S-Mode
637b348 lib: Fix the SBI_HART_HAS_MCOUNTEREN feature check
db56ef3 platform: Add support for Shakti C-class SoC from IIT-M
9bd5f8f lib: sbi: Fix 32/64 bits variable compatibility
2314101 lib: Don't return any invalid error from SBI ecall
a98258d include: Bump-up version to 0.8
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v2)
Changes in v2:
- Upgrade OpenSBI to v0.8 release
roms/opensbi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roms/opensbi b/roms/opensbi
index 9f1b72c..a98258d 160000
--- a/roms/opensbi
+++ b/roms/opensbi
@@ -1 +1 @@
-Subproject commit 9f1b72ce66d659e91013b358939e832fb27223f5
+Subproject commit a98258d0b537a295f517bbc8d813007336731fa9
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 3/6] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
2020-08-03 7:30 ` [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
2020-08-03 7:30 ` [PATCH v6 2/6] roms/opensbi: Upgrade from v0.7 to v0.8 Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-03 7:30 ` [PATCH v6 4/6] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Bin Meng
` (3 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
The RISC-V generic platform is a flattened device tree (FDT) based
platform where all platform specific functionality is provided based
on FDT passed by previous booting stage. The support was added in
the upstream OpenSBI v0.8 release recently.
Update our Makefile to build the generic platform instead of building
virt and sifive_u separately for RISC-V OpenSBI firmware, and change
to use fw_dynamic type images as well.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v3)
Changes in v3:
- Change fw_jump to fw_dynamic in the make rules
Changes in v2:
- Copy the ELF images too in the make rules
roms/Makefile | 32 ++++++++++----------------------
1 file changed, 10 insertions(+), 22 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index f9acf39..5d9f15b 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -64,10 +64,8 @@ default help:
@echo " u-boot.e500 -- update u-boot.e500"
@echo " u-boot.sam460 -- update u-boot.sam460"
@echo " efi -- update UEFI (edk2) platform firmware"
- @echo " opensbi32-virt -- update OpenSBI for 32-bit virt machine"
- @echo " opensbi64-virt -- update OpenSBI for 64-bit virt machine"
- @echo " opensbi32-sifive_u -- update OpenSBI for 32-bit sifive_u machine"
- @echo " opensbi64-sifive_u -- update OpenSBI for 64-bit sifive_u machine"
+ @echo " opensbi32-generic -- update OpenSBI for 32-bit generic machine"
+ @echo " opensbi64-generic -- update OpenSBI for 64-bit generic machine"
@echo " bios-microvm -- update bios-microvm.bin (qboot)"
@echo " clean -- delete the files generated by the previous" \
"build targets"
@@ -170,29 +168,19 @@ skiboot:
efi: edk2-basetools
$(MAKE) -f Makefile.edk2
-opensbi32-virt:
+opensbi32-generic:
$(MAKE) -C opensbi \
CROSS_COMPILE=$(riscv32_cross_prefix) \
- PLATFORM="qemu/virt"
- cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-virt-fw_jump.bin
+ PLATFORM="generic"
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
-opensbi64-virt:
+opensbi64-generic:
$(MAKE) -C opensbi \
CROSS_COMPILE=$(riscv64_cross_prefix) \
- PLATFORM="qemu/virt"
- cp opensbi/build/platform/qemu/virt/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-virt-fw_jump.bin
-
-opensbi32-sifive_u:
- $(MAKE) -C opensbi \
- CROSS_COMPILE=$(riscv32_cross_prefix) \
- PLATFORM="sifive/fu540"
- cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
-
-opensbi64-sifive_u:
- $(MAKE) -C opensbi \
- CROSS_COMPILE=$(riscv64_cross_prefix) \
- PLATFORM="sifive/fu540"
- cp opensbi/build/platform/sifive/fu540/firmware/fw_jump.bin ../pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
+ PLATFORM="generic"
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.bin ../pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
+ cp opensbi/build/platform/generic/firmware/fw_dynamic.elf ../pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
bios-microvm:
$(MAKE) -C qboot
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 4/6] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
` (2 preceding siblings ...)
2020-08-03 7:30 ` [PATCH v6 3/6] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-03 7:30 ` [PATCH v6 5/6] hw/riscv: spike: Change the default bios to use generic platform image Bin Meng
` (2 subsequent siblings)
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
Update virt and sifive_u machines to use the opensbi fw_dynamic bios
image built for the generic FDT platform.
Remove the out-of-date no longer used bios images.
Note:
1. To test 32-bit Linux kernel on QEMU 'sifive_u' 32-bit machine,
the following patch is needed:
http://lists.infradead.org/pipermail/linux-riscv/2020-July/001213.html
2. To test 64-bit Linux 5.3 kernel on QEMU 'virt' or 'sifive_u' 64-bit
machines, the following commit should be cherry-picked to 5.3:
commit 922b0375fc93fb1a20c5617e37c389c26bbccb70
Author: Albert Ou <aou@eecs.berkeley.edu>
Date: Fri Sep 27 16:14:18 2019 -0700
riscv: Fix memblock reservation for device tree blob
Linux 5.4 or above already contains this commit/fix.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
Changes in v6:
- Add information about Linux kernel tested
Changes in v5:
- Include the generic fw_dynamic.bin in the Makefile for `make install` bisection
Changes in v4:
- Remove old binaries in the Makefile for `make install` bisection
Changes in v3:
- Change to fw_dynamic.bin for virt & sifive_u
Makefile | 3 +--
hw/riscv/sifive_u.c | 4 ++--
hw/riscv/virt.c | 4 ++--
pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 0 -> 62144 bytes
pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes
pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin 49504 -> 0 bytes
pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 0 -> 70792 bytes
pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes
pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 57920 -> 0 bytes
9 files changed, 5 insertions(+), 6 deletions(-)
create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin
create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
diff --git a/Makefile b/Makefile
index c2120d8..9d87135 100644
--- a/Makefile
+++ b/Makefile
@@ -842,8 +842,7 @@ u-boot.e500 u-boot-sam460-20100605.bin \
qemu_vga.ndrv \
edk2-licenses.txt \
hppa-firmware.img \
-opensbi-riscv32-sifive_u-fw_jump.bin opensbi-riscv32-virt-fw_jump.bin \
-opensbi-riscv64-sifive_u-fw_jump.bin opensbi-riscv64-virt-fw_jump.bin
+opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin
DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \
diff --git a/hw/riscv/sifive_u.c b/hw/riscv/sifive_u.c
index 55b3383..18301e6 100644
--- a/hw/riscv/sifive_u.c
+++ b/hw/riscv/sifive_u.c
@@ -60,9 +60,9 @@
#include <libfdt.h>
#if defined(TARGET_RISCV32)
-# define BIOS_FILENAME "opensbi-riscv32-sifive_u-fw_jump.bin"
+# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"
#else
-# define BIOS_FILENAME "opensbi-riscv64-sifive_u-fw_jump.bin"
+# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin"
#endif
static const struct MemmapEntry {
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c
index 55a907b..6e91cf1 100644
--- a/hw/riscv/virt.c
+++ b/hw/riscv/virt.c
@@ -43,9 +43,9 @@
#include "hw/pci-host/gpex.h"
#if defined(TARGET_RISCV32)
-# define BIOS_FILENAME "opensbi-riscv32-virt-fw_jump.bin"
+# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.bin"
#else
-# define BIOS_FILENAME "opensbi-riscv64-virt-fw_jump.bin"
+# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.bin"
#endif
static const struct MemmapEntry {
diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
new file mode 100644
index 0000000..23b4dfb
Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.bin differ
diff --git a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin b/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
deleted file mode 100644
index 3e0da54..0000000
Binary files a/pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin and /dev/null differ
diff --git a/pc-bios/opensbi-riscv32-virt-fw_jump.bin b/pc-bios/opensbi-riscv32-virt-fw_jump.bin
deleted file mode 100644
index bc56ed6..0000000
Binary files a/pc-bios/opensbi-riscv32-virt-fw_jump.bin and /dev/null differ
diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
new file mode 100644
index 0000000..16c0cf4
Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.bin differ
diff --git a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin b/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
deleted file mode 100644
index 1acee86..0000000
Binary files a/pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin and /dev/null differ
diff --git a/pc-bios/opensbi-riscv64-virt-fw_jump.bin b/pc-bios/opensbi-riscv64-virt-fw_jump.bin
deleted file mode 100644
index c62f2b4..0000000
Binary files a/pc-bios/opensbi-riscv64-virt-fw_jump.bin and /dev/null differ
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 5/6] hw/riscv: spike: Change the default bios to use generic platform image
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
` (3 preceding siblings ...)
2020-08-03 7:30 ` [PATCH v6 4/6] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-03 7:30 ` [PATCH v6 6/6] gitlab-ci/opensbi: Update GitLab CI to build generic platform Bin Meng
2020-08-12 3:25 ` [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Alistair Francis
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
To keep sync with other RISC-V machines, change the default bios to
use generic platform fw_dynamic.elf image.
While we are here, add some comments to mention that using ELF files
for the Spike machine was intentional.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
Changes in v6:
- Squash the Makefile ELF changes into this commit
Changes in v3:
- Change to fw_dynamic.elf for Spike
Makefile | 3 ++-
hw/riscv/spike.c | 9 +++++++--
pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 0 -> 558668 bytes
pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 0 -> 620424 bytes
4 files changed, 9 insertions(+), 3 deletions(-)
create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
diff --git a/Makefile b/Makefile
index 9d87135..58db99f 100644
--- a/Makefile
+++ b/Makefile
@@ -842,7 +842,8 @@ u-boot.e500 u-boot-sam460-20100605.bin \
qemu_vga.ndrv \
edk2-licenses.txt \
hppa-firmware.img \
-opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin
+opensbi-riscv32-generic-fw_dynamic.bin opensbi-riscv64-generic-fw_dynamic.bin \
+opensbi-riscv32-generic-fw_dynamic.elf opensbi-riscv64-generic-fw_dynamic.elf
DESCS=50-edk2-i386-secure.json 50-edk2-x86_64-secure.json \
diff --git a/hw/riscv/spike.c b/hw/riscv/spike.c
index 7b23a29..13958bd 100644
--- a/hw/riscv/spike.c
+++ b/hw/riscv/spike.c
@@ -42,10 +42,15 @@
#include "sysemu/qtest.h"
#include "sysemu/sysemu.h"
+/*
+ * Not like other RISC-V machines that use plain binary bios images,
+ * keeping ELF files here was intentional because BIN files don't work
+ * for the Spike machine as HTIF emulation depends on ELF parsing.
+ */
#if defined(TARGET_RISCV32)
-# define BIOS_FILENAME "opensbi-riscv32-spike-fw_jump.elf"
+# define BIOS_FILENAME "opensbi-riscv32-generic-fw_dynamic.elf"
#else
-# define BIOS_FILENAME "opensbi-riscv64-spike-fw_jump.elf"
+# define BIOS_FILENAME "opensbi-riscv64-generic-fw_dynamic.elf"
#endif
static const struct MemmapEntry {
diff --git a/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
new file mode 100644
index 0000000..eb9ebf5
Binary files /dev/null and b/pc-bios/opensbi-riscv32-generic-fw_dynamic.elf differ
diff --git a/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
new file mode 100644
index 0000000..642a64e
Binary files /dev/null and b/pc-bios/opensbi-riscv64-generic-fw_dynamic.elf differ
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v6 6/6] gitlab-ci/opensbi: Update GitLab CI to build generic platform
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
` (4 preceding siblings ...)
2020-08-03 7:30 ` [PATCH v6 5/6] hw/riscv: spike: Change the default bios to use generic platform image Bin Meng
@ 2020-08-03 7:30 ` Bin Meng
2020-08-12 3:25 ` [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Alistair Francis
6 siblings, 0 replies; 8+ messages in thread
From: Bin Meng @ 2020-08-03 7:30 UTC (permalink / raw)
To: Alistair Francis, Bastian Koppelmann, Palmer Dabbelt,
Sagar Karandikar, qemu-devel, qemu-riscv
Cc: Bin Meng
From: Bin Meng <bin.meng@windriver.com>
This updates the GitLab CI opensbi job to build opensbi bios images
for the generic platform.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
---
(no changes since v3)
Changes in v3:
- Generate fw_dynamic images in the artifacts
Changes in v2:
- Include ELF images in the artifacts
.gitlab-ci.d/opensbi.yml | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.d/opensbi.yml b/.gitlab-ci.d/opensbi.yml
index 62088ec..5b13047 100644
--- a/.gitlab-ci.d/opensbi.yml
+++ b/.gitlab-ci.d/opensbi.yml
@@ -35,18 +35,14 @@ build-opensbi:
when: always
artifacts:
paths: # 'artifacts.zip' will contains the following files:
- - pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
- - pc-bios/opensbi-riscv32-virt-fw_jump.bin
- - pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
- - pc-bios/opensbi-riscv64-virt-fw_jump.bin
- - opensbi32-virt-stdout.log
- - opensbi32-virt-stderr.log
- - opensbi64-virt-stdout.log
- - opensbi64-virt-stderr.log
- - opensbi32-sifive_u-stdout.log
- - opensbi32-sifive_u-stderr.log
- - opensbi64-sifive_u-stdout.log
- - opensbi64-sifive_u-stderr.log
+ - pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
+ - pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
+ - pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
+ - pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
+ - opensbi32-generic-stdout.log
+ - opensbi32-generic-stderr.log
+ - opensbi64-generic-stdout.log
+ - opensbi64-generic-stderr.log
image: $CI_REGISTRY_IMAGE:opensbi-cross-build
variables:
GIT_DEPTH: 3
@@ -55,10 +51,6 @@ build-opensbi:
- export JOBS=$(($(getconf _NPROCESSORS_ONLN) + 1))
- echo "=== Using ${JOBS} simultaneous jobs ==="
- make -j${JOBS} -C roms/opensbi clean
- - make -j${JOBS} -C roms opensbi32-virt 2>&1 1>opensbi32-virt-stdout.log | tee -a opensbi32-virt-stderr.log >&2
+ - make -j${JOBS} -C roms opensbi32-generic 2>&1 1>opensbi32-generic-stdout.log | tee -a opensbi32-generic-stderr.log >&2
- make -j${JOBS} -C roms/opensbi clean
- - make -j${JOBS} -C roms opensbi64-virt 2>&1 1>opensbi64-virt-stdout.log | tee -a opensbi64-virt-stderr.log >&2
- - make -j${JOBS} -C roms/opensbi clean
- - make -j${JOBS} -C roms opensbi32-sifive_u 2>&1 1>opensbi32-sifive_u-stdout.log | tee -a opensbi32-sifive_u-stderr.log >&2
- - make -j${JOBS} -C roms/opensbi clean
- - make -j${JOBS} -C roms opensbi64-sifive_u 2>&1 1>opensbi64-sifive_u-stdout.log | tee -a opensbi64-sifive_u-stderr.log >&2
+ - make -j${JOBS} -C roms opensbi64-generic 2>&1 1>opensbi64-generic-stdout.log | tee -a opensbi64-generic-stderr.log >&2
--
2.7.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
` (5 preceding siblings ...)
2020-08-03 7:30 ` [PATCH v6 6/6] gitlab-ci/opensbi: Update GitLab CI to build generic platform Bin Meng
@ 2020-08-12 3:25 ` Alistair Francis
6 siblings, 0 replies; 8+ messages in thread
From: Alistair Francis @ 2020-08-12 3:25 UTC (permalink / raw)
To: Bin Meng
Cc: Bin Meng, open list:RISC-V, Sagar Karandikar, Bastian Koppelmann,
Palmer Dabbelt, qemu-devel@nongnu.org Developers,
Alistair Francis
On Mon, Aug 3, 2020 at 12:31 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> The RISC-V generic platform is a flattened device tree (FDT) based
> platform where all platform specific functionality is provided based
> on FDT passed by previous booting stage. The support was added in
> the upstream OpenSBI v0.8 release recently.
>
> This series updates QEMU to switch to use generic platform of opensbi
> bios images. With the recent fw_dynamic image support, let's replace
> the fw_jump images with fw_dynamic ones too.
>
> The patch emails do not contain binary bits, please grab all updates
> at https://github.com/lbmeng/qemu.git bios branch.
>
> Note:
>
> 1. To test 32-bit Linux kernel on QEMU 'sifive_u' 32-bit machine,
> the following patch is needed:
> http://lists.infradead.org/pipermail/linux-riscv/2020-July/001213.html
>
> 2. To test 64-bit Linux 5.3 kernel on QEMU 'virt' or 'sifive_u' 64-bit
> machines, the following commit should be cherry-picked to 5.3:
>
> commit 922b0375fc93fb1a20c5617e37c389c26bbccb70
> Author: Albert Ou <aou@eecs.berkeley.edu>
> Date: Fri Sep 27 16:14:18 2019 -0700
>
> riscv: Fix memblock reservation for device tree blob
>
> Linux 5.4 or above already contains this commit/fix.
Thanks for this.
Applied to riscv-to-apply.next
Alistair
>
> Changes in v6:
> - Rebased on https://github.com/alistair23/qemu/commits/riscv-to-apply.next
> - Add information about Linux kernel tested
> - Squash the Makefile ELF changes into patch 5
>
> Changes in v5:
> - Include the generic fw_dynamic.bin in the Makefile for `make install` bisection
>
> Changes in v4:
> - Remove old binaries in the Makefile for `make install` bisection
>
> Changes in v3:
> - Change fw_jump to fw_dynamic in the make rules
> - Change to fw_dynamic.bin for virt & sifive_u
> - Change to fw_dynamic.elf for Spike
> - Generate fw_dynamic images in the artifacts
>
> Changes in v2:
> - new patch: configure: Create symbolic links for pc-bios/*.elf files
> - Upgrade OpenSBI to v0.8 release
> - Copy the ELF images too in the make rules
> - Include ELF images in the artifacts
>
> Bin Meng (6):
> configure: Create symbolic links for pc-bios/*.elf files
> roms/opensbi: Upgrade from v0.7 to v0.8
> roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware
> hw/riscv: Use pre-built bios image of generic platform for virt &
> sifive_u
> hw/riscv: spike: Change the default bios to use generic platform image
> gitlab-ci/opensbi: Update GitLab CI to build generic platform
>
> .gitlab-ci.d/opensbi.yml | 28 ++++++++--------------
> Makefile | 4 ++--
> configure | 1 +
> hw/riscv/sifive_u.c | 4 ++--
> hw/riscv/spike.c | 9 +++++--
> hw/riscv/virt.c | 4 ++--
> pc-bios/opensbi-riscv32-generic-fw_dynamic.bin | Bin 0 -> 62144 bytes
> pc-bios/opensbi-riscv32-generic-fw_dynamic.elf | Bin 0 -> 558668 bytes
> pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin | Bin 49520 -> 0 bytes
> pc-bios/opensbi-riscv32-virt-fw_jump.bin | Bin 49504 -> 0 bytes
> pc-bios/opensbi-riscv64-generic-fw_dynamic.bin | Bin 0 -> 70792 bytes
> pc-bios/opensbi-riscv64-generic-fw_dynamic.elf | Bin 0 -> 620424 bytes
> pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin | Bin 57936 -> 0 bytes
> pc-bios/opensbi-riscv64-virt-fw_jump.bin | Bin 57920 -> 0 bytes
> roms/Makefile | 32 ++++++++-----------------
> roms/opensbi | 2 +-
> 16 files changed, 35 insertions(+), 49 deletions(-)
> create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.bin
> create mode 100644 pc-bios/opensbi-riscv32-generic-fw_dynamic.elf
> delete mode 100644 pc-bios/opensbi-riscv32-sifive_u-fw_jump.bin
> delete mode 100644 pc-bios/opensbi-riscv32-virt-fw_jump.bin
> create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.bin
> create mode 100644 pc-bios/opensbi-riscv64-generic-fw_dynamic.elf
> delete mode 100644 pc-bios/opensbi-riscv64-sifive_u-fw_jump.bin
> delete mode 100644 pc-bios/opensbi-riscv64-virt-fw_jump.bin
>
> --
> 2.7.4
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-08-12 3:37 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-03 7:30 [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Bin Meng
2020-08-03 7:30 ` [PATCH v6 1/6] configure: Create symbolic links for pc-bios/*.elf files Bin Meng
2020-08-03 7:30 ` [PATCH v6 2/6] roms/opensbi: Upgrade from v0.7 to v0.8 Bin Meng
2020-08-03 7:30 ` [PATCH v6 3/6] roms/Makefile: Build the generic platform for RISC-V OpenSBI firmware Bin Meng
2020-08-03 7:30 ` [PATCH v6 4/6] hw/riscv: Use pre-built bios image of generic platform for virt & sifive_u Bin Meng
2020-08-03 7:30 ` [PATCH v6 5/6] hw/riscv: spike: Change the default bios to use generic platform image Bin Meng
2020-08-03 7:30 ` [PATCH v6 6/6] gitlab-ci/opensbi: Update GitLab CI to build generic platform Bin Meng
2020-08-12 3:25 ` [PATCH v6 0/6] riscv: Switch to use generic platform fw_dynamic type opensbi bios images Alistair Francis
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).