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

aspeed/smc: Remove the 'size' attribute from AspeedSMCFlash 

AspeedSMCFlash::size is only used to compute the initial size of the
boot_rom region. Not very useful, so directly call memory_region_size()
instead.

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cédric Le Goater 2021-10-12 08:20:08 +02:00
parent a7d78beff4
commit 6bb55e7967
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/arm/aspeed.c
View File

@ -376,6 +376,7 @@ static void aspeed_machine_init(MachineState *machine)
if (drive0) { if (drive0) {
AspeedSMCFlash *fl = &bmc->soc.fmc.flashes[0]; AspeedSMCFlash *fl = &bmc->soc.fmc.flashes[0];
MemoryRegion *boot_rom = g_new(MemoryRegion, 1); MemoryRegion *boot_rom = g_new(MemoryRegion, 1);
uint64_t size = memory_region_size(&fl->mmio);
/* /*
* create a ROM region using the default mapping window size of * create a ROM region using the default mapping window size of
@ -385,15 +386,15 @@ static void aspeed_machine_init(MachineState *machine)
*/ */
if (ASPEED_MACHINE(machine)->mmio_exec) { if (ASPEED_MACHINE(machine)->mmio_exec) {
memory_region_init_alias(boot_rom, NULL, "aspeed.boot_rom", memory_region_init_alias(boot_rom, NULL, "aspeed.boot_rom",
&fl->mmio, 0, fl->size); &fl->mmio, 0, size);
memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR, memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR,
boot_rom); boot_rom);
} else { } else {
memory_region_init_rom(boot_rom, NULL, "aspeed.boot_rom", memory_region_init_rom(boot_rom, NULL, "aspeed.boot_rom",
fl->size, &error_abort); size, &error_abort);
memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR, memory_region_add_subregion(get_system_memory(), FIRMWARE_ADDR,
boot_rom); boot_rom);
write_boot_rom(drive0, FIRMWARE_ADDR, fl->size, &error_abort); write_boot_rom(drive0, FIRMWARE_ADDR, size, &error_abort);
} }
} }

5
hw/ssi/aspeed_smc.c
View File

@ -1186,11 +1186,10 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)
fl->id = i; fl->id = i;
fl->controller = s; fl->controller = s;
fl->size = asc->segments[i].size;
memory_region_init_io(&fl->mmio, OBJECT(s), &aspeed_smc_flash_ops, memory_region_init_io(&fl->mmio, OBJECT(s), &aspeed_smc_flash_ops,
fl, name, fl->size); fl, name, asc->segments[i].size);
memory_region_add_subregion(&s->mmio_flash, offset, &fl->mmio); memory_region_add_subregion(&s->mmio_flash, offset, &fl->mmio);
offset += fl->size; offset += asc->segments[i].size;
} }
/* DMA support */ /* DMA support */

1
include/hw/ssi/aspeed_smc.h
View File

@ -34,7 +34,6 @@ typedef struct AspeedSMCFlash {
struct AspeedSMCState *controller; struct AspeedSMCState *controller;
uint8_t id; uint8_t id;
uint32_t size;
MemoryRegion mmio; MemoryRegion mmio;
} AspeedSMCFlash; } AspeedSMCFlash;