hw/riscv: remove 'fdt' param from riscv_setup_rom_reset_vec()
PATCH 1/1 hw/riscv: remove 'fdt' param from riscv_setup_rom_reset_vec()
The 'fdt' param is not being used in riscv_setup_rom_reset_vec(). Simplify the API by removing it. While we're at it, remove the redundant 'return' statement at the end of function.
--- hw/riscv/boot.c | 4 +--- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/shakti_c.c | 3 +-- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- include/hw/riscv/boot.h | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-)
hw/riscv/boot.c +1 -3
@@ -286,7 +286,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr) { int i;uint32_t start_addr_hi32 =0x00000000 ;
@@ -326,8 +326,6 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts rom_base, &address_space_memory);riscv_rom_copy_firmware_info (machine, rom_base, rom_size,sizeof (reset_vec), kernel_entry); - -return ; }void riscv_setup_direct_kernel (hwaddr kernel_addr,hwaddr fdt_addr)
hw/riscv/microchip_pfsoc.c +1 -1
@@ -583,7 +583,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc.u_cpus, firmware_load_addr, memmap[MICROCHIP_PFSOC_ENVM_DATA ].base, memmap[MICROCHIP_PFSOC_ENVM_DATA ].size, - kernel_entry, fdt_load_addr, machine->fdt); + kernel_entry, fdt_load_addr); } }
hw/riscv/shakti_c.c +1 -2
@@ -66,8 +66,7 @@ static void shakti_c_machine_state_init(MachineState *mstate)riscv_setup_rom_reset_vec (mstate, &sms->soc.cpus, shakti_c_memmap[SHAKTI_C_RAM ].base, shakti_c_memmap[SHAKTI_C_ROM ].base, - shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 , -NULL ); + shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 );if (mstate->firmware) { riscv_load_firmware(mstate->firmware, shakti_c_memmap[SHAKTI_C_RAM].base,
hw/riscv/spike.c +1 -1
@@ -308,7 +308,7 @@ static void spike_board_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], memmap[SPIKE_DRAM ].base, memmap[SPIKE_MROM ].base, memmap[SPIKE_MROM ].size, kernel_entry, - fdt_load_addr, s->fdt); + fdt_load_addr);/* initialize HTIF using symbols found in load_kernel */ htif_mm_init(system_memory, mask_rom,
hw/riscv/virt.c +1 -1
@@ -1299,7 +1299,7 @@ static void virt_machine_done(Notifier *notifier, void *data)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], start_addr, virt_memmap[VIRT_MROM ].base, virt_memmap[VIRT_MROM ].size, kernel_entry, - fdt_load_addr, machine->fdt); + fdt_load_addr);/* * Only direct boot kernel is currently supported for KVM VM,
include/hw/riscv/boot.h +1 -1
@@ -51,7 +51,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr saddr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt); + uint64_t fdt_load_addr); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size,
Signature · 1 line
2.36.1
Quoted 10 lines · Daniel Henrique Barboza
The 'fdt' param is not being used in
riscv_setup_rom_reset_vec(). Simplify the API by removing it. While we're at it, remove the redundant 'return' statement at the end of function.Cc Palmer Dabbelt <[email protected]>Cc Alistair Francis <[email protected]>Cc Bin Meng <[email protected]>Cc Vijai Kumar K <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Quoted 9 lines
--- hw/riscv/boot.c | 4 +--- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/shakti_c.c | 3 +-- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- include/hw/riscv/boot.h | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-)
Quoted 10 lines · Daniel Henrique Barboza
The 'fdt' param is not being used in
riscv_setup_rom_reset_vec(). Simplify the API by removing it. While we're at it, remove the redundant 'return' statement at the end of function.Cc Palmer Dabbelt <[email protected]>Cc Alistair Francis <[email protected]>Cc Bin Meng <[email protected]>Cc Vijai Kumar K <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 101 lines
--- hw/riscv/boot.c | 4 +--- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/shakti_c.c | 3 +-- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- include/hw/riscv/boot.h | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-)hw/riscv/boot.c +1
-3@@ -286,7 +286,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr) { int i;uint32_t start_addr_hi32 =0x00000000 ;@@ -326,8 +326,6 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts rom_base, &address_space_memory);riscv_rom_copy_firmware_info (machine, rom_base, rom_size,sizeof (reset_vec), kernel_entry); - -return ; }void riscv_setup_direct_kernel (hwaddr kernel_addr,hwaddr fdt_addr)hw/riscv/microchip_pfsoc.c +1
-1@@ -583,7 +583,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc.u_cpus, firmware_load_addr, memmap[MICROCHIP_PFSOC_ENVM_DATA ].base, memmap[MICROCHIP_PFSOC_ENVM_DATA ].size, - kernel_entry, fdt_load_addr, machine->fdt); + kernel_entry, fdt_load_addr); } }hw/riscv/shakti_c.c +1
-2@@ -66,8 +66,7 @@ static void shakti_c_machine_state_init(MachineState *mstate)riscv_setup_rom_reset_vec (mstate, &sms->soc.cpus, shakti_c_memmap[SHAKTI_C_RAM ].base, shakti_c_memmap[SHAKTI_C_ROM ].base, - shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 , -NULL ); + shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 );if (mstate->firmware) { riscv_load_firmware(mstate->firmware, shakti_c_memmap[SHAKTI_C_RAM].base,hw/riscv/spike.c +1
-1@@ -308,7 +308,7 @@ static void spike_board_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], memmap[SPIKE_DRAM ].base, memmap[SPIKE_MROM ].base, memmap[SPIKE_MROM ].size, kernel_entry, - fdt_load_addr, s->fdt); + fdt_load_addr);/* initialize HTIF using symbols found in load_kernel */ htif_mm_init(system_memory, mask_rom,hw/riscv/virt.c +1
-1@@ -1299,7 +1299,7 @@ static void virt_machine_done(Notifier *notifier, void *data)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], start_addr, virt_memmap[VIRT_MROM ].base, virt_memmap[VIRT_MROM ].size, kernel_entry, - fdt_load_addr, machine->fdt); + fdt_load_addr);/* * Only direct boot kernel is currently supported for KVM VM, include/hw/riscv/boot.h +1
-2@@ -51,7 +51,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr saddr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt); + uint64_t fdt_load_addr); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size, --2.36.1
Alistair Francis
AppliedQuoted 10 lines · Daniel Henrique Barboza
The 'fdt' param is not being used in
riscv_setup_rom_reset_vec(). Simplify the API by removing it. While we're at it, remove the redundant 'return' statement at the end of function.Cc Palmer Dabbelt <[email protected]>Cc Alistair Francis <[email protected]>Cc Bin Meng <[email protected]>Cc Vijai Kumar K <[email protected]>Signed-off-by Daniel Henrique Barboza <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 101 lines
--- hw/riscv/boot.c | 4 +--- hw/riscv/microchip_pfsoc.c | 2 +- hw/riscv/shakti_c.c | 3 +-- hw/riscv/spike.c | 2 +- hw/riscv/virt.c | 2 +- include/hw/riscv/boot.h | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-)hw/riscv/boot.c +1
-3@@ -286,7 +286,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr) { int i;uint32_t start_addr_hi32 =0x00000000 ;@@ -326,8 +326,6 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts rom_base, &address_space_memory);riscv_rom_copy_firmware_info (machine, rom_base, rom_size,sizeof (reset_vec), kernel_entry); - -return ; }void riscv_setup_direct_kernel (hwaddr kernel_addr,hwaddr fdt_addr)hw/riscv/microchip_pfsoc.c +1
-1@@ -583,7 +583,7 @@ static void microchip_icicle_kit_machine_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc.u_cpus, firmware_load_addr, memmap[MICROCHIP_PFSOC_ENVM_DATA ].base, memmap[MICROCHIP_PFSOC_ENVM_DATA ].size, - kernel_entry, fdt_load_addr, machine->fdt); + kernel_entry, fdt_load_addr); } }hw/riscv/shakti_c.c +1
-2@@ -66,8 +66,7 @@ static void shakti_c_machine_state_init(MachineState *mstate)riscv_setup_rom_reset_vec (mstate, &sms->soc.cpus, shakti_c_memmap[SHAKTI_C_RAM ].base, shakti_c_memmap[SHAKTI_C_ROM ].base, - shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 , -NULL ); + shakti_c_memmap[SHAKTI_C_ROM ].size,0 ,0 );if (mstate->firmware) { riscv_load_firmware(mstate->firmware, shakti_c_memmap[SHAKTI_C_RAM].base,hw/riscv/spike.c +1
-1@@ -308,7 +308,7 @@ static void spike_board_init(MachineState *machine)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], memmap[SPIKE_DRAM ].base, memmap[SPIKE_MROM ].base, memmap[SPIKE_MROM ].size, kernel_entry, - fdt_load_addr, s->fdt); + fdt_load_addr);/* initialize HTIF using symbols found in load_kernel */ htif_mm_init(system_memory, mask_rom,hw/riscv/virt.c +1
-1@@ -1299,7 +1299,7 @@ static void virt_machine_done(Notifier *notifier, void *data)riscv_setup_rom_reset_vec (machine, &s->soc[0 ], start_addr, virt_memmap[VIRT_MROM ].base, virt_memmap[VIRT_MROM ].size, kernel_entry, - fdt_load_addr, machine->fdt); + fdt_load_addr);/* * Only direct boot kernel is currently supported for KVM VM, include/hw/riscv/boot.h +1
-2@@ -51,7 +51,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr saddr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint64_t fdt_load_addr, void *fdt); + uint64_t fdt_load_addr); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size, --2.36.1