ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aspeed: Use the boot_rom region of the fby35 machine 

This change completes commits 5aa281d757 ("aspeed: Introduce a
spi_boot region under the SoC") and 8b744a6a47 ("aspeed: Add a
boot_rom overlap region in the SoC spi_boot container") which
introduced a spi_boot container at the SoC level to map the boot rom
region as an overlap.

It also fixes a Coverity report (CID 1508061) for a memory leak
warning when the QEMU process exits by using an bmc_boot_rom
MemoryRegion available at the machine level.

Cc: Peter Delevoryas <peter@pjd.dev>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cédric Le Goater 2023-06-07 06:39:34 +02:00
parent 262259eab1
commit ebd643ebd2
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/arm/fby35.c
View File

@ -70,8 +70,6 @@ static void fby35_bmc_write_boot_rom(DriveInfo *dinfo, MemoryRegion *mr,
static void fby35_bmc_init(Fby35State *s) static void fby35_bmc_init(Fby35State *s)
{ {
DriveInfo *drive0 = drive_get(IF_MTD, 0, 0);
object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3"); object_initialize_child(OBJECT(s), "bmc", &s->bmc, "ast2600-a3");
memory_region_init(&s->bmc_memory, OBJECT(&s->bmc), "bmc-memory", memory_region_init(&s->bmc_memory, OBJECT(&s->bmc), "bmc-memory",
@ -95,18 +93,21 @@ static void fby35_bmc_init(Fby35State *s)
aspeed_board_init_flashes(&s->bmc.fmc, "n25q00", 2, 0); aspeed_board_init_flashes(&s->bmc.fmc, "n25q00", 2, 0);
/* Install first FMC flash content as a boot rom. */ /* Install first FMC flash content as a boot rom. */
if (drive0) { if (!s->mmio_exec) {
AspeedSMCFlash *fl = &s->bmc.fmc.flashes[0]; DriveInfo *mtd0 = drive_get(IF_MTD, 0, 0);
MemoryRegion *boot_rom = g_new(MemoryRegion, 1);
uint64_t size = memory_region_size(&fl->mmio);
if (!s->mmio_exec) { if (mtd0) {
memory_region_init_rom(boot_rom, NULL, "aspeed.boot_rom", AspeedSoCState *bmc = &s->bmc;
size, &error_abort); uint64_t rom_size = memory_region_size(&bmc->spi_boot);
memory_region_add_subregion(&s->bmc_memory, FBY35_BMC_FIRMWARE_ADDR,
boot_rom); memory_region_init_rom(&s->bmc_boot_rom, NULL, "aspeed.boot_rom",
fby35_bmc_write_boot_rom(drive0, boot_rom, FBY35_BMC_FIRMWARE_ADDR, rom_size, &error_abort);
size, &error_abort); memory_region_add_subregion_overlap(&bmc->spi_boot_container, 0,
&s->bmc_boot_rom, 1);
fby35_bmc_write_boot_rom(mtd0, &s->bmc_boot_rom,
FBY35_BMC_FIRMWARE_ADDR,
rom_size, &error_abort);
} }
} }
} }