| Message ID | 168872495192.6334.3845988291412774261-1@git.sr.ht |
|---|---|
| State | New |
| Headers | show |
| Series | fdt_load_addr is getting assigned as the result of riscv_compute_fdt_addr(), which is an uint64_t. | expand |
On Fri, Jul 7, 2023 at 8:17 PM ~rlakshmibai <rlakshmibai@git.sr.ht> wrote: > > From: Lakshmi Bai Raja Subramanian <lakshmi.bai.rajasubramanian@bodhicomputing.com> > > fdt_load_addr is declared as uint32_t which is not matching with the > return data type of riscv_compute_fdt_addr. Modified fdt_load_addr data type > to uint64_t to match the riscv_compute_fdt_addr() return data type. This fix > also helps in calculating the right fdt address when DRAM is mapped to higher > 64-bit address. > > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > Signed-off-by: Lakshmi Bai Raja Subramanian <lakshmi.bai.rajasubramanian@bodhicomputing.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/riscv/virt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 95708d890e..c348529ac0 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -1244,7 +1244,7 @@ static void virt_machine_done(Notifier *notifier, void *data) > target_ulong start_addr = memmap[VIRT_DRAM].base; > target_ulong firmware_end_addr, kernel_start_addr; > const char *firmware_name = riscv_default_firmware_name(&s->soc[0]); > - uint32_t fdt_load_addr; > + uint64_t fdt_load_addr; > uint64_t kernel_entry = 0; > BlockBackend *pflash_blk0; > > -- > 2.38.5 >
On Fri, Jul 7, 2023 at 8:17 PM ~rlakshmibai <rlakshmibai@git.sr.ht> wrote: > > From: Lakshmi Bai Raja Subramanian <lakshmi.bai.rajasubramanian@bodhicomputing.com> > > fdt_load_addr is declared as uint32_t which is not matching with the > return data type of riscv_compute_fdt_addr. Modified fdt_load_addr data type > to uint64_t to match the riscv_compute_fdt_addr() return data type. This fix > also helps in calculating the right fdt address when DRAM is mapped to higher > 64-bit address. > > Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > Signed-off-by: Lakshmi Bai Raja Subramanian <lakshmi.bai.rajasubramanian@bodhicomputing.com> Thanks! I tidied up the commit message a bit and applied the patch to riscv-to-apply.next Alistair > --- > hw/riscv/virt.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c > index 95708d890e..c348529ac0 100644 > --- a/hw/riscv/virt.c > +++ b/hw/riscv/virt.c > @@ -1244,7 +1244,7 @@ static void virt_machine_done(Notifier *notifier, void *data) > target_ulong start_addr = memmap[VIRT_DRAM].base; > target_ulong firmware_end_addr, kernel_start_addr; > const char *firmware_name = riscv_default_firmware_name(&s->soc[0]); > - uint32_t fdt_load_addr; > + uint64_t fdt_load_addr; > uint64_t kernel_entry = 0; > BlockBackend *pflash_blk0; > > -- > 2.38.5 >
diff --git a/hw/riscv/virt.c b/hw/riscv/virt.c index 95708d890e..c348529ac0 100644 --- a/hw/riscv/virt.c +++ b/hw/riscv/virt.c @@ -1244,7 +1244,7 @@ static void virt_machine_done(Notifier *notifier, void *data) target_ulong start_addr = memmap[VIRT_DRAM].base; target_ulong firmware_end_addr, kernel_start_addr; const char *firmware_name = riscv_default_firmware_name(&s->soc[0]); - uint32_t fdt_load_addr; + uint64_t fdt_load_addr; uint64_t kernel_entry = 0; BlockBackend *pflash_blk0;