mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/arm/msf2_soc: Don't allocate separate MemoryRegions

Browse Source 
In the realize method of the msf2-soc SoC object, we call g_new() to
create new MemoryRegion objects for the nvm, nvm_alias, and sram.
This is unnecessary; make these MemoryRegions member fields of the
device state struct instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alexandre Iooss <erdnaxe@crans.org>
Message-id: 20210812093356.1946-19-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2021-08-12 10:33:49 +01:00
parent 8ecda75f72
commit a4b1e9d3f8
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/arm/msf2-soc.c
View File

@ -83,11 +83,8 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
int i; int i;
MemoryRegion *system_memory = get_system_memory(); MemoryRegion *system_memory = get_system_memory();
MemoryRegion *nvm = g_new(MemoryRegion, 1);
MemoryRegion *nvm_alias = g_new(MemoryRegion, 1);
MemoryRegion *sram = g_new(MemoryRegion, 1);
memory_region_init_rom(nvm, OBJECT(dev_soc), "MSF2.eNVM", s->envm_size, memory_region_init_rom(&s->nvm, OBJECT(dev_soc), "MSF2.eNVM", s->envm_size,
&error_fatal); &error_fatal);
/* /*
* On power-on, the eNVM region 0x60000000 is automatically * On power-on, the eNVM region 0x60000000 is automatically
@ -95,15 +92,15 @@ static void m2sxxx_soc_realize(DeviceState *dev_soc, Error **errp)
* start address (0x0). We do not support remapping other eNVM, * start address (0x0). We do not support remapping other eNVM,
* eSRAM and DDR regions by guest(via Sysreg) currently. * eSRAM and DDR regions by guest(via Sysreg) currently.
*/ */
memory_region_init_alias(nvm_alias, OBJECT(dev_soc), "MSF2.eNVM", nvm, 0, memory_region_init_alias(&s->nvm_alias, OBJECT(dev_soc), "MSF2.eNVM",
s->envm_size); &s->nvm, 0, s->envm_size);
memory_region_add_subregion(system_memory, ENVM_BASE_ADDRESS, nvm); memory_region_add_subregion(system_memory, ENVM_BASE_ADDRESS, &s->nvm);
memory_region_add_subregion(system_memory, 0, nvm_alias); memory_region_add_subregion(system_memory, 0, &s->nvm_alias);
memory_region_init_ram(sram, NULL, "MSF2.eSRAM", s->esram_size, memory_region_init_ram(&s->sram, NULL, "MSF2.eSRAM", s->esram_size,
&error_fatal); &error_fatal);
memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, sram); memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, &s->sram);
armv7m = DEVICE(&s->armv7m); armv7m = DEVICE(&s->armv7m);
qdev_prop_set_uint32(armv7m, "num-irq", 81); qdev_prop_set_uint32(armv7m, "num-irq", 81);

4
include/hw/arm/msf2-soc.h
View File

@ -65,6 +65,10 @@ struct MSF2State {
MSSTimerState timer; MSSTimerState timer;
MSSSpiState spi[MSF2_NUM_SPIS]; MSSSpiState spi[MSF2_NUM_SPIS];
MSF2EmacState emac; MSF2EmacState emac;
MemoryRegion nvm;
MemoryRegion nvm_alias;
MemoryRegion sram;
}; };
#endif #endif