[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v2 6/6] hw/openrisc/openrisc_sim: Add support for initrd loading
From: |
Stafford Horne |
Subject: |
[PULL v2 6/6] hw/openrisc/openrisc_sim: Add support for initrd loading |
Date: |
Sat, 26 Feb 2022 10:59:24 +0900 |
The initrd passed via the command line is loaded into memory. It's
location and size is then added to the device tree so the kernel knows
where to find it.
Signed-off-by: Stafford Horne <shorne@gmail.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/openrisc/openrisc_sim.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index e0e71c0faa..8184caa60b 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -315,6 +315,33 @@ static hwaddr openrisc_load_kernel(ram_addr_t ram_size,
return 0;
}
+static hwaddr openrisc_load_initrd(Or1ksimState *state, const char *filename,
+ hwaddr load_start, uint64_t mem_size)
+{
+ void *fdt = state->fdt;
+ int size;
+ hwaddr start;
+
+ /* We put the initrd right after the kernel; page aligned. */
+ start = TARGET_PAGE_ALIGN(load_start);
+
+ size = load_ramdisk(filename, start, mem_size - start);
+ if (size < 0) {
+ size = load_image_targphys(filename, start, mem_size - start);
+ if (size < 0) {
+ error_report("could not load ramdisk '%s'", filename);
+ exit(1);
+ }
+ }
+
+ qemu_fdt_setprop_cell(fdt, "/chosen",
+ "linux,initrd-start", start);
+ qemu_fdt_setprop_cell(fdt, "/chosen",
+ "linux,initrd-end", start + size);
+
+ return start + size;
+}
+
static uint32_t openrisc_load_fdt(Or1ksimState *state, hwaddr load_start,
uint64_t mem_size)
{
@@ -393,6 +420,10 @@ static void openrisc_sim_init(MachineState *machine)
load_addr = openrisc_load_kernel(ram_size, kernel_filename);
if (load_addr > 0) {
+ if (machine->initrd_filename) {
+ load_addr = openrisc_load_initrd(state, machine->initrd_filename,
+ load_addr, machine->ram_size);
+ }
boot_info.fdt_addr = openrisc_load_fdt(state, load_addr,
machine->ram_size);
}
--
2.31.1
- [PULL v2 0/6] OpenRISC DTS Generation patches for 7.0, Stafford Horne, 2022/02/25
- [PULL v2 1/6] hw/openrisc/openrisc_sim: Create machine state for or1ksim, Stafford Horne, 2022/02/25
- [PULL v2 2/6] hw/openrisc/openrisc_sim: Parameterize initialization, Stafford Horne, 2022/02/25
- [PULL v2 4/6] hw/openrisc/openrisc_sim: Increase max_cpus to 4, Stafford Horne, 2022/02/25
- [PULL v2 3/6] hw/openrisc/openrisc_sim: Use IRQ splitter when connecting UART, Stafford Horne, 2022/02/25
- [PULL v2 5/6] hw/openrisc/openrisc_sim: Add automatic device tree generation, Stafford Horne, 2022/02/25
- [PULL v2 6/6] hw/openrisc/openrisc_sim: Add support for initrd loading,
Stafford Horne <=
- Re: [PULL v2 0/6] OpenRISC DTS Generation patches for 7.0, Peter Maydell, 2022/02/28