| Message ID | 20210518194704.764241-2-venture@google.com |
|---|---|
| State | New |
| Headers | show |
| Series | Adds quanta-gbs-bmc machine to nuvoton boards. | expand |
On Tue, 18 May 2021 at 20:54, Patrick Venture <venture@google.com> wrote: > > Adds initial quanta-gbs-bmc machine support. > > Tested: Boots to userspace. > Signed-off-by: Patrick Venture <venture@google.com> > Reviewed-by: Brandon Kim <brandonkim@google.com> > Reviewed-by: Hao Wu <wuhaotsh@google.com> > --- > hw/arm/npcm7xx_boards.c | 33 +++++++++++++++++++++++++++++++++ > 1 file changed, 33 insertions(+) > > diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c > index d4553e3786..34a214fe79 100644 > --- a/hw/arm/npcm7xx_boards.c > +++ b/hw/arm/npcm7xx_boards.c > @@ -29,6 +29,7 @@ > > #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7 > #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff > +#define QUANTA_GBS_POWER_ON_STRAPS 0x000017ff /* TODO: Get real values. */ Any chance you could fix this TODO ? If it's not fixed now before the code goes in it seems unlikely that it'll ever be fixed -- you're probably in the best position to know the right value... > static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin"; > > @@ -268,6 +269,22 @@ static void quanta_gsj_init(MachineState *machine) > npcm7xx_load_kernel(machine, soc); > } > > +static void quanta_gbs_init(MachineState *machine) > +{ > + NPCM7xxState *soc; > + > + soc = npcm7xx_create_soc(machine, QUANTA_GBS_POWER_ON_STRAPS); > + npcm7xx_connect_dram(soc, machine->ram); > + qdev_realize(DEVICE(soc), NULL, &error_fatal); > + > + npcm7xx_load_bootrom(machine, soc); > + > + npcm7xx_connect_flash(&soc->fiu[0], 0, "mx66u51235f", > + drive_get(IF_MTD, 0, 0)); > + > + npcm7xx_load_kernel(machine, soc); > +} > + > static void npcm7xx_set_soc_type(NPCM7xxMachineClass *nmc, const char *type) > { > NPCM7xxClass *sc = NPCM7XX_CLASS(object_class_by_name(type)); > @@ -316,6 +333,18 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data) > mc->default_ram_size = 512 * MiB; > }; > > +static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data) > +{ > + NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_CLASS(oc); > + MachineClass *mc = MACHINE_CLASS(oc); > + > + npcm7xx_set_soc_type(nmc, TYPE_NPCM730); > + > + mc->desc = "Quanta GBS (Cortex A9)"; "Cortex-A9", with a hyphen. thanks -- PMM
On Thu, May 27, 2021 at 2:34 AM Peter Maydell <peter.maydell@linaro.org> wrote: > > On Tue, 18 May 2021 at 20:54, Patrick Venture <venture@google.com> wrote: > > > > Adds initial quanta-gbs-bmc machine support. > > > > Tested: Boots to userspace. > > Signed-off-by: Patrick Venture <venture@google.com> > > Reviewed-by: Brandon Kim <brandonkim@google.com> > > Reviewed-by: Hao Wu <wuhaotsh@google.com> > > --- > > hw/arm/npcm7xx_boards.c | 33 +++++++++++++++++++++++++++++++++ > > 1 file changed, 33 insertions(+) > > > > diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c > > index d4553e3786..34a214fe79 100644 > > --- a/hw/arm/npcm7xx_boards.c > > +++ b/hw/arm/npcm7xx_boards.c > > @@ -29,6 +29,7 @@ > > > > #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7 > > #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff > > +#define QUANTA_GBS_POWER_ON_STRAPS 0x000017ff /* TODO: Get real values. */ > > Any chance you could fix this TODO ? If it's not fixed now before > the code goes in it seems unlikely that it'll ever be fixed -- you're > probably in the best position to know the right value... I have an internal bug to find the "right" value and populate it, although it probably actually is that value. Generally I agree with your point, that it won't ever be fixed, just like most TODOs in open source projects, however, my team is building a ton of systems with Qemu presently and ramping up a significant time and resource investment in this; so I happen to feel confident this will be addressed in the future. I actually already have several additional patches for this and other systems that are waiting on various other patches landing. > > > static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin"; > > > > @@ -268,6 +269,22 @@ static void quanta_gsj_init(MachineState *machine) > > npcm7xx_load_kernel(machine, soc); > > } > > > > +static void quanta_gbs_init(MachineState *machine) > > +{ > > + NPCM7xxState *soc; > > + > > + soc = npcm7xx_create_soc(machine, QUANTA_GBS_POWER_ON_STRAPS); > > + npcm7xx_connect_dram(soc, machine->ram); > > + qdev_realize(DEVICE(soc), NULL, &error_fatal); > > + > > + npcm7xx_load_bootrom(machine, soc); > > + > > + npcm7xx_connect_flash(&soc->fiu[0], 0, "mx66u51235f", > > + drive_get(IF_MTD, 0, 0)); > > + > > + npcm7xx_load_kernel(machine, soc); > > +} > > + > > static void npcm7xx_set_soc_type(NPCM7xxMachineClass *nmc, const char *type) > > { > > NPCM7xxClass *sc = NPCM7XX_CLASS(object_class_by_name(type)); > > @@ -316,6 +333,18 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data) > > mc->default_ram_size = 512 * MiB; > > }; > > > > +static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data) > > +{ > > + NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_CLASS(oc); > > + MachineClass *mc = MACHINE_CLASS(oc); > > + > > + npcm7xx_set_soc_type(nmc, TYPE_NPCM730); > > + > > + mc->desc = "Quanta GBS (Cortex A9)"; > > "Cortex-A9", with a hyphen. Ack, will send out this fix in the next patch series. > > > thanks > -- PMM
On 6/2/21 4:41 PM, Patrick Venture wrote: > On Thu, May 27, 2021 at 2:34 AM Peter Maydell <peter.maydell@linaro.org> wrote: >> >> On Tue, 18 May 2021 at 20:54, Patrick Venture <venture@google.com> wrote: >>> >>> Adds initial quanta-gbs-bmc machine support. >>> >>> Tested: Boots to userspace. >>> Signed-off-by: Patrick Venture <venture@google.com> >>> Reviewed-by: Brandon Kim <brandonkim@google.com> >>> Reviewed-by: Hao Wu <wuhaotsh@google.com> >>> --- >>> hw/arm/npcm7xx_boards.c | 33 +++++++++++++++++++++++++++++++++ >>> 1 file changed, 33 insertions(+) >>> >>> diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c >>> index d4553e3786..34a214fe79 100644 >>> --- a/hw/arm/npcm7xx_boards.c >>> +++ b/hw/arm/npcm7xx_boards.c >>> @@ -29,6 +29,7 @@ >>> >>> #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7 >>> #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff >>> +#define QUANTA_GBS_POWER_ON_STRAPS 0x000017ff /* TODO: Get real values. */ >> >> Any chance you could fix this TODO ? If it's not fixed now before >> the code goes in it seems unlikely that it'll ever be fixed -- you're >> probably in the best position to know the right value... > > I have an internal bug to find the "right" value and populate it, > although it probably actually is that value. Then simply remove the TODO comment and we are good :)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c index d4553e3786..34a214fe79 100644 --- a/hw/arm/npcm7xx_boards.c +++ b/hw/arm/npcm7xx_boards.c @@ -29,6 +29,7 @@ #define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7 #define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff +#define QUANTA_GBS_POWER_ON_STRAPS 0x000017ff /* TODO: Get real values. */ static const char npcm7xx_default_bootrom[] = "npcm7xx_bootrom.bin"; @@ -268,6 +269,22 @@ static void quanta_gsj_init(MachineState *machine) npcm7xx_load_kernel(machine, soc); } +static void quanta_gbs_init(MachineState *machine) +{ + NPCM7xxState *soc; + + soc = npcm7xx_create_soc(machine, QUANTA_GBS_POWER_ON_STRAPS); + npcm7xx_connect_dram(soc, machine->ram); + qdev_realize(DEVICE(soc), NULL, &error_fatal); + + npcm7xx_load_bootrom(machine, soc); + + npcm7xx_connect_flash(&soc->fiu[0], 0, "mx66u51235f", + drive_get(IF_MTD, 0, 0)); + + npcm7xx_load_kernel(machine, soc); +} + static void npcm7xx_set_soc_type(NPCM7xxMachineClass *nmc, const char *type) { NPCM7xxClass *sc = NPCM7XX_CLASS(object_class_by_name(type)); @@ -316,6 +333,18 @@ static void gsj_machine_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 512 * MiB; }; +static void gbs_bmc_machine_class_init(ObjectClass *oc, void *data) +{ + NPCM7xxMachineClass *nmc = NPCM7XX_MACHINE_CLASS(oc); + MachineClass *mc = MACHINE_CLASS(oc); + + npcm7xx_set_soc_type(nmc, TYPE_NPCM730); + + mc->desc = "Quanta GBS (Cortex A9)"; + mc->init = quanta_gbs_init; + mc->default_ram_size = 1 * GiB; +} + static const TypeInfo npcm7xx_machine_types[] = { { .name = TYPE_NPCM7XX_MACHINE, @@ -332,6 +361,10 @@ static const TypeInfo npcm7xx_machine_types[] = { .name = MACHINE_TYPE_NAME("quanta-gsj"), .parent = TYPE_NPCM7XX_MACHINE, .class_init = gsj_machine_class_init, + }, { + .name = MACHINE_TYPE_NAME("quanta-gbs-bmc"), + .parent = TYPE_NPCM7XX_MACHINE, + .class_init = gbs_bmc_machine_class_init, }, };