Re: [PATCH v2 09/10] hw/riscv/boot.c: consolidate all kernel init in riscv_load_kernel()

[Daniel Henrique Barboza <dbarboza@ventanamicro.com>]

On 12/28/22 09:56, Philippe Mathieu-Daudé wrote:
> On 28/12/22 13:42, Daniel Henrique Barboza wrote:
>> The microchip_icicle_kit, sifive_u, spike and virt boards are now doing
>> the same steps when '-kernel' is used:
>>
>> - execute load_kernel()
>> - load init_rd()
>> - write kernel_cmdline
>>
>> Let's fold everything inside riscv_load_kernel() to avoid code
>> repetition. Every other board that uses riscv_load_kernel() will have
>> this same behavior, including boards that doesn't have a valid FDT, so
>> we need to take care to not do FDT operations without checking it first.
>>
>> Cc: Palmer Dabbelt <palmer@dabbelt.com>
>> Signed-off-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
>> Reviewed-by: Bin Meng <bmeng@tinylab.org>
>> ---
>>   hw/riscv/boot.c            | 21 ++++++++++++++++++---
>>   hw/riscv/microchip_pfsoc.c |  9 ---------
>>   hw/riscv/sifive_u.c        |  9 ---------
>>   hw/riscv/spike.c           |  9 ---------
>>   hw/riscv/virt.c            |  9 ---------
>>   5 files changed, 18 insertions(+), 39 deletions(-)
>>
>> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
>> index cd9c989edb..95f780a228 100644
>> --- a/hw/riscv/boot.c
>> +++ b/hw/riscv/boot.c
>> @@ -177,6 +177,7 @@ target_ulong riscv_load_kernel(MachineState *machine,
>>   {
>>       const char *kernel_filename = machine->kernel_filename;
>>       uint64_t kernel_load_base, kernel_entry;
>> +    void *fdt = machine->fdt;
>>         /*
>>        * NB: Use low address not ELF entry point to ensure that the fw_dynamic
>> @@ -188,21 +189,35 @@ target_ulong riscv_load_kernel(MachineState *machine,
>>       if (load_elf_ram_sym(kernel_filename, NULL, NULL, NULL,
>>                            NULL, &kernel_load_base, NULL, NULL, 0,
>>                            EM_RISCV, 1, 0, NULL, true, sym_cb) > 0) {
>> -        return kernel_load_base;
>> +        kernel_entry = kernel_load_base;
>> +        goto out;
>>       }
>>         if (load_uimage_as(kernel_filename, &kernel_entry, NULL, NULL,
>>                          NULL, NULL, NULL) > 0) {
>> -        return kernel_entry;
>> +        goto out;
>>       }
>>         if (load_image_targphys_as(kernel_filename, kernel_start_addr,
>>                                  current_machine->ram_size, NULL) > 0) {
>> -        return kernel_start_addr;
>> +        kernel_entry = kernel_start_addr;
>> +        goto out;
>>       }
>>         error_report("could not load kernel '%s'", kernel_filename);
>>       exit(1);
>> +
>> +out:
>> +    if (machine->initrd_filename) {
>> +        riscv_load_initrd(machine, kernel_entry);
>> +    }
>> +
>> +    if (fdt && machine->kernel_cmdline && *machine->kernel_cmdline) {
>> +        qemu_fdt_setprop_string(fdt, "/chosen", "bootargs",
>> +                                machine->kernel_cmdline);
>> +    }
>> +
>> +    return kernel_entry;
>>   }
>
> Worth renaming as riscv_load_kernel_and_initrd()?

Hmmm, not a bad idea.  I'll re-send.


Daniel