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

hw/arm/aspeed: Move AspeedSoCState::cpu/vic to Aspeed2400SoCState 

The ARM array and VIC peripheral are only used by the
2400 series, remove them from the common AspeedSoCState.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
This commit is contained in:
Philippe Mathieu-Daudé 2023-10-24 18:24:22 +02:00 committed by Cédric Le Goater
parent c17fc02571
commit dd41ce7a6f
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
hw/arm/aspeed_soc.c → hw/arm/aspeed_ast2400.c
View File

@ -135,13 +135,15 @@ static const int aspeed_soc_ast2400_irqmap[] = {
static qemu_irq aspeed_soc_ast2400_get_irq(AspeedSoCState *s, int dev) static qemu_irq aspeed_soc_ast2400_get_irq(AspeedSoCState *s, int dev)
{ {
Aspeed2400SoCState *a = ASPEED2400_SOC(s);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
return qdev_get_gpio_in(DEVICE(&s->vic), sc->irqmap[dev]); return qdev_get_gpio_in(DEVICE(&a->vic), sc->irqmap[dev]);
} }
static void aspeed_ast2400_soc_init(Object *obj) static void aspeed_ast2400_soc_init(Object *obj)
{ {
Aspeed2400SoCState *a = ASPEED2400_SOC(obj);
AspeedSoCState *s = ASPEED_SOC(obj); AspeedSoCState *s = ASPEED_SOC(obj);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
int i; int i;
@ -153,7 +155,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
} }
for (i = 0; i < sc->num_cpus; i++) { for (i = 0; i < sc->num_cpus; i++) {
object_initialize_child(obj, "cpu[*]", &s->cpu[i], sc->cpu_type); object_initialize_child(obj, "cpu[*]", &a->cpu[i], sc->cpu_type);
} }
snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname); snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname);
@ -167,7 +169,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu),
"hw-prot-key"); "hw-prot-key");
object_initialize_child(obj, "vic", &s->vic, TYPE_ASPEED_VIC); object_initialize_child(obj, "vic", &a->vic, TYPE_ASPEED_VIC);
object_initialize_child(obj, "rtc", &s->rtc, TYPE_ASPEED_RTC); object_initialize_child(obj, "rtc", &s->rtc, TYPE_ASPEED_RTC);
@ -242,6 +244,7 @@ static void aspeed_ast2400_soc_init(Object *obj)
static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp) static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp)
{ {
int i; int i;
Aspeed2400SoCState *a = ASPEED2400_SOC(dev);
AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCState *s = ASPEED_SOC(dev);
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
Error *err = NULL; Error *err = NULL;
@ -264,15 +267,15 @@ static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp)
/* CPU */ /* CPU */
for (i = 0; i < sc->num_cpus; i++) { for (i = 0; i < sc->num_cpus; i++) {
object_property_set_link(OBJECT(&s->cpu[i]), "memory", object_property_set_link(OBJECT(&a->cpu[i]), "memory",
OBJECT(s->memory), &error_abort); OBJECT(s->memory), &error_abort);
if (!qdev_realize(DEVICE(&s->cpu[i]), NULL, errp)) { if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) {
return; return;
} }
} }
/* SRAM */ /* SRAM */
sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&s->cpu[0])->cpu_index); sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index);
memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, &err); memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, &err);
if (err) { if (err) {
error_propagate(errp, err); error_propagate(errp, err);
@ -288,14 +291,14 @@ static void aspeed_ast2400_soc_realize(DeviceState *dev, Error **errp)
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]); aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]);
/* VIC */ /* VIC */
if (!sysbus_realize(SYS_BUS_DEVICE(&s->vic), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&a->vic), errp)) {
return; return;
} }
aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->vic), 0, sc->memmap[ASPEED_DEV_VIC]); aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->vic), 0, sc->memmap[ASPEED_DEV_VIC]);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 0, sysbus_connect_irq(SYS_BUS_DEVICE(&a->vic), 0,
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_IRQ)); qdev_get_gpio_in(DEVICE(&a->cpu), ARM_CPU_IRQ));
sysbus_connect_irq(SYS_BUS_DEVICE(&s->vic), 1, sysbus_connect_irq(SYS_BUS_DEVICE(&a->vic), 1,
qdev_get_gpio_in(DEVICE(&s->cpu), ARM_CPU_FIQ)); qdev_get_gpio_in(DEVICE(&a->cpu), ARM_CPU_FIQ));
/* RTC */ /* RTC */
if (!sysbus_realize(SYS_BUS_DEVICE(&s->rtc), errp)) { if (!sysbus_realize(SYS_BUS_DEVICE(&s->rtc), errp)) {

2
hw/arm/meson.build
View File

@ -48,9 +48,9 @@ arm_ss.add(when: 'CONFIG_FSL_IMX25', if_true: files('fsl-imx25.c', 'imx25_pdk.c'
arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c')) arm_ss.add(when: 'CONFIG_FSL_IMX31', if_true: files('fsl-imx31.c', 'kzm.c'))
arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6', if_true: files('fsl-imx6.c'))
arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files(
'aspeed_soc.c',
'aspeed.c', 'aspeed.c',
'aspeed_soc_common.c', 'aspeed_soc_common.c',
'aspeed_ast2400.c',
'aspeed_ast2600.c', 'aspeed_ast2600.c',
'aspeed_ast10x0.c', 'aspeed_ast10x0.c',
'aspeed_eeprom.c', 'aspeed_eeprom.c',

5
include/hw/arm/aspeed_soc.h
View File

@ -49,14 +49,12 @@
struct AspeedSoCState { struct AspeedSoCState {
DeviceState parent; DeviceState parent;
ARMCPU cpu[ASPEED_CPUS_NUM];
MemoryRegion *memory; MemoryRegion *memory;
MemoryRegion *dram_mr; MemoryRegion *dram_mr;
MemoryRegion dram_container; MemoryRegion dram_container;
MemoryRegion sram; MemoryRegion sram;
MemoryRegion spi_boot_container; MemoryRegion spi_boot_container;
MemoryRegion spi_boot; MemoryRegion spi_boot;
AspeedVICState vic;
AspeedRtcState rtc; AspeedRtcState rtc;
AspeedTimerCtrlState timerctrl; AspeedTimerCtrlState timerctrl;
AspeedI2CState i2c; AspeedI2CState i2c;
@ -99,6 +97,9 @@ OBJECT_DECLARE_TYPE(AspeedSoCState, AspeedSoCClass, ASPEED_SOC)
struct Aspeed2400SoCState { struct Aspeed2400SoCState {
AspeedSoCState parent; AspeedSoCState parent;
ARMCPU cpu[ASPEED_CPUS_NUM];
AspeedVICState vic;
}; };
#define TYPE_ASPEED2400_SOC "aspeed2400-soc" #define TYPE_ASPEED2400_SOC "aspeed2400-soc"