hw/riscv: spike: Allow using binary firmware as bios
PATCH 1/1 hw/riscv: spike: Allow using binary firmware as bios
Currently, we have to use OpenSBI firmware ELF as bios for the spike machine because the HTIF console requires ELF for parsing "fromhost" and "tohost" symbols.
The latest OpenSBI can now optionally pick-up HTIF register address from HTIF DT node so using this feature spike machine can now use OpenSBI firmware BIN as bios.
--- hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- include/hw/char/riscv_htif.h | 5 ++++- include/hw/riscv/spike.h | 1 + 4 files changed, 52 insertions(+), 28 deletions(-)
hw/char/riscv_htif.c +22 -11
@@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { .write = htif_mm_write, }; +bool htif_uses_elf_symbols (void ) +{ +return (address_symbol_set ==3 ) ? true : false; +} +HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr) +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base) { -uint64_t base =MIN (tohost_addr, fromhost_addr); -uint64_t size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; -uint64_t tohost_offset = tohost_addr - base; -uint64_t fromhost_offset = fromhost_addr - base; +uint64_t base, size, tohost_offset, fromhost_offset; + +if (address_symbol_set !=3 ) { + fromhost_addr = nonelf_base; + tohost_addr = nonelf_base +8 ; + } + + base =MIN (tohost_addr, fromhost_addr); + size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; + tohost_offset = tohost_addr - base; + fromhost_offset = fromhost_addr - base;HTIFState *s =g_malloc0 (sizeof (HTIFState)); s->address_space = address_space;
@@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,qemu_chr_fe_init (&s->chr, chr, &error_abort);qemu_chr_fe_set_handlers (&s->chr, htif_can_recv, htif_recv, htif_event, htif_be_change, s,NULL , true); -if (address_symbol_set ==3 ) { -memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, -TYPE_HTIF_UART , size); -memory_region_add_subregion_overlap (address_space, base, - &s->mmio,1 ); - } + +memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, +TYPE_HTIF_UART , size); +memory_region_add_subregion_overlap (address_space, base, + &s->mmio,1 );return s; }
hw/riscv/spike.c +25 -16
89 lines not on this page · raw message
include/hw/char/riscv_htif.h +4 -1
@@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops;void htif_symbol_callback (const char *st_name,int st_info,uint64_t st_value,uint64_t st_size); +/* Check if HTIF uses ELF symbols */ +bool htif_uses_elf_symbols (void ); +/* legacy pre qom */ HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr); +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base);#endif
include/hw/riscv/spike.h +1 -0
@@ -43,6 +43,7 @@ struct SpikeState {enum {SPIKE_MROM , +SPIKE_HTIF ,SPIKE_CLINT ,SPIKE_DRAM };
Signature · 1 line
2.25.1
Quoted 8 lines · Anup Patel
Currently, we have to use OpenSBI firmware ELF as bios for the spike machine because the HTIF console requires ELF for parsing "fromhost" and "tohost" symbols.
The latest OpenSBI can now optionally pick-up HTIF register address from HTIF DT node so using this feature spike machine can now use OpenSBI firmware BIN as bios.
Cool!
I think that means we can remove the elfs from QEMU.
Quoted 23 lines
Signed-off-by Anup Patel <[email protected]>--- hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- include/hw/char/riscv_htif.h | 5 ++++- include/hw/riscv/spike.h | 1 + 4 files changed, 52 insertions(+), 28 deletions(-)hw/char/riscv_htif.c +5
-0@@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { .write = htif_mm_write, }; +bool htif_uses_elf_symbols (void ) +{ +return (address_symbol_set ==3 ) ? true : false; +} + HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,
hw/char/riscv_htif.c static const MemoryRegionOps htif_mm_ops = { · line 241
Quoted 10 lines
hw/char/riscv_htif.c +4
-5- CPURISCVState *env, Chardev *chr) + CPURISCVState *env, Chardev *chr, uint64_t nonelf_base) { -uint64_t base =MIN (tohost_addr, fromhost_addr); -uint64_t size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; -uint64_t tohost_offset = tohost_addr - base; -uint64_t fromhost_offset = fromhost_addr - base; +uint64_t base, size, tohost_offset, fromhost_offset; + +if (address_symbol_set !=3 ) {
Why not use htif_uses_elf_symbols() ?
Alistair
Quoted 163 lines
hw/char/riscv_htif.c +13
-6+ fromhost_addr = nonelf_base; + tohost_addr = nonelf_base +8 ; + } + + base =MIN (tohost_addr, fromhost_addr); + size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; + tohost_offset = tohost_addr - base; + fromhost_offset = fromhost_addr - base;HTIFState *s =g_malloc0 (sizeof (HTIFState)); s->address_space = address_space;@@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,qemu_chr_fe_init (&s->chr, chr, &error_abort);qemu_chr_fe_set_handlers (&s->chr, htif_can_recv, htif_recv, htif_event, htif_be_change, s,NULL , true); -if (address_symbol_set ==3 ) { -memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, -TYPE_HTIF_UART , size); -memory_region_add_subregion_overlap (address_space, base, - &s->mmio,1 ); - } + +memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, +TYPE_HTIF_UART , size); +memory_region_add_subregion_overlap (address_space, base, + &s->mmio,1 );return s; }hw/riscv/spike.c +25
-16@@ -42,6 +42,7 @@static const MemMapEntry spike_memmap[] = { [SPIKE_MROM ] = {0x1000 ,0xf000 }, + [SPIKE_HTIF ] = {0x1000000 ,0x1000 }, [SPIKE_CLINT ] = {0x2000000 ,0x10000 }, [SPIKE_DRAM ] = {0x80000000 ,0x0 }, };@@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/htif" );qemu_fdt_setprop_string (fdt,"/htif" ,"compatible" ,"ucb,htif0" ); +if (!htif_uses_elf_symbols ()) { +qemu_fdt_setprop_cells (fdt,"/htif" ,"reg" , +0x0 , memmap[SPIKE_HTIF ].base,0x0 , memmap[SPIKE_HTIF ].size); + }qemu_fdt_add_subnode (fdt,"/soc" );qemu_fdt_setprop (fdt,"/soc" ,"ranges" ,NULL ,0 );@@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,if (cmdline) {qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); +qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); } }@@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_DRAM ].base, machine->ram); -/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, -riscv_is_32bit (&s->soc[0 ])); -/* boot rom */ memory_region_init_rom (mask_rom,NULL ,"riscv.spike.mrom" , memmap[SPIKE_MROM ].size, &error_fatal);@@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback); } +/* Load kernel */ if (machine->kernel_filename) { kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr);@@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) kernel_entry =riscv_load_kernel (machine->kernel_filename, kernel_start_addr, htif_symbol_callback); - -if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , - end); - } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) kernel_entry =0 ; } +/* Create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32bit (&s->soc[0 ])); + +/* Load initrd */ +if (machine->kernel_filename && machine->initrd_filename) { +hwaddr start; +hwaddr end =riscv_load_initrd (machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , + end); + } +/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, s->fdt);@@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine)/* initialize HTIF using symbols found in load_kernel */ htif_mm_init (system_memory, mask_rom, - &s->soc[0 ].harts[0 ].env,serial_hd (0 )); + &s->soc[0 ].harts[0 ].env,serial_hd (0 ), + memmap[SPIKE_HTIF ].base); }static void spike_machine_instance_init (Object *obj)include/hw/char/riscv_htif.h +4
-1@@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops;void htif_symbol_callback (const char *st_name,int st_info,uint64_t st_value,uint64_t st_size); +/* Check if HTIF uses ELF symbols */ +bool htif_uses_elf_symbols (void ); +/* legacy pre qom */ HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr); +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base);#endif include/hw/riscv/spike.h +1
-1@@ -43,6 +43,7 @@ struct SpikeState {enum {SPIKE_MROM , +SPIKE_HTIF ,SPIKE_CLINT ,SPIKE_DRAM }; --2.25.1
Quoted 7 lines · Alistair Francis
Quoted 5 lines · Anup Patel
Currently, we have to use OpenSBI firmware ELF as bios for the spike machine because the HTIF console requires ELF for parsing "fromhost" and "tohost" symbols.
Quoted 7 lines
Quoted 3 lines
The latest OpenSBI can now optionally pick-up HTIF register address from HTIF DT node so using this feature spike machine can now use OpenSBI firmware BIN as bios.
Cool!
I think that means we can remove the elfs from QEMU.
Yes, we can definitely remove the ELFs from QEMU.
Quoted 28 lines
Quoted 28 lines
Signed-off-by Anup Patel <[email protected]>--- hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- include/hw/char/riscv_htif.h | 5 ++++- include/hw/riscv/spike.h | 1 + 4 files changed, 52 insertions(+), 28 deletions(-)hw/char/riscv_htif.c +6
-2@@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { .write = htif_mm_write, }; +bool htif_uses_elf_symbols (void ) +{ +return (address_symbol_set ==3 ) ? true : false; +} +HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr) +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base) { -uint64_t base =MIN (tohost_addr, fromhost_addr);
Quoted 8 lines
hw/char/riscv_htif.c static const MemoryRegionOps htif_mm_ops = { · line 241
Quoted 6 lines
hw/char/riscv_htif.c +3
-3-uint64_t size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; -uint64_t tohost_offset = tohost_addr - base; -uint64_t fromhost_offset = fromhost_addr - base; +uint64_t base, size, tohost_offset, fromhost_offset; + +if (address_symbol_set !=3 ) {Why not use
htif_uses_elf_symbols()?
Ahh, yes.
I should have used htif_uses_elf_symbols() here. I will update it in the next revision.
Regards,
Anup
Quoted 166 lines
Alistair
Quoted 163 lines
hw/char/riscv_htif.c +13
-6+ fromhost_addr = nonelf_base; + tohost_addr = nonelf_base +8 ; + } + + base =MIN (tohost_addr, fromhost_addr); + size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; + tohost_offset = tohost_addr - base; + fromhost_offset = fromhost_addr - base;HTIFState *s =g_malloc0 (sizeof (HTIFState)); s->address_space = address_space;@@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,qemu_chr_fe_init (&s->chr, chr, &error_abort);qemu_chr_fe_set_handlers (&s->chr, htif_can_recv, htif_recv, htif_event, htif_be_change, s,NULL , true); -if (address_symbol_set ==3 ) { -memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, -TYPE_HTIF_UART , size); -memory_region_add_subregion_overlap (address_space, base, - &s->mmio,1 ); - } + +memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, +TYPE_HTIF_UART , size); +memory_region_add_subregion_overlap (address_space, base, + &s->mmio,1 );return s; }hw/riscv/spike.c +25
-16@@ -42,6 +42,7 @@static const MemMapEntry spike_memmap[] = { [SPIKE_MROM ] = {0x1000 ,0xf000 }, + [SPIKE_HTIF ] = {0x1000000 ,0x1000 }, [SPIKE_CLINT ] = {0x2000000 ,0x10000 }, [SPIKE_DRAM ] = {0x80000000 ,0x0 }, };@@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/htif" );qemu_fdt_setprop_string (fdt,"/htif" ,"compatible" ,"ucb,htif0" ); +if (!htif_uses_elf_symbols ()) { +qemu_fdt_setprop_cells (fdt,"/htif" ,"reg" , +0x0 , memmap[SPIKE_HTIF ].base,0x0 , memmap[SPIKE_HTIF ].size); + }qemu_fdt_add_subnode (fdt,"/soc" );qemu_fdt_setprop (fdt,"/soc" ,"ranges" ,NULL ,0 );@@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,if (cmdline) {qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); +qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); } }@@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_DRAM ].base, machine->ram); -/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, -riscv_is_32bit (&s->soc[0 ])); -/* boot rom */ memory_region_init_rom (mask_rom,NULL ,"riscv.spike.mrom" , memmap[SPIKE_MROM ].size, &error_fatal);@@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback); } +/* Load kernel */ if (machine->kernel_filename) { kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr);@@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) kernel_entry =riscv_load_kernel (machine->kernel_filename, kernel_start_addr, htif_symbol_callback); - -if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , - end); - } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) kernel_entry =0 ; } +/* Create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32bit (&s->soc[0 ])); + +/* Load initrd */ +if (machine->kernel_filename && machine->initrd_filename) { +hwaddr start; +hwaddr end =riscv_load_initrd (machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , + end); + } +/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, s->fdt);@@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine)/* initialize HTIF using symbols found in load_kernel */ htif_mm_init (system_memory, mask_rom, - &s->soc[0 ].harts[0 ].env,serial_hd (0 )); + &s->soc[0 ].harts[0 ].env,serial_hd (0 ), + memmap[SPIKE_HTIF ].base); }static void spike_machine_instance_init (Object *obj)include/hw/char/riscv_htif.h +4
-1@@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops;void htif_symbol_callback (const char *st_name,int st_info,uint64_t st_value,uint64_t st_size); +/* Check if HTIF uses ELF symbols */ +bool htif_uses_elf_symbols (void ); +/* legacy pre qom */ HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr); +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base);#endif include/hw/riscv/spike.h +1
-1@@ -43,6 +43,7 @@ struct SpikeState {enum {SPIKE_MROM , +SPIKE_HTIF ,SPIKE_CLINT ,SPIKE_DRAM }; --2.25.1
Quoted 13 lines · Anup Patel
Quoted 11 lines · Alistair Francis
Quoted 8 lines · Anup Patel
Currently, we have to use OpenSBI firmware ELF as bios for the spike machine because the HTIF console requires ELF for parsing "fromhost" and "tohost" symbols.
The latest OpenSBI can now optionally pick-up HTIF register address from HTIF DT node so using this feature spike machine can now use OpenSBI firmware BIN as bios.
Quoted 5 lines
Quoted 3 lines
Cool!
I think that means we can remove the elfs from QEMU.
Yes, we can definitely remove the ELFs from QEMU.
Ha, I mostly meant can you do that? :P
Alistair
Quoted 212 lines
Quoted 29 lines
Quoted 29 lines
Signed-off-by Anup Patel <[email protected]>--- hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- include/hw/char/riscv_htif.h | 5 ++++- include/hw/riscv/spike.h | 1 + 4 files changed, 52 insertions(+), 28 deletions(-)hw/char/riscv_htif.c +6
-2@@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { .write = htif_mm_write, }; +bool htif_uses_elf_symbols (void ) +{ +return (address_symbol_set ==3 ) ? true : false; +} +HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr) +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base) { -uint64_t base =MIN (tohost_addr, fromhost_addr);Quoted 8 lines
hw/char/riscv_htif.c static const MemoryRegionOps htif_mm_ops = { · line 241
Quoted 6 lines
hw/char/riscv_htif.c +3
-3-uint64_t size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; -uint64_t tohost_offset = tohost_addr - base; -uint64_t fromhost_offset = fromhost_addr - base; +uint64_t base, size, tohost_offset, fromhost_offset; + +if (address_symbol_set !=3 ) {Why not use
htif_uses_elf_symbols()?Ahh, yes.
I should have used
htif_uses_elf_symbols()here. I will update it in the next revision.Regards,
AnupQuoted 166 lines
Alistair
Quoted 163 lines
hw/char/riscv_htif.c +13
-6+ fromhost_addr = nonelf_base; + tohost_addr = nonelf_base +8 ; + } + + base =MIN (tohost_addr, fromhost_addr); + size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; + tohost_offset = tohost_addr - base; + fromhost_offset = fromhost_addr - base;HTIFState *s =g_malloc0 (sizeof (HTIFState)); s->address_space = address_space;@@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,qemu_chr_fe_init (&s->chr, chr, &error_abort);qemu_chr_fe_set_handlers (&s->chr, htif_can_recv, htif_recv, htif_event, htif_be_change, s,NULL , true); -if (address_symbol_set ==3 ) { -memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, -TYPE_HTIF_UART , size); -memory_region_add_subregion_overlap (address_space, base, - &s->mmio,1 ); - } + +memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, +TYPE_HTIF_UART , size); +memory_region_add_subregion_overlap (address_space, base, + &s->mmio,1 );return s; }hw/riscv/spike.c +25
-16@@ -42,6 +42,7 @@static const MemMapEntry spike_memmap[] = { [SPIKE_MROM ] = {0x1000 ,0xf000 }, + [SPIKE_HTIF ] = {0x1000000 ,0x1000 }, [SPIKE_CLINT ] = {0x2000000 ,0x10000 }, [SPIKE_DRAM ] = {0x80000000 ,0x0 }, };@@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/htif" );qemu_fdt_setprop_string (fdt,"/htif" ,"compatible" ,"ucb,htif0" ); +if (!htif_uses_elf_symbols ()) { +qemu_fdt_setprop_cells (fdt,"/htif" ,"reg" , +0x0 , memmap[SPIKE_HTIF ].base,0x0 , memmap[SPIKE_HTIF ].size); + }qemu_fdt_add_subnode (fdt,"/soc" );qemu_fdt_setprop (fdt,"/soc" ,"ranges" ,NULL ,0 );@@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,if (cmdline) {qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); +qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); } }@@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_DRAM ].base, machine->ram); -/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, -riscv_is_32bit (&s->soc[0 ])); -/* boot rom */ memory_region_init_rom (mask_rom,NULL ,"riscv.spike.mrom" , memmap[SPIKE_MROM ].size, &error_fatal);@@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback); } +/* Load kernel */ if (machine->kernel_filename) { kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr);@@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) kernel_entry =riscv_load_kernel (machine->kernel_filename, kernel_start_addr, htif_symbol_callback); - -if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , - end); - } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) kernel_entry =0 ; } +/* Create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32bit (&s->soc[0 ])); + +/* Load initrd */ +if (machine->kernel_filename && machine->initrd_filename) { +hwaddr start; +hwaddr end =riscv_load_initrd (machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , + end); + } +/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, s->fdt);@@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine)/* initialize HTIF using symbols found in load_kernel */ htif_mm_init (system_memory, mask_rom, - &s->soc[0 ].harts[0 ].env,serial_hd (0 )); + &s->soc[0 ].harts[0 ].env,serial_hd (0 ), + memmap[SPIKE_HTIF ].base); }static void spike_machine_instance_init (Object *obj)include/hw/char/riscv_htif.h +4
-1@@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops;void htif_symbol_callback (const char *st_name,int st_info,uint64_t st_value,uint64_t st_size); +/* Check if HTIF uses ELF symbols */ +bool htif_uses_elf_symbols (void ); +/* legacy pre qom */ HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr); +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base);#endif include/hw/riscv/spike.h +1
-1@@ -43,6 +43,7 @@ struct SpikeState {enum {SPIKE_MROM , +SPIKE_HTIF ,SPIKE_CLINT ,SPIKE_DRAM }; --2.25.1
Quoted 15 lines · Alistair Francis
Quoted 13 lines · Anup Patel
Quoted 11 lines · Alistair Francis
Quoted 8 lines · Anup Patel
Currently, we have to use OpenSBI firmware ELF as bios for the spike machine because the HTIF console requires ELF for parsing "fromhost" and "tohost" symbols.
The latest OpenSBI can now optionally pick-up HTIF register address from HTIF DT node so using this feature spike machine can now use OpenSBI firmware BIN as bios.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
Cool!
I think that means we can remove the elfs from QEMU.
Yes, we can definitely remove the ELFs from QEMU.
Ha, I mostly meant can you do that? :P
Okay, let me take a stab at it in the next revision.
Regards,
Anup
Quoted 215 lines
Alistair
Quoted 212 lines
Quoted 29 lines
Quoted 29 lines
Signed-off-by Anup Patel <[email protected]>--- hw/char/riscv_htif.c | 33 +++++++++++++++++++---------- hw/riscv/spike.c | 41 ++++++++++++++++++++++-------------- include/hw/char/riscv_htif.h | 5 ++++- include/hw/riscv/spike.h | 1 + 4 files changed, 52 insertions(+), 28 deletions(-)hw/char/riscv_htif.c +6
-2@@ -228,13 +228,25 @@ static const MemoryRegionOps htif_mm_ops = { .write = htif_mm_write, }; +bool htif_uses_elf_symbols (void ) +{ +return (address_symbol_set ==3 ) ? true : false; +} +HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr) +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base) { -uint64_t base =MIN (tohost_addr, fromhost_addr);Quoted 8 lines
hw/char/riscv_htif.c static const MemoryRegionOps htif_mm_ops = { · line 241
Quoted 6 lines
hw/char/riscv_htif.c +3
-3-uint64_t size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; -uint64_t tohost_offset = tohost_addr - base; -uint64_t fromhost_offset = fromhost_addr - base; +uint64_t base, size, tohost_offset, fromhost_offset; + +if (address_symbol_set !=3 ) {Why not use
htif_uses_elf_symbols()?Ahh, yes.
I should have used
htif_uses_elf_symbols()here. I will update it in the next revision.Regards,
AnupQuoted 166 lines
Alistair
Quoted 163 lines
hw/char/riscv_htif.c +13
-6+ fromhost_addr = nonelf_base; + tohost_addr = nonelf_base +8 ; + } + + base =MIN (tohost_addr, fromhost_addr); + size =MAX (tohost_addr +8 , fromhost_addr +8 ) - base; + tohost_offset = tohost_addr - base; + fromhost_offset = fromhost_addr - base;HTIFState *s =g_malloc0 (sizeof (HTIFState)); s->address_space = address_space;@@ -249,12 +261,11 @@ HTIFState *htif_mm_init(MemoryRegion *address_space, MemoryRegion *main_mem,qemu_chr_fe_init (&s->chr, chr, &error_abort);qemu_chr_fe_set_handlers (&s->chr, htif_can_recv, htif_recv, htif_event, htif_be_change, s,NULL , true); -if (address_symbol_set ==3 ) { -memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, -TYPE_HTIF_UART , size); -memory_region_add_subregion_overlap (address_space, base, - &s->mmio,1 ); - } + +memory_region_init_io (&s->mmio,NULL , &htif_mm_ops, s, +TYPE_HTIF_UART , size); +memory_region_add_subregion_overlap (address_space, base, + &s->mmio,1 );return s; }hw/riscv/spike.c +25
-16@@ -42,6 +42,7 @@static const MemMapEntry spike_memmap[] = { [SPIKE_MROM ] = {0x1000 ,0xf000 }, + [SPIKE_HTIF ] = {0x1000000 ,0x1000 }, [SPIKE_CLINT ] = {0x2000000 ,0x10000 }, [SPIKE_DRAM ] = {0x80000000 ,0x0 }, };@@ -75,6 +76,10 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,qemu_fdt_add_subnode (fdt,"/htif" );qemu_fdt_setprop_string (fdt,"/htif" ,"compatible" ,"ucb,htif0" ); +if (!htif_uses_elf_symbols ()) { +qemu_fdt_setprop_cells (fdt,"/htif" ,"reg" , +0x0 , memmap[SPIKE_HTIF ].base,0x0 , memmap[SPIKE_HTIF ].size); + }qemu_fdt_add_subnode (fdt,"/soc" );qemu_fdt_setprop (fdt,"/soc" ,"ranges" ,NULL ,0 );@@ -172,6 +177,7 @@ static void create_fdt(SpikeState *s, const MemMapEntry *memmap,if (cmdline) {qemu_fdt_add_subnode (fdt,"/chosen" );qemu_fdt_setprop_string (fdt,"/chosen" ,"bootargs" , cmdline); +qemu_fdt_setprop_string (fdt,"/chosen" ,"stdout-path" ,"/htif" ); } }@@ -241,10 +247,6 @@ static void spike_board_init(MachineState *machine)memory_region_add_subregion (system_memory, memmap[SPIKE_DRAM ].base, machine->ram); -/* create device tree */ -create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, -riscv_is_32bit (&s->soc[0 ])); -/* boot rom */ memory_region_init_rom (mask_rom,NULL ,"riscv.spike.mrom" , memmap[SPIKE_MROM ].size, &error_fatal);@@ -266,6 +268,7 @@ static void spike_board_init(MachineState *machine) htif_symbol_callback); } +/* Load kernel */ if (machine->kernel_filename) { kernel_start_addr =riscv_calc_kernel_start_addr (&s->soc[0 ], firmware_end_addr);@@ -273,17 +276,6 @@ static void spike_board_init(MachineState *machine) kernel_entry =riscv_load_kernel (machine->kernel_filename, kernel_start_addr, htif_symbol_callback); - -if (machine->initrd_filename) { -hwaddr start; -hwaddr end =riscv_load_initrd (machine->initrd_filename, - machine->ram_size, kernel_entry, - &start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" , -"linux,initrd-start" , start); -qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , - end); - } }else {/* * If dynamic firmware is used, it doesn't know where is the next mode @@ -292,6 +284,22 @@ static void spike_board_init(MachineState *machine) kernel_entry =0 ; } +/* Create device tree */ +create_fdt (s, memmap, machine->ram_size, machine->kernel_cmdline, +riscv_is_32bit (&s->soc[0 ])); + +/* Load initrd */ +if (machine->kernel_filename && machine->initrd_filename) { +hwaddr start; +hwaddr end =riscv_load_initrd (machine->initrd_filename, + machine->ram_size, kernel_entry, + &start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" , +"linux,initrd-start" , start); +qemu_fdt_setprop_cell (s->fdt,"/chosen" ,"linux,initrd-end" , + end); + } +/* Compute the fdt load address in dram */ fdt_load_addr =riscv_load_fdt (memmap[SPIKE_DRAM ].base, machine->ram_size, s->fdt);@@ -303,7 +311,8 @@ static void spike_board_init(MachineState *machine)/* initialize HTIF using symbols found in load_kernel */ htif_mm_init (system_memory, mask_rom, - &s->soc[0 ].harts[0 ].env,serial_hd (0 )); + &s->soc[0 ].harts[0 ].env,serial_hd (0 ), + memmap[SPIKE_HTIF ].base); }static void spike_machine_instance_init (Object *obj)include/hw/char/riscv_htif.h +4
-1@@ -52,8 +52,11 @@ extern const MemoryRegionOps htif_io_ops;void htif_symbol_callback (const char *st_name,int st_info,uint64_t st_value,uint64_t st_size); +/* Check if HTIF uses ELF symbols */ +bool htif_uses_elf_symbols (void ); +/* legacy pre qom */ HTIFState *htif_mm_init (MemoryRegion *address_space,MemoryRegion *main_mem, -CPURISCVState *env,Chardev *chr); +CPURISCVState *env,Chardev *chr,uint64_t nonelf_base);#endif include/hw/riscv/spike.h +1
-1@@ -43,6 +43,7 @@ struct SpikeState {enum {SPIKE_MROM , +SPIKE_HTIF ,SPIKE_CLINT ,SPIKE_DRAM }; --2.25.1