| Message ID | 20211018153829.24382-1-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/6] hw/riscv: microchip_pfsoc: Use MachineState::ram and MachineClass::default_ram_id | expand |
Hi Bin, is there a cover letter? Series: Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> On 10/18/21 17:38, Bin Meng wrote: > Using memory_region_init_ram(), which can't possibly handle vhost-user, > and can't work as expected with '-numa node,memdev' options. > > Use MachineState::ram instead of manually initializing RAM memory > region, as well as by providing MachineClass::default_ram_id to > opt in to memdev scheme. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > hw/riscv/microchip_pfsoc.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-)
Hi Philippe, On Mon, Oct 18, 2021 at 11:51 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > Hi Bin, is there a cover letter? Sorry, I did not include a cover letter. I will need to remember this next time :) > > Series: > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Thanks for the review! Regards, Bin
On Mon, 18 Oct 2021 23:38:24 +0800 Bin Meng <bmeng.cn@gmail.com> wrote: > Using memory_region_init_ram(), which can't possibly handle vhost-user, > and can't work as expected with '-numa node,memdev' options. > > Use MachineState::ram instead of manually initializing RAM memory > region, as well as by providing MachineClass::default_ram_id to > opt in to memdev scheme. > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > --- > > hw/riscv/microchip_pfsoc.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > index e475b6d511..f10f55b488 100644 > --- a/hw/riscv/microchip_pfsoc.c > +++ b/hw/riscv/microchip_pfsoc.c > @@ -459,7 +459,6 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > const MemMapEntry *memmap = microchip_pfsoc_memmap; > MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(machine); > MemoryRegion *system_memory = get_system_memory(); > - MemoryRegion *mem_low = g_new(MemoryRegion, 1); > MemoryRegion *mem_low_alias = g_new(MemoryRegion, 1); > MemoryRegion *mem_high = g_new(MemoryRegion, 1); > MemoryRegion *mem_high_alias = g_new(MemoryRegion, 1); > @@ -486,16 +485,13 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > qdev_realize(DEVICE(&s->soc), NULL, &error_abort); > > /* Register RAM */ > - memory_region_init_ram(mem_low, NULL, "microchip.icicle.kit.ram_low", > - memmap[MICROCHIP_PFSOC_DRAM_LO].size, > - &error_fatal); > memory_region_init_alias(mem_low_alias, NULL, > "microchip.icicle.kit.ram_low.alias", > - mem_low, 0, > + machine->ram, 0, > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].size); > memory_region_add_subregion(system_memory, > memmap[MICROCHIP_PFSOC_DRAM_LO].base, > - mem_low); > + machine->ram); > memory_region_add_subregion(system_memory, > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].base, > mem_low_alias); looking at code it seems RAM is split between low and high regions, so converting only low region is wrong. I'd suggest something similar to 2dc9ce13d210 : taihu_405ep_init(). i.e. ms->ram should hold whole RAM that is split between low and high using aliases. > @@ -606,6 +602,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) > MICROCHIP_PFSOC_COMPUTE_CPU_COUNT; > mc->min_cpus = MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT + 1; > mc->default_cpus = mc->min_cpus; > + mc->default_ram_id = "microchip.icicle.kit.ram_low"; given it is not versioned machine, so we don't have to worry about cross version migration here, so I'd use "microchip.icicle.kit.ram" for the name here and currently used "microchip.icicle.kit.ram_low" for corresponding alias > > /* > * Map 513 MiB high memory, the mimimum required high memory size, because
Hi Igor, On Tue, Oct 19, 2021 at 3:39 PM Igor Mammedov <imammedo@redhat.com> wrote: > > On Mon, 18 Oct 2021 23:38:24 +0800 > Bin Meng <bmeng.cn@gmail.com> wrote: > > > Using memory_region_init_ram(), which can't possibly handle vhost-user, > > and can't work as expected with '-numa node,memdev' options. > > > > Use MachineState::ram instead of manually initializing RAM memory > > region, as well as by providing MachineClass::default_ram_id to > > opt in to memdev scheme. > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > --- > > > > hw/riscv/microchip_pfsoc.c | 9 +++------ > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > > index e475b6d511..f10f55b488 100644 > > --- a/hw/riscv/microchip_pfsoc.c > > +++ b/hw/riscv/microchip_pfsoc.c > > @@ -459,7 +459,6 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > > const MemMapEntry *memmap = microchip_pfsoc_memmap; > > MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(machine); > > MemoryRegion *system_memory = get_system_memory(); > > - MemoryRegion *mem_low = g_new(MemoryRegion, 1); > > MemoryRegion *mem_low_alias = g_new(MemoryRegion, 1); > > MemoryRegion *mem_high = g_new(MemoryRegion, 1); > > MemoryRegion *mem_high_alias = g_new(MemoryRegion, 1); > > @@ -486,16 +485,13 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > > qdev_realize(DEVICE(&s->soc), NULL, &error_abort); > > > > /* Register RAM */ > > - memory_region_init_ram(mem_low, NULL, "microchip.icicle.kit.ram_low", > > - memmap[MICROCHIP_PFSOC_DRAM_LO].size, > > - &error_fatal); > > memory_region_init_alias(mem_low_alias, NULL, > > "microchip.icicle.kit.ram_low.alias", > > - mem_low, 0, > > + machine->ram, 0, > > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].size); > > memory_region_add_subregion(system_memory, > > memmap[MICROCHIP_PFSOC_DRAM_LO].base, > > - mem_low); > > + machine->ram); > > memory_region_add_subregion(system_memory, > > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].base, > > mem_low_alias); > > looking at code it seems RAM is split between low and high regions, > so converting only low region is wrong. > > I'd suggest something similar to 2dc9ce13d210 : taihu_405ep_init(). > i.e. ms->ram should hold whole RAM that is split between low and high > using aliases. Thank you for your pointers. I have just sent v2. One note when looking at the taihu_405ep_init() implementation, the following looks incorrect to me: memory_region_init_alias(&ram_memories[1], NULL, "taihu_405ep.ram-1", machine->ram, ram_bases[1], ram_sizes[1]); I think the 'offset' should be ram_sizes[0] instead of ram_bases[1], although their values are the same which means they are two contiguous regions, so it happens to work. But I might be nitpicking ... > > > @@ -606,6 +602,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) > > MICROCHIP_PFSOC_COMPUTE_CPU_COUNT; > > mc->min_cpus = MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT + 1; > > mc->default_cpus = mc->min_cpus; > > + mc->default_ram_id = "microchip.icicle.kit.ram_low"; > > given it is not versioned machine, so we don't have to worry about > cross version migration here, > so I'd use "microchip.icicle.kit.ram" for the name here > and currently used "microchip.icicle.kit.ram_low" for corresponding alias Regards, Bin
On Wed, 20 Oct 2021 09:55:52 +0800 Bin Meng <bmeng.cn@gmail.com> wrote: > Hi Igor, > > On Tue, Oct 19, 2021 at 3:39 PM Igor Mammedov <imammedo@redhat.com> wrote: > > > > On Mon, 18 Oct 2021 23:38:24 +0800 > > Bin Meng <bmeng.cn@gmail.com> wrote: > > > > > Using memory_region_init_ram(), which can't possibly handle vhost-user, > > > and can't work as expected with '-numa node,memdev' options. > > > > > > Use MachineState::ram instead of manually initializing RAM memory > > > region, as well as by providing MachineClass::default_ram_id to > > > opt in to memdev scheme. > > > > > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > > > --- > > > > > > hw/riscv/microchip_pfsoc.c | 9 +++------ > > > 1 file changed, 3 insertions(+), 6 deletions(-) > > > > > > diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c > > > index e475b6d511..f10f55b488 100644 > > > --- a/hw/riscv/microchip_pfsoc.c > > > +++ b/hw/riscv/microchip_pfsoc.c > > > @@ -459,7 +459,6 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > > > const MemMapEntry *memmap = microchip_pfsoc_memmap; > > > MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(machine); > > > MemoryRegion *system_memory = get_system_memory(); > > > - MemoryRegion *mem_low = g_new(MemoryRegion, 1); > > > MemoryRegion *mem_low_alias = g_new(MemoryRegion, 1); > > > MemoryRegion *mem_high = g_new(MemoryRegion, 1); > > > MemoryRegion *mem_high_alias = g_new(MemoryRegion, 1); > > > @@ -486,16 +485,13 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) > > > qdev_realize(DEVICE(&s->soc), NULL, &error_abort); > > > > > > /* Register RAM */ > > > - memory_region_init_ram(mem_low, NULL, "microchip.icicle.kit.ram_low", > > > - memmap[MICROCHIP_PFSOC_DRAM_LO].size, > > > - &error_fatal); > > > memory_region_init_alias(mem_low_alias, NULL, > > > "microchip.icicle.kit.ram_low.alias", > > > - mem_low, 0, > > > + machine->ram, 0, > > > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].size); > > > memory_region_add_subregion(system_memory, > > > memmap[MICROCHIP_PFSOC_DRAM_LO].base, > > > - mem_low); > > > + machine->ram); > > > memory_region_add_subregion(system_memory, > > > memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].base, > > > mem_low_alias); > > > > looking at code it seems RAM is split between low and high regions, > > so converting only low region is wrong. > > > > I'd suggest something similar to 2dc9ce13d210 : taihu_405ep_init(). > > i.e. ms->ram should hold whole RAM that is split between low and high > > using aliases. > > Thank you for your pointers. I have just sent v2. > One note when looking at the taihu_405ep_init() implementation, the > following looks incorrect to me: > > memory_region_init_alias(&ram_memories[1], NULL, > "taihu_405ep.ram-1", machine->ram, ram_bases[1], > ram_sizes[1]); > > I think the 'offset' should be ram_sizes[0] instead of ram_bases[1], > although their values are the same which means they are two contiguous > regions, so it happens to work. But I might be nitpicking ... I fail to see what's wrong there, from the way code is written it looks like hardware has 2 memory banks with different base address. It just happens that ram_bases[1] starts right after ram_bases[0] but if it weren't then using ram_sizes[0] for offset would be wrong. So current code looks fine to me. Anyways, CCing PPC folks to have a second look at it. > > > > > > @@ -606,6 +602,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) > > > MICROCHIP_PFSOC_COMPUTE_CPU_COUNT; > > > mc->min_cpus = MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT + 1; > > > mc->default_cpus = mc->min_cpus; > > > + mc->default_ram_id = "microchip.icicle.kit.ram_low"; > > > > given it is not versioned machine, so we don't have to worry about > > cross version migration here, > > so I'd use "microchip.icicle.kit.ram" for the name here > > and currently used "microchip.icicle.kit.ram_low" for corresponding alias > > Regards, > Bin >
diff --git a/hw/riscv/microchip_pfsoc.c b/hw/riscv/microchip_pfsoc.c index e475b6d511..f10f55b488 100644 --- a/hw/riscv/microchip_pfsoc.c +++ b/hw/riscv/microchip_pfsoc.c @@ -459,7 +459,6 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) const MemMapEntry *memmap = microchip_pfsoc_memmap; MicrochipIcicleKitState *s = MICROCHIP_ICICLE_KIT_MACHINE(machine); MemoryRegion *system_memory = get_system_memory(); - MemoryRegion *mem_low = g_new(MemoryRegion, 1); MemoryRegion *mem_low_alias = g_new(MemoryRegion, 1); MemoryRegion *mem_high = g_new(MemoryRegion, 1); MemoryRegion *mem_high_alias = g_new(MemoryRegion, 1); @@ -486,16 +485,13 @@ static void microchip_icicle_kit_machine_init(MachineState *machine) qdev_realize(DEVICE(&s->soc), NULL, &error_abort); /* Register RAM */ - memory_region_init_ram(mem_low, NULL, "microchip.icicle.kit.ram_low", - memmap[MICROCHIP_PFSOC_DRAM_LO].size, - &error_fatal); memory_region_init_alias(mem_low_alias, NULL, "microchip.icicle.kit.ram_low.alias", - mem_low, 0, + machine->ram, 0, memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].size); memory_region_add_subregion(system_memory, memmap[MICROCHIP_PFSOC_DRAM_LO].base, - mem_low); + machine->ram); memory_region_add_subregion(system_memory, memmap[MICROCHIP_PFSOC_DRAM_LO_ALIAS].base, mem_low_alias); @@ -606,6 +602,7 @@ static void microchip_icicle_kit_machine_class_init(ObjectClass *oc, void *data) MICROCHIP_PFSOC_COMPUTE_CPU_COUNT; mc->min_cpus = MICROCHIP_PFSOC_MANAGEMENT_CPU_COUNT + 1; mc->default_cpus = mc->min_cpus; + mc->default_ram_id = "microchip.icicle.kit.ram_low"; /* * Map 513 MiB high memory, the mimimum required high memory size, because
Using memory_region_init_ram(), which can't possibly handle vhost-user, and can't work as expected with '-numa node,memdev' options. Use MachineState::ram instead of manually initializing RAM memory region, as well as by providing MachineClass::default_ram_id to opt in to memdev scheme. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> --- hw/riscv/microchip_pfsoc.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)