Hi Jamin and Cedric,
On Sun, Apr 13, 2025 at 8:17 PM Jamin Lin <jamin_...@aspeedtech.com> wrote:
>
> Hi Cedric,
>
> > Subject: Re: [PATCH v2 07/10] hw/arm/aspeed: Add support for loading
> > vbootrom image via "-bios"
> >
> > On 4/10/25 04:38, Jamin Lin wrote:
> > > Introduce "aspeed_load_vbootrom()" to support loading a virtual boot
> > > ROM image into the vbootrom memory region, using the "-bios"
> > command-line option.
> > >
> > > Signed-off-by: Jamin Lin <jamin_...@aspeedtech.com>
> > > ---
> > > hw/arm/aspeed.c | 32 ++++++++++++++++++++++++++++++++
> > > 1 file changed, 32 insertions(+)
> > >
> > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index
> > > b70a120e62..2811868c1a 100644
> > > --- a/hw/arm/aspeed.c
> > > +++ b/hw/arm/aspeed.c
> > > @@ -27,6 +27,7 @@
> > > #include "system/reset.h"
> > > #include "hw/loader.h"
> > > #include "qemu/error-report.h"
> > > +#include "qemu/datadir.h"
> > > #include "qemu/units.h"
> > > #include "hw/qdev-clock.h"
> > > #include "system/system.h"
> > > @@ -305,6 +306,32 @@ static void
> > aspeed_install_boot_rom(AspeedMachineState *bmc, BlockBackend *blk,
> > > rom_size, &error_abort);
> > > }
> > >
> > > +/*
> > > + * This function locates the vbootrom image file specified via the
> > > +command line
> > > + * using the -bios option. It loads the specified image into the
> > > +vbootrom
> > > + * memory region and handles errors if the file cannot be found or
> > > loaded.
> > > + */
> > > +static void aspeed_load_vbootrom(MachineState *machine, uint64_t
> > > +rom_size)
> >
> > please add an 'Error **' parameter and let the caller decide to exit.
> >
>
> Will add.
>
> > > +{
> > > + AspeedMachineState *bmc = ASPEED_MACHINE(machine);
> > > + const char *bios_name = machine->firmware;
> > > + g_autofree char *filename = NULL;
> > > + AspeedSoCState *soc = bmc->soc;
> > > + int ret;
> > > +
> > > + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
> >
> > What if the user didn't provide any -bios command line option ?
> >
>
>
> Will update to support both vbootrom and loader.
For this case, could we have something like the npcm8xx_board.c where we
have a default bootrom and override it with -bios? That would also fix the
qtest issues with the ast2700 qtests which fail with this patchset.
>
> > > + if (!filename) {
> > > + error_report("Could not find vbootrom image '%s'", bios_name);
> > > + exit(1);
> > > + }
> > > +
> > > + ret = load_image_mr(filename, &soc->vbootrom);
> > > + if (ret < 0) {
> > > + error_report("Failed to load vbootrom image '%s'", filename);
> > > + exit(1);
> > > + }
> > > +}
> > > +
> > > void aspeed_board_init_flashes(AspeedSMCState *s, const char
> > *flashtype,
> > > unsigned int count, int
> > unit0)
> > > {
> > > @@ -483,6 +510,11 @@ static void aspeed_machine_init(MachineState
> > *machine)
> > > }
> > > }
> > >
> > > + if (amc->vbootrom) {
> > > + rom_size = memory_region_size(&bmc->soc->vbootrom);> +
> > aspeed_load_vbootrom(machine, rom_size);
> > > + }
> > > +
> >
> > Even without a vbootrom file, the machine could boot with '-device loader'
> > options. We should preserve this way of booting an ast2700-evb machine.
> >
>
> Will support both loader and vbootrom.
> Thanks for review and suggestion.
>
> Jamin
> >
> > Thanks,
> >
> > C.
> >
> >
> >
> >
> > > arm_load_kernel(ARM_CPU(first_cpu), machine,
> > &aspeed_board_binfo);
> > > }
> > >
>
Also, tested against our custom machine + custom bmc image and the
bootrom itself works.
I think it might just need that default set.
Tested-By: Nabih Estefan <nabiheste...@google.com>
