hw/riscv: boot: Support 64bit fdt address.
PATCH 1/1 hw/riscv: boot: Support 64bit fdt address.
The current riscv_load_fdt() forces fdt_load_addr to be placed at a dram address within 3GB, but not all platforms have dram_base within 3GB.
This patch adds an exception for dram base not within 3GB, which will place fdt at dram_end align 16MB.
riscv_setup_rom_reset_vec() also needs to be modified
--- hw/riscv/boot.c | 12 +++++++----- include/hw/riscv/boot.h | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-)
hw/riscv/boot.c +7 -5
@@ -203,9 +203,9 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,return *start + size; } -uint32_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) +uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) { -uint32_t temp, fdt_addr; +uint64_t temp, fdt_addr;hwaddr dram_end = dram_base + mem_size;int ret, fdtsize =fdt_totalsize (fdt);
@@ -220,7 +220,7 @@ uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)* Thus, put it at an 16MB aligned address that less than fdt size from the * end of dram or 3GB whichever is lesser. */ - temp =MIN (dram_end,3072 * MiB); + temp = (dram_base <3072 * MiB) ?MIN (dram_end,3072 * MiB) : dram_end; fdt_addr =QEMU_ALIGN_DOWN (temp - fdtsize,16 * MiB); ret =fdt_pack (fdt);
@@ -276,13 +276,15 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint32_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr, void *fdt) { int i;uint32_t start_addr_hi32 =0x00000000 ; +uint32_t fdt_load_addr_hi32 =0x00000000 ;if (!riscv_is_32bit (harts)) { start_addr_hi32 = start_addr >>32 ; + fdt_load_addr_hi32 = fdt_load_addr >>32 ; }/* reset vector */ uint32_t reset_vec[10] = {
@@ -295,7 +297,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts start_addr,/* start: .dword */ start_addr_hi32, fdt_load_addr,/* fdt_laddr: .dword */ - 0x00000000, + fdt_load_addr_hi32, /* fw_dyn: */ };if (riscv_is_32bit (harts)) {
include/hw/riscv/boot.h +2 -2
@@ -48,12 +48,12 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start); -uint32_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); +uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt);void riscv_setup_rom_reset_vec (MachineState *machine,RISCVHartArrayState *harts,hwaddr saddr,hwaddr rom_base,hwaddr rom_size,uint64_t kernel_entry, -uint32_t fdt_load_addr,void *fdt); +uint64_t fdt_load_addr,void *fdt); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size,
Signature · 1 line
2.34.1
Quoted 10 lines · Dylan Jhong
The current
riscv_load_fdt()forcesfdt_load_addrto be placed at a dram address within 3GB, but not all platforms havedram_basewithin 3GB.This patch adds an exception for dram base not within 3GB, which will place fdt at
dram_endalign 16MB.
riscv_setup_rom_reset_vec()also needs to be modifiedSigned-off-by Dylan Jhong <[email protected]>
Alistair
Quoted 79 lines
--- hw/riscv/boot.c | 12 +++++++----- include/hw/riscv/boot.h | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-)hw/riscv/boot.c +7
-5@@ -203,9 +203,9 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,return *start + size; } -uint32_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) +uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) { -uint32_t temp, fdt_addr; +uint64_t temp, fdt_addr;hwaddr dram_end = dram_base + mem_size;int ret, fdtsize =fdt_totalsize (fdt);@@ -220,7 +220,7 @@ uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)* Thus, put it at an 16MB aligned address that less than fdt size from the * end of dram or 3GB whichever is lesser. */ - temp =MIN (dram_end,3072 * MiB); + temp = (dram_base <3072 * MiB) ?MIN (dram_end,3072 * MiB) : dram_end; fdt_addr =QEMU_ALIGN_DOWN (temp - fdtsize,16 * MiB); ret =fdt_pack (fdt);@@ -276,13 +276,15 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint32_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr, void *fdt) { int i;uint32_t start_addr_hi32 =0x00000000 ; +uint32_t fdt_load_addr_hi32 =0x00000000 ;if (!riscv_is_32bit (harts)) { start_addr_hi32 = start_addr >>32 ; + fdt_load_addr_hi32 = fdt_load_addr >>32 ; }/* reset vector */ uint32_t reset_vec[10] = {@@ -295,7 +297,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts start_addr,/* start: .dword */ start_addr_hi32, fdt_load_addr,/* fdt_laddr: .dword */ - 0x00000000, + fdt_load_addr_hi32, /* fw_dyn: */ };if (riscv_is_32bit (harts)) {include/hw/riscv/boot.h +2
-3@@ -48,12 +48,12 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start); -uint32_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); +uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt);void riscv_setup_rom_reset_vec (MachineState *machine,RISCVHartArrayState *harts,hwaddr saddr,hwaddr rom_base,hwaddr rom_size,uint64_t kernel_entry, -uint32_t fdt_load_addr,void *fdt); +uint64_t fdt_load_addr,void *fdt); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size, --2.34.1
Alistair Francis
AppliedQuoted 10 lines · Dylan Jhong
The current
riscv_load_fdt()forcesfdt_load_addrto be placed at a dram address within 3GB, but not all platforms havedram_basewithin 3GB.This patch adds an exception for dram base not within 3GB, which will place fdt at
dram_endalign 16MB.
riscv_setup_rom_reset_vec()also needs to be modifiedSigned-off-by Dylan Jhong <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 79 lines
--- hw/riscv/boot.c | 12 +++++++----- include/hw/riscv/boot.h | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-)hw/riscv/boot.c +7
-5@@ -203,9 +203,9 @@ hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,return *start + size; } -uint32_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) +uint64_t riscv_load_fdt (hwaddr dram_base,uint64_t mem_size,void *fdt) { -uint32_t temp, fdt_addr; +uint64_t temp, fdt_addr;hwaddr dram_end = dram_base + mem_size;int ret, fdtsize =fdt_totalsize (fdt);@@ -220,7 +220,7 @@ uint32_t riscv_load_fdt(hwaddr dram_base, uint64_t mem_size, void *fdt)* Thus, put it at an 16MB aligned address that less than fdt size from the * end of dram or 3GB whichever is lesser. */ - temp =MIN (dram_end,3072 * MiB); + temp = (dram_base <3072 * MiB) ?MIN (dram_end,3072 * MiB) : dram_end; fdt_addr =QEMU_ALIGN_DOWN (temp - fdtsize,16 * MiB); ret =fdt_pack (fdt);@@ -276,13 +276,15 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *hartshwaddr start_addr, hwaddr rom_base, hwaddr rom_size, uint64_t kernel_entry, - uint32_t fdt_load_addr, void *fdt) + uint64_t fdt_load_addr, void *fdt) { int i;uint32_t start_addr_hi32 =0x00000000 ; +uint32_t fdt_load_addr_hi32 =0x00000000 ;if (!riscv_is_32bit (harts)) { start_addr_hi32 = start_addr >>32 ; + fdt_load_addr_hi32 = fdt_load_addr >>32 ; }/* reset vector */ uint32_t reset_vec[10] = {@@ -295,7 +297,7 @@ void riscv_setup_rom_reset_vec(MachineState *machine, RISCVHartArrayState *harts start_addr,/* start: .dword */ start_addr_hi32, fdt_load_addr,/* fdt_laddr: .dword */ - 0x00000000, + fdt_load_addr_hi32, /* fw_dyn: */ };if (riscv_is_32bit (harts)) {include/hw/riscv/boot.h +2
-3@@ -48,12 +48,12 @@ target_ulong riscv_load_kernel(const char *kernel_filename, symbol_fn_t sym_cb);hwaddr riscv_load_initrd (const char *filename,uint64_t mem_size,uint64_t kernel_entry,hwaddr *start); -uint32_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt); +uint64_t riscv_load_fdt (hwaddr dram_start,uint64_t dram_size,void *fdt);void riscv_setup_rom_reset_vec (MachineState *machine,RISCVHartArrayState *harts,hwaddr saddr,hwaddr rom_base,hwaddr rom_size,uint64_t kernel_entry, -uint32_t fdt_load_addr,void *fdt); +uint64_t fdt_load_addr,void *fdt); void riscv_rom_copy_firmware_info(MachineState *machine, hwaddr rom_base, hwaddr rom_size, uint32_t reset_vec_size, --2.34.1