| Message ID | 20220809153904.485018-5-clg@kaod.org |
|---|---|
| State | Accepted |
| Headers | show |
| Series | ppc: QOM'ify 405 board | expand |
On Tue, 9 Aug 2022, Cédric Le Goater wrote: > It doesn't belong to the generic machine nor the SoC. Fix a typo in > the name while we are at it. > > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > hw/ppc/ppc405_boards.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c > index f4794ba40ce6..381f39aa94cb 100644 > --- a/hw/ppc/ppc405_boards.c > +++ b/hw/ppc/ppc405_boards.c > @@ -235,7 +235,6 @@ static void ppc405_init(MachineState *machine) > MachineClass *mc = MACHINE_GET_CLASS(machine); > const char *kernel_filename = machine->kernel_filename; > PowerPCCPU *cpu; > - MemoryRegion *sram = g_new(MemoryRegion, 1); > MemoryRegion *ram_memories = g_new(MemoryRegion, 2); > hwaddr ram_bases[2], ram_sizes[2]; > MemoryRegion *sysmem = get_system_memory(); > @@ -260,11 +259,6 @@ static void ppc405_init(MachineState *machine) > cpu = ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, > 33333333, &uicdev, kernel_filename == NULL ? 0 : 1); > > - /* allocate SRAM */ > - memory_region_init_ram(sram, NULL, "ef405ep.sram", PPC405EP_SRAM_SIZE, > - &error_fatal); Do you need to set an owner while at it? Anyway, Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> Regards, BALATON Zoltan > - memory_region_add_subregion(sysmem, PPC405EP_SRAM_BASE, sram); > - > /* allocate and load BIOS */ > if (machine->firmware) { > MemoryRegion *bios = g_new(MemoryRegion, 1); > @@ -328,9 +322,15 @@ static void ref405ep_init(MachineState *machine) > { > DeviceState *dev; > SysBusDevice *s; > + MemoryRegion *sram = g_new(MemoryRegion, 1); > > ppc405_init(machine); > > + /* allocate SRAM */ > + memory_region_init_ram(sram, NULL, "ref405ep.sram", PPC405EP_SRAM_SIZE, > + &error_fatal); > + memory_region_add_subregion(get_system_memory(), PPC405EP_SRAM_BASE, sram); > + > /* Register FPGA */ > ref405ep_fpga_init(get_system_memory(), PPC405EP_FPGA_BASE); > /* Register NVRAM */ >
On 8/9/22 18:53, BALATON Zoltan wrote: > On Tue, 9 Aug 2022, Cédric Le Goater wrote: >> It doesn't belong to the generic machine nor the SoC. Fix a typo in >> the name while we are at it. >> >> Signed-off-by: Cédric Le Goater <clg@kaod.org> >> --- >> hw/ppc/ppc405_boards.c | 12 ++++++------ >> 1 file changed, 6 insertions(+), 6 deletions(-) >> >> diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c >> index f4794ba40ce6..381f39aa94cb 100644 >> --- a/hw/ppc/ppc405_boards.c >> +++ b/hw/ppc/ppc405_boards.c >> @@ -235,7 +235,6 @@ static void ppc405_init(MachineState *machine) >> MachineClass *mc = MACHINE_GET_CLASS(machine); >> const char *kernel_filename = machine->kernel_filename; >> PowerPCCPU *cpu; >> - MemoryRegion *sram = g_new(MemoryRegion, 1); >> MemoryRegion *ram_memories = g_new(MemoryRegion, 2); >> hwaddr ram_bases[2], ram_sizes[2]; >> MemoryRegion *sysmem = get_system_memory(); >> @@ -260,11 +259,6 @@ static void ppc405_init(MachineState *machine) >> cpu = ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, >> 33333333, &uicdev, kernel_filename == NULL ? 0 : 1); >> >> - /* allocate SRAM */ >> - memory_region_init_ram(sram, NULL, "ef405ep.sram", PPC405EP_SRAM_SIZE, >> - &error_fatal); > > Do you need to set an owner while at it? Anyway, A machine is not a device and : /* This will assert if owner is neither NULL nor a DeviceState. * We only want the owner here for the purposes of defining a * unique name for migration. TODO: Ideally we should implement * a naming scheme for Objects which are not DeviceStates, in * which case we can relax this restriction. */ owner_dev = DEVICE(owner); Thanks, C. > > Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu> > > Regards, > BALATON Zoltan > >> - memory_region_add_subregion(sysmem, PPC405EP_SRAM_BASE, sram); >> - >> /* allocate and load BIOS */ >> if (machine->firmware) { >> MemoryRegion *bios = g_new(MemoryRegion, 1); >> @@ -328,9 +322,15 @@ static void ref405ep_init(MachineState *machine) >> { >> DeviceState *dev; >> SysBusDevice *s; >> + MemoryRegion *sram = g_new(MemoryRegion, 1); >> >> ppc405_init(machine); >> >> + /* allocate SRAM */ >> + memory_region_init_ram(sram, NULL, "ref405ep.sram", PPC405EP_SRAM_SIZE, >> + &error_fatal); >> + memory_region_add_subregion(get_system_memory(), PPC405EP_SRAM_BASE, sram); >> + >> /* Register FPGA */ >> ref405ep_fpga_init(get_system_memory(), PPC405EP_FPGA_BASE); >> /* Register NVRAM */ >>
diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c index f4794ba40ce6..381f39aa94cb 100644 --- a/hw/ppc/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c @@ -235,7 +235,6 @@ static void ppc405_init(MachineState *machine) MachineClass *mc = MACHINE_GET_CLASS(machine); const char *kernel_filename = machine->kernel_filename; PowerPCCPU *cpu; - MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *ram_memories = g_new(MemoryRegion, 2); hwaddr ram_bases[2], ram_sizes[2]; MemoryRegion *sysmem = get_system_memory(); @@ -260,11 +259,6 @@ static void ppc405_init(MachineState *machine) cpu = ppc405ep_init(sysmem, ram_memories, ram_bases, ram_sizes, 33333333, &uicdev, kernel_filename == NULL ? 0 : 1); - /* allocate SRAM */ - memory_region_init_ram(sram, NULL, "ef405ep.sram", PPC405EP_SRAM_SIZE, - &error_fatal); - memory_region_add_subregion(sysmem, PPC405EP_SRAM_BASE, sram); - /* allocate and load BIOS */ if (machine->firmware) { MemoryRegion *bios = g_new(MemoryRegion, 1); @@ -328,9 +322,15 @@ static void ref405ep_init(MachineState *machine) { DeviceState *dev; SysBusDevice *s; + MemoryRegion *sram = g_new(MemoryRegion, 1); ppc405_init(machine); + /* allocate SRAM */ + memory_region_init_ram(sram, NULL, "ref405ep.sram", PPC405EP_SRAM_SIZE, + &error_fatal); + memory_region_add_subregion(get_system_memory(), PPC405EP_SRAM_BASE, sram); + /* Register FPGA */ ref405ep_fpga_init(get_system_memory(), PPC405EP_FPGA_BASE); /* Register NVRAM */
It doesn't belong to the generic machine nor the SoC. Fix a typo in the name while we are at it. Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/ppc/ppc405_boards.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)