motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 08:17:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/riscv: Allow direct start of kernel for MPFS

Browse source 
Further customize the -bios and -kernel options behaviour for the
microchip-icicle-kit machine.  If "-bios none -kernel filename" is
specified, then do not load a firmware and instead only load and start
the kernel image.

For test runs, use an approach similar to
riscv_find_and_load_firmware().

Signed-off-by: Sebastian Huber <sebastian.huber@embedded-brains.de>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-ID: <20250319061342.26435-5-sebastian.huber@embedded-brains.de>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Sebastian Huber 2025-03-19 07:13:36 +01:00 • committed by Alistair Francis
parent 0c2ca9e4d1
commit 6dd6f11710
1 changed files with 42 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

49
hw/riscv/microchip_pfsoc.c
View file

@ -578,18 +578,25 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
} }
/* /*
* We follow the following table to select which payload we execute. * We follow the following table to select which firmware we use.
* *
* -bios | -kernel | payload * -bios | -kernel | firmware
* -------+------------+-------- * --------------+------------+--------
* N | N | HSS * none | N | error
* Y | don't care | HSS * none | Y | kernel
* N | Y | kernel * NULL, default | N | BIOS_FILENAME
* * NULL, default | Y | RISCV64_BIOS_BIN
* This ensures backwards compatibility with how we used to expose -bios * other | don't care | other
* to users but allows them to run through direct kernel booting as well.
*/ */
if (machine->firmware && !strcmp(machine->firmware, "none")) {
if (!machine->kernel_filename) {
error_report("for -bios none, a kernel is required");
exit(1);
}
firmware_name = NULL;
firmware_load_addr = RESET_VECTOR;
} else if (!machine->firmware || !strcmp(machine->firmware, "default")) {
if (machine->kernel_filename) { if (machine->kernel_filename) {
firmware_name = RISCV64_BIOS_BIN; firmware_name = RISCV64_BIOS_BIN;
firmware_load_addr = memmap[MICROCHIP_PFSOC_DRAM_LO].base; firmware_load_addr = memmap[MICROCHIP_PFSOC_DRAM_LO].base;
@ -597,10 +604,21 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
firmware_name = BIOS_FILENAME; firmware_name = BIOS_FILENAME;
firmware_load_addr = RESET_VECTOR; firmware_load_addr = RESET_VECTOR;
} }
} else {
firmware_name = machine->firmware;
firmware_load_addr = RESET_VECTOR;
}
/* Load the firmware */ /* Load the firmware if necessary */
firmware_end_addr = riscv_find_and_load_firmware(machine, firmware_name, firmware_end_addr = firmware_load_addr;
if (firmware_name) {
char *filename = riscv_find_firmware(firmware_name, NULL);
if (filename) {
firmware_end_addr = riscv_load_firmware(filename,
&firmware_load_addr, NULL); &firmware_load_addr, NULL);
g_free(filename);
}
}
riscv_boot_info_init(&boot_info, &s->soc.u_cpus); riscv_boot_info_init(&boot_info, &s->soc.u_cpus);
if (machine->kernel_filename) { if (machine->kernel_filename) {
@ -638,8 +656,15 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)
fdt_load_addr = 0; fdt_load_addr = 0;
} }
hwaddr start_addr;
if (firmware_name) {
start_addr = firmware_load_addr;
} else {
start_addr = kernel_entry;
}
/* Load the reset vector */ /* Load the reset vector */
riscv_setup_rom_reset_vec(machine, &s->soc.u_cpus, firmware_load_addr, riscv_setup_rom_reset_vec(machine, &s->soc.u_cpus, start_addr,
memmap[MICROCHIP_PFSOC_ENVM_DATA].base, memmap[MICROCHIP_PFSOC_ENVM_DATA].base,
memmap[MICROCHIP_PFSOC_ENVM_DATA].size, memmap[MICROCHIP_PFSOC_ENVM_DATA].size,
kernel_entry, fdt_load_addr); kernel_entry, fdt_load_addr);