OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

aspeed/smc: Use a container for the flash mmio address space 

Because AddressSpaces must not be sysbus-mapped, commit e9c568dbc2
("hw/arm/aspeed: Do not sysbus-map mmio flash region directly, use
alias") introduced an alias for the flash mmio region.

Using a container is cleaner.

Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com>
Message-Id: <20211018132609.160008-5-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Cédric Le Goater 2021-10-22 09:52:17 +02:00
parent 82b6a3f64d
commit fc6642544e
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hw/ssi/aspeed_smc.c
View File

@ -1151,14 +1151,17 @@ static void aspeed_smc_realize(DeviceState *dev, Error **errp)
* window in which the flash modules are mapped. The size and
* address depends on the SoC model and controller type.
*/
memory_region_init(&s->mmio_flash_container, OBJECT(s),
TYPE_ASPEED_SMC ".container",
asc->flash_window_size);
sysbus_init_mmio(sbd, &s->mmio_flash_container);
memory_region_init_io(&s->mmio_flash, OBJECT(s),
&aspeed_smc_flash_default_ops, s,
TYPE_ASPEED_SMC ".flash",
asc->flash_window_size);
memory_region_init_alias(&s->mmio_flash_alias, OBJECT(s),
TYPE_ASPEED_SMC ".flash",
&s->mmio_flash, 0, asc->flash_window_size);
sysbus_init_mmio(sbd, &s->mmio_flash_alias);
memory_region_add_subregion(&s->mmio_flash_container, 0x0,
&s->mmio_flash);
/*
* Let's create a sub memory region for each possible peripheral. All

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

@ -52,8 +52,8 @@ struct AspeedSMCState {
SysBusDevice parent_obj;
MemoryRegion mmio;
MemoryRegion mmio_flash_container;
MemoryRegion mmio_flash;
MemoryRegion mmio_flash_alias;
qemu_irq irq;