| Message ID | 20240527080231.1576609-13-jamin_lin@aspeedtech.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add AST2700 support | expand |
On 5/27/24 10:02, Jamin Lin wrote: > Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 CPU). > > AST2700 SOC and its interrupt controller are too complex to handle > in the common Aspeed SoC framework. We introduce a new ast2700 > class with instance_init and realize handlers. > > AST2700 is a 64 bits quad core cpus and support 8 watchdog. > Update maximum ASPEED_CPUS_NUM to 4 and ASPEED_WDTS_NUM to 8. > In addition, update AspeedSocState to support scuio, sli, sliio and intc. > > Add TYPE_ASPEED27X0_SOC machine type. > > The SDMC controller is unlocked at SPL stage. > At present, only supports to emulate booting > start from u-boot stage. Set SDMC controller > unlocked by default. > > In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. > It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. > And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to > GICINT or-gates instead of GIC device. > > Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> > --- > hw/arm/aspeed_ast27x0.c | 563 ++++++++++++++++++++++++++++++++++++ > hw/arm/meson.build | 1 + > include/hw/arm/aspeed_soc.h | 26 +- > 3 files changed, 588 insertions(+), 2 deletions(-) > create mode 100644 hw/arm/aspeed_ast27x0.c > > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c > new file mode 100644 > index 0000000000..a3a03fc1ca > --- /dev/null > +++ b/hw/arm/aspeed_ast27x0.c > @@ -0,0 +1,563 @@ > +/* > + * ASPEED SoC 27x0 family > + * > + * Copyright (C) 2024 ASPEED Technology Inc. > + * > + * This code is licensed under the GPL version 2 or later. See > + * the COPYING file in the top-level directory. > + * > + * Implementation extracted from the AST2600 and adapted for AST27x0. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/error.h" > +#include "hw/misc/unimp.h" > +#include "hw/arm/aspeed_soc.h" > +#include "qemu/module.h" > +#include "qemu/error-report.h" > +#include "hw/i2c/aspeed_i2c.h" > +#include "net/net.h" > +#include "sysemu/sysemu.h" > +#include "hw/intc/arm_gicv3.h" > +#include "qapi/qmp/qlist.h" > + > +static const hwaddr aspeed_soc_ast2700_memmap[] = { > + [ASPEED_DEV_SPI_BOOT] = 0x400000000, > + [ASPEED_DEV_SRAM] = 0x10000000, > + [ASPEED_DEV_SDMC] = 0x12C00000, > + [ASPEED_DEV_SCU] = 0x12C02000, > + [ASPEED_DEV_SCUIO] = 0x14C02000, > + [ASPEED_DEV_UART0] = 0X14C33000, > + [ASPEED_DEV_UART1] = 0X14C33100, > + [ASPEED_DEV_UART2] = 0X14C33200, > + [ASPEED_DEV_UART3] = 0X14C33300, > + [ASPEED_DEV_UART4] = 0X12C1A000, > + [ASPEED_DEV_UART5] = 0X14C33400, > + [ASPEED_DEV_UART6] = 0X14C33500, > + [ASPEED_DEV_UART7] = 0X14C33600, > + [ASPEED_DEV_UART8] = 0X14C33700, > + [ASPEED_DEV_UART9] = 0X14C33800, > + [ASPEED_DEV_UART10] = 0X14C33900, > + [ASPEED_DEV_UART11] = 0X14C33A00, > + [ASPEED_DEV_UART12] = 0X14C33B00, > + [ASPEED_DEV_WDT] = 0x14C37000, > + [ASPEED_DEV_VUART] = 0X14C30000, > + [ASPEED_DEV_FMC] = 0x14000000, > + [ASPEED_DEV_SPI0] = 0x14010000, > + [ASPEED_DEV_SPI1] = 0x14020000, > + [ASPEED_DEV_SPI2] = 0x14030000, > + [ASPEED_DEV_SDRAM] = 0x400000000, > + [ASPEED_DEV_MII1] = 0x14040000, > + [ASPEED_DEV_MII2] = 0x14040008, > + [ASPEED_DEV_MII3] = 0x14040010, > + [ASPEED_DEV_ETH1] = 0x14050000, > + [ASPEED_DEV_ETH2] = 0x14060000, > + [ASPEED_DEV_ETH3] = 0x14070000, > + [ASPEED_DEV_EMMC] = 0x12090000, > + [ASPEED_DEV_INTC] = 0x12100000, > + [ASPEED_DEV_SLI] = 0x12C17000, > + [ASPEED_DEV_SLIIO] = 0x14C1E000, > + [ASPEED_GIC_DIST] = 0x12200000, > + [ASPEED_GIC_REDIST] = 0x12280000, > +}; > + > +#define AST2700_MAX_IRQ 288 > + > +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ > +static const int aspeed_soc_ast2700_irqmap[] = { > + [ASPEED_DEV_UART0] = 132, > + [ASPEED_DEV_UART1] = 132, > + [ASPEED_DEV_UART2] = 132, > + [ASPEED_DEV_UART3] = 132, > + [ASPEED_DEV_UART4] = 8, > + [ASPEED_DEV_UART5] = 132, > + [ASPEED_DEV_UART6] = 132, > + [ASPEED_DEV_UART7] = 132, > + [ASPEED_DEV_UART8] = 132, > + [ASPEED_DEV_UART9] = 132, > + [ASPEED_DEV_UART10] = 132, > + [ASPEED_DEV_UART11] = 132, > + [ASPEED_DEV_UART12] = 132, > + [ASPEED_DEV_FMC] = 131, > + [ASPEED_DEV_SDMC] = 0, > + [ASPEED_DEV_SCU] = 12, > + [ASPEED_DEV_ADC] = 130, > + [ASPEED_DEV_XDMA] = 5, > + [ASPEED_DEV_EMMC] = 15, > + [ASPEED_DEV_GPIO] = 11, > + [ASPEED_DEV_GPIO_1_8V] = 130, > + [ASPEED_DEV_RTC] = 13, > + [ASPEED_DEV_TIMER1] = 16, > + [ASPEED_DEV_TIMER2] = 17, > + [ASPEED_DEV_TIMER3] = 18, > + [ASPEED_DEV_TIMER4] = 19, > + [ASPEED_DEV_TIMER5] = 20, > + [ASPEED_DEV_TIMER6] = 21, > + [ASPEED_DEV_TIMER7] = 22, > + [ASPEED_DEV_TIMER8] = 23, > + [ASPEED_DEV_WDT] = 131, > + [ASPEED_DEV_PWM] = 131, > + [ASPEED_DEV_LPC] = 128, > + [ASPEED_DEV_IBT] = 128, > + [ASPEED_DEV_I2C] = 130, > + [ASPEED_DEV_PECI] = 133, > + [ASPEED_DEV_ETH1] = 132, > + [ASPEED_DEV_ETH2] = 132, > + [ASPEED_DEV_ETH3] = 132, > + [ASPEED_DEV_HACE] = 4, > + [ASPEED_DEV_KCS] = 128, > + [ASPEED_DEV_DP] = 28, > + [ASPEED_DEV_I3C] = 131, > +}; > + > +/* GICINT 128 */ > +static const int aspeed_soc_ast2700_gic128_intcmap[] = { > + [ASPEED_DEV_LPC] = 0, > + [ASPEED_DEV_IBT] = 2, > + [ASPEED_DEV_KCS] = 4, > +}; > + > +/* GICINT 130 */ > +static const int aspeed_soc_ast2700_gic130_intcmap[] = { > + [ASPEED_DEV_I2C] = 0, > + [ASPEED_DEV_ADC] = 16, > + [ASPEED_DEV_GPIO_1_8V] = 18, > +}; > + > +/* GICINT 131 */ > +static const int aspeed_soc_ast2700_gic131_intcmap[] = { > + [ASPEED_DEV_I3C] = 0, > + [ASPEED_DEV_WDT] = 16, > + [ASPEED_DEV_FMC] = 25, > + [ASPEED_DEV_PWM] = 29, > +}; > + > +/* GICINT 132 */ > +static const int aspeed_soc_ast2700_gic132_intcmap[] = { > + [ASPEED_DEV_ETH1] = 0, > + [ASPEED_DEV_ETH2] = 1, > + [ASPEED_DEV_ETH3] = 2, > + [ASPEED_DEV_UART0] = 7, > + [ASPEED_DEV_UART1] = 8, > + [ASPEED_DEV_UART2] = 9, > + [ASPEED_DEV_UART3] = 10, > + [ASPEED_DEV_UART5] = 11, > + [ASPEED_DEV_UART6] = 12, > + [ASPEED_DEV_UART7] = 13, > + [ASPEED_DEV_UART8] = 14, > + [ASPEED_DEV_UART9] = 15, > + [ASPEED_DEV_UART10] = 16, > + [ASPEED_DEV_UART11] = 17, > + [ASPEED_DEV_UART12] = 18, > +}; > + > +/* GICINT 133 */ > +static const int aspeed_soc_ast2700_gic133_intcmap[] = { > + [ASPEED_DEV_PECI] = 4, > +}; > + > +/* GICINT 128 ~ 136 */ > +struct gic_intc_irq_info { > + int irq; > + const int *ptr; > +}; > + > +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { > + {128, aspeed_soc_ast2700_gic128_intcmap}, > + {129, NULL}, > + {130, aspeed_soc_ast2700_gic130_intcmap}, > + {131, aspeed_soc_ast2700_gic131_intcmap}, > + {132, aspeed_soc_ast2700_gic132_intcmap}, > + {133, aspeed_soc_ast2700_gic133_intcmap}, > + {134, NULL}, > + {135, NULL}, > + {136, NULL}, > +}; > + > +static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(s); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + int i; > + > + for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { > + if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { > + assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); > + return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), > + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); > + } > + } > + > + return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]); > +} > + > +static void aspeed_soc_ast2700_init(Object *obj) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); > + AspeedSoCState *s = ASPEED_SOC(obj); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + int i; > + char socname[8]; > + char typename[64]; > + > + if (sscanf(sc->name, "%7s", socname) != 1) { > + g_assert_not_reached(); > + } > + > + for (i = 0; i < sc->num_cpus; i++) { > + object_initialize_child(obj, "cpu[*]", &a->cpu[i], > + aspeed_soc_cpu_type(sc)); > + } > + > + object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); > + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", > + sc->silicon_rev); > + object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), > + "hw-strap1"); > + object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), > + "hw-strap2"); > + object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), > + "hw-prot-key"); > + > + object_initialize_child(obj, "scuio", &s->scuio, TYPE_ASPEED_2700_SCUIO); > + qdev_prop_set_uint32(DEVICE(&s->scuio), "silicon-rev", > + sc->silicon_rev); > + > + snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); > + object_initialize_child(obj, "fmc", &s->fmc, typename); > + > + for (i = 0; i < sc->spis_num; i++) { > + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i, socname); > + object_initialize_child(obj, "spi[*]", &s->spi[i], typename); > + } > + > + snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname); > + object_initialize_child(obj, "sdmc", &s->sdmc, typename); > + object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), > + "ram-size"); > + > + for (i = 0; i < sc->wdts_num; i++) { > + snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname); > + object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename); > + } > + > + for (i = 0; i < sc->macs_num; i++) { > + object_initialize_child(obj, "ftgmac100[*]", &s->ftgmac100[i], > + TYPE_FTGMAC100); > + > + object_initialize_child(obj, "mii[*]", &s->mii[i], TYPE_ASPEED_MII); > + } > + > + for (i = 0; i < sc->uarts_num; i++) { > + object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_MM); > + } > + > + object_initialize_child(obj, "sli", &s->sli, TYPE_ASPEED_2700_SLI); > + object_initialize_child(obj, "sliio", &s->sliio, TYPE_ASPEED_2700_SLIIO); > + object_initialize_child(obj, "intc", &a->intc, TYPE_ASPEED_2700_INTC); > +} > + > +/* > + * ASPEED ast2700 has 0x0 as cluster ID > + * > + * https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 > + */ > +static uint64_t aspeed_calc_affinity(int cpu) > +{ > + return (0x0 << ARM_AFF1_SHIFT) | cpu; > +} > + > +static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > + AspeedSoCState *s = ASPEED_SOC(dev); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + SysBusDevice *gicbusdev; > + QList *redist_region_count; > + int i; > + > + a->intc.gic = qdev_new(gicv3_class_name()); This object doesn't need to be allocated. See versal_create_apu_gic() > + qdev_prop_set_uint32(a->intc.gic, "revision", 3); > + qdev_prop_set_uint32(a->intc.gic, "num-cpu", sc->num_cpus); > + qdev_prop_set_uint32(a->intc.gic, "num-irq", AST2700_MAX_IRQ); > + > + redist_region_count = qlist_new(); > + qlist_append_int(redist_region_count, sc->num_cpus); > + qdev_prop_set_array(a->intc.gic, "redist-region-count", > + redist_region_count); > + > + gicbusdev = SYS_BUS_DEVICE(a->intc.gic); > + if (!sysbus_realize(gicbusdev, errp)) { > + return false; I would find clearer to initialize/realize the underlying gic object under the AspeedINTCState model. You could add property aliases. or add a GICv3State gic object under the SoC. Probably better, since the AspeedINTCState doesn't need to know about the GIC. > + sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > + sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); > + > + for (i = 0; i < sc->num_cpus; i++) { > + DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; > + int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > + > + const int timer_irq[] = { > + [GTIMER_PHYS] = 14, > + [GTIMER_VIRT] = 11, > + [GTIMER_HYP] = 10, > + [GTIMER_SEC] = 13, > + }; > + int j; > + > + for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > + qdev_connect_gpio_out(cpudev, j, > + qdev_get_gpio_in(a->intc.gic, ppibase + timer_irq[j])); > + } > + > + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, > + ppibase + ARCH_GIC_MAINT_IRQ); > + qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", > + 0, irq); > + qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > + qdev_get_gpio_in(a->intc.gic, ppibase + VIRTUAL_PMU_IRQ)); > + > + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); > + sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); > + sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); > + sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); > + } > + > + return true; > +} > + > +static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) > +{ > + int i; > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > + AspeedSoCState *s = ASPEED_SOC(dev); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + g_autofree char *sram_name = NULL; > + uint32_t num_ints; > + > + /* Default boot region (SPI memory or ROMs) */ > + memory_region_init(&s->spi_boot_container, OBJECT(s), > + "aspeed.spi_boot_container", 0x400000000); > + memory_region_add_subregion(s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT], > + &s->spi_boot_container); > + > + /* CPU */ > + for (i = 0; i < sc->num_cpus; i++) { > + object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", > + aspeed_calc_affinity(i), &error_abort); > + > + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq", 1125000000, > + &error_abort); > + object_property_set_link(OBJECT(&a->cpu[i]), "memory", > + OBJECT(s->memory), &error_abort); > + > + if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) { > + return; > + } > + } > + > + /* GIC */ > + if (!aspeed_soc_ast2700_gic(dev, errp)) { > + return; > + } > + > + /* INTC */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) { > + return; > + } > + > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, > + sc->memmap[ASPEED_DEV_INTC]); > + > + /* GICINT orgates -> INTC -> GIC */ > + num_ints = object_property_get_int(OBJECT(&a->intc), "num-ints", > + &error_abort); > + for (i = 0; i < num_ints; i++) { > + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, > + qdev_get_gpio_in(DEVICE(&a->intc), i)); > + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, > + qdev_get_gpio_in(a->intc.gic, > + aspeed_soc_ast2700_gic_intcmap[i].irq)); > + } > + > + /* SRAM */ > + sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index); > + if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, > + errp)) { > + return; > + } > + memory_region_add_subregion(s->memory, > + sc->memmap[ASPEED_DEV_SRAM], &s->sram); > + > + /* SCU */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]); > + > + /* SCU1 */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scuio), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scuio), 0, > + sc->memmap[ASPEED_DEV_SCUIO]); > + > + /* UART */ > + if (!aspeed_soc_uart_realize(s, errp)) { > + return; > + } > + > + /* FMC, The number of CS is set at the board level */ > + object_property_set_int(OBJECT(&s->fmc), "dram-base", > + sc->memmap[ASPEED_DEV_SDRAM], > + &error_abort); > + object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr), > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]); > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, > + ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, > + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); > + > + /* Set up an alias on the FMC CE0 region (boot default) */ > + MemoryRegion *fmc0_mmio = &s->fmc.flashes[0].mmio; > + memory_region_init_alias(&s->spi_boot, OBJECT(s), "aspeed.spi_boot", > + fmc0_mmio, 0, memory_region_size(fmc0_mmio)); > + memory_region_add_subregion(&s->spi_boot_container, 0x0, &s->spi_boot); > + > + /* SPI */ > + for (i = 0; i < sc->spis_num; i++) { > + object_property_set_link(OBJECT(&s->spi[i]), "dram", > + OBJECT(s->dram_mr), &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0, > + sc->memmap[ASPEED_DEV_SPI0 + i]); > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, > + ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); > + } > + > + /* > + * SDMC - SDRAM Memory Controller > + * The SDMC controller is unlocked at SPL stage. > + * At present, only supports to emulate booting > + * start from u-boot stage. Set SDMC controller > + * unlocked by default. It is a temporarily solution. > + */ > + object_property_set_bool(OBJECT(&s->sdmc), "unlocked", true, > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sdmc), 0, > + sc->memmap[ASPEED_DEV_SDMC]); > + > + /* RAM */ > + if (!aspeed_soc_dram_init(s, errp)) { > + return; > + } > + > + for (i = 0; i < sc->macs_num; i++) { > + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed", true, > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > + sc->memmap[ASPEED_DEV_ETH1 + i]); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 + i)); > + > + object_property_set_link(OBJECT(&s->mii[i]), "nic", > + OBJECT(&s->ftgmac100[i]), &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mii[i]), errp)) { > + return; > + } > + > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0, > + sc->memmap[ASPEED_DEV_MII1 + i]); > + } > + > + /* Watch dog */ > + for (i = 0; i < sc->wdts_num; i++) { > + AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]); > + hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * awc->iosize; > + > + object_property_set_link(OBJECT(&s->wdt[i]), "scu", OBJECT(&s->scu), > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, wdt_offset); > + } > + > + /* SLI */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sli), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sli), 0, sc->memmap[ASPEED_DEV_SLI]); > + > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sliio), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sliio), 0, > + sc->memmap[ASPEED_DEV_SLIIO]); > + > + create_unimplemented_device("ast2700.dpmcu", 0x11000000, 0x40000); > + create_unimplemented_device("ast2700.iomem0", 0x12000000, 0x01000000); > + create_unimplemented_device("ast2700.iomem1", 0x14000000, 0x01000000); > + create_unimplemented_device("ast2700.ltpi", 0x30000000, 0x1000000); > + create_unimplemented_device("ast2700.io", 0x0, 0x4000000); > +} > + > +static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data) > +{ > + static const char * const valid_cpu_types[] = { > + ARM_CPU_TYPE_NAME("cortex-a35"), > + NULL > + }; > + DeviceClass *dc = DEVICE_CLASS(oc); > + AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); > + > + /* Reason: The Aspeed SoC can only be instantiated from a board */ > + dc->user_creatable = false; > + dc->realize = aspeed_soc_ast2700_realize; > + > + sc->name = "ast2700-a0"; > + sc->valid_cpu_types = valid_cpu_types; > + sc->silicon_rev = AST2700_A0_SILICON_REV; > + sc->sram_size = 0x20000; > + sc->spis_num = 3; > + sc->wdts_num = 8; > + sc->macs_num = 1; > + sc->uarts_num = 13; > + sc->num_cpus = 4; > + sc->uarts_base = ASPEED_DEV_UART0; > + sc->irqmap = aspeed_soc_ast2700_irqmap; > + sc->memmap = aspeed_soc_ast2700_memmap; > + sc->get_irq = aspeed_soc_ast2700_get_irq; > +} > + > +static const TypeInfo aspeed_soc_ast27x0_types[] = { > + { > + .name = TYPE_ASPEED27X0_SOC, > + .parent = TYPE_ASPEED_SOC, > + .instance_size = sizeof(Aspeed27x0SoCState), > + .abstract = true, > + }, { > + .name = "ast2700-a0", > + .parent = TYPE_ASPEED27X0_SOC, > + .instance_init = aspeed_soc_ast2700_init, > + .class_init = aspeed_soc_ast2700_class_init, > + }, > +}; > + > +DEFINE_TYPES(aspeed_soc_ast27x0_types) > diff --git a/hw/arm/meson.build b/hw/arm/meson.build > index 6808135c1f..1e3295a423 100644 > --- a/hw/arm/meson.build > +++ b/hw/arm/meson.build > @@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > 'aspeed_soc_common.c', > 'aspeed_ast2400.c', > 'aspeed_ast2600.c', > + 'aspeed_ast27x0.c', > 'aspeed_ast10x0.c', > 'aspeed_eeprom.c', > 'fby35.c')) Please change that to : arm_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: files('aspeed_ast27x0.c')) The AST2700 SoC model uses aarch64 CPUs. Thanks, C. > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h > index c60fac900a..9f177b6037 100644 > --- a/include/hw/arm/aspeed_soc.h > +++ b/include/hw/arm/aspeed_soc.h > @@ -15,6 +15,7 @@ > #include "hw/cpu/a15mpcore.h" > #include "hw/arm/armv7m.h" > #include "hw/intc/aspeed_vic.h" > +#include "hw/intc/aspeed_intc.h" > #include "hw/misc/aspeed_scu.h" > #include "hw/adc/aspeed_adc.h" > #include "hw/misc/aspeed_sdmc.h" > @@ -26,6 +27,7 @@ > #include "hw/ssi/aspeed_smc.h" > #include "hw/misc/aspeed_hace.h" > #include "hw/misc/aspeed_sbc.h" > +#include "hw/misc/aspeed_sli.h" > #include "hw/watchdog/wdt_aspeed.h" > #include "hw/net/ftgmac100.h" > #include "target/arm/cpu.h" > @@ -41,8 +43,8 @@ > > #define ASPEED_SPIS_NUM 2 > #define ASPEED_EHCIS_NUM 2 > -#define ASPEED_WDTS_NUM 4 > -#define ASPEED_CPUS_NUM 2 > +#define ASPEED_WDTS_NUM 8 > +#define ASPEED_CPUS_NUM 4 > #define ASPEED_MACS_NUM 4 > #define ASPEED_UARTS_NUM 13 > #define ASPEED_JTAG_NUM 2 > @@ -61,6 +63,7 @@ struct AspeedSoCState { > AspeedI2CState i2c; > AspeedI3CState i3c; > AspeedSCUState scu; > + AspeedSCUState scuio; > AspeedHACEState hace; > AspeedXDMAState xdma; > AspeedADCState adc; > @@ -68,6 +71,8 @@ struct AspeedSoCState { > AspeedSMCState spi[ASPEED_SPIS_NUM]; > EHCISysBusState ehci[ASPEED_EHCIS_NUM]; > AspeedSBCState sbc; > + AspeedSLIState sli; > + AspeedSLIState sliio; > MemoryRegion secsram; > UnimplementedDeviceState sbc_unimplemented; > AspeedSDMCState sdmc; > @@ -117,6 +122,16 @@ struct Aspeed2600SoCState { > #define TYPE_ASPEED2600_SOC "aspeed2600-soc" > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) > > +struct Aspeed27x0SoCState { > + AspeedSoCState parent; > + > + ARMCPU cpu[ASPEED_CPUS_NUM]; > + AspeedINTCState intc; > +}; > + > +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > + > struct Aspeed10x0SoCState { > AspeedSoCState parent; > > @@ -168,11 +183,13 @@ enum { > ASPEED_DEV_UART13, > ASPEED_DEV_VUART, > ASPEED_DEV_FMC, > + ASPEED_DEV_SPI0, > ASPEED_DEV_SPI1, > ASPEED_DEV_SPI2, > ASPEED_DEV_EHCI1, > ASPEED_DEV_EHCI2, > ASPEED_DEV_VIC, > + ASPEED_DEV_INTC, > ASPEED_DEV_SDMC, > ASPEED_DEV_SCU, > ASPEED_DEV_ADC, > @@ -222,6 +239,11 @@ enum { > ASPEED_DEV_JTAG1, > ASPEED_DEV_FSI1, > ASPEED_DEV_FSI2, > + ASPEED_DEV_SCUIO, > + ASPEED_DEV_SLI, > + ASPEED_DEV_SLIIO, > + ASPEED_GIC_DIST, > + ASPEED_GIC_REDIST, > }; > > qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);
On 5/27/24 10:02, Jamin Lin wrote: > Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 CPU). > > AST2700 SOC and its interrupt controller are too complex to handle > in the common Aspeed SoC framework. We introduce a new ast2700 > class with instance_init and realize handlers. > > AST2700 is a 64 bits quad core cpus and support 8 watchdog. > Update maximum ASPEED_CPUS_NUM to 4 and ASPEED_WDTS_NUM to 8. > In addition, update AspeedSocState to support scuio, sli, sliio and intc. > > Add TYPE_ASPEED27X0_SOC machine type. > > The SDMC controller is unlocked at SPL stage. > At present, only supports to emulate booting > start from u-boot stage. Set SDMC controller > unlocked by default. > > In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. > It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. > And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is connected to > GICINT or-gates instead of GIC device. > > Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> > --- > hw/arm/aspeed_ast27x0.c | 563 ++++++++++++++++++++++++++++++++++++ > hw/arm/meson.build | 1 + > include/hw/arm/aspeed_soc.h | 26 +- > 3 files changed, 588 insertions(+), 2 deletions(-) > create mode 100644 hw/arm/aspeed_ast27x0.c > > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c > new file mode 100644 > index 0000000000..a3a03fc1ca > --- /dev/null > +++ b/hw/arm/aspeed_ast27x0.c > @@ -0,0 +1,563 @@ > +/* > + * ASPEED SoC 27x0 family > + * > + * Copyright (C) 2024 ASPEED Technology Inc. > + * > + * This code is licensed under the GPL version 2 or later. See > + * the COPYING file in the top-level directory. > + * > + * Implementation extracted from the AST2600 and adapted for AST27x0. > + */ > + > +#include "qemu/osdep.h" > +#include "qapi/error.h" > +#include "hw/misc/unimp.h" > +#include "hw/arm/aspeed_soc.h" > +#include "qemu/module.h" > +#include "qemu/error-report.h" > +#include "hw/i2c/aspeed_i2c.h" > +#include "net/net.h" > +#include "sysemu/sysemu.h" > +#include "hw/intc/arm_gicv3.h" > +#include "qapi/qmp/qlist.h" > + > +static const hwaddr aspeed_soc_ast2700_memmap[] = { > + [ASPEED_DEV_SPI_BOOT] = 0x400000000, > + [ASPEED_DEV_SRAM] = 0x10000000, > + [ASPEED_DEV_SDMC] = 0x12C00000, > + [ASPEED_DEV_SCU] = 0x12C02000, > + [ASPEED_DEV_SCUIO] = 0x14C02000, > + [ASPEED_DEV_UART0] = 0X14C33000, > + [ASPEED_DEV_UART1] = 0X14C33100, > + [ASPEED_DEV_UART2] = 0X14C33200, > + [ASPEED_DEV_UART3] = 0X14C33300, > + [ASPEED_DEV_UART4] = 0X12C1A000, > + [ASPEED_DEV_UART5] = 0X14C33400, > + [ASPEED_DEV_UART6] = 0X14C33500, > + [ASPEED_DEV_UART7] = 0X14C33600, > + [ASPEED_DEV_UART8] = 0X14C33700, > + [ASPEED_DEV_UART9] = 0X14C33800, > + [ASPEED_DEV_UART10] = 0X14C33900, > + [ASPEED_DEV_UART11] = 0X14C33A00, > + [ASPEED_DEV_UART12] = 0X14C33B00, > + [ASPEED_DEV_WDT] = 0x14C37000, > + [ASPEED_DEV_VUART] = 0X14C30000, > + [ASPEED_DEV_FMC] = 0x14000000, > + [ASPEED_DEV_SPI0] = 0x14010000, > + [ASPEED_DEV_SPI1] = 0x14020000, > + [ASPEED_DEV_SPI2] = 0x14030000, > + [ASPEED_DEV_SDRAM] = 0x400000000, > + [ASPEED_DEV_MII1] = 0x14040000, > + [ASPEED_DEV_MII2] = 0x14040008, > + [ASPEED_DEV_MII3] = 0x14040010, > + [ASPEED_DEV_ETH1] = 0x14050000, > + [ASPEED_DEV_ETH2] = 0x14060000, > + [ASPEED_DEV_ETH3] = 0x14070000, > + [ASPEED_DEV_EMMC] = 0x12090000, > + [ASPEED_DEV_INTC] = 0x12100000, > + [ASPEED_DEV_SLI] = 0x12C17000, > + [ASPEED_DEV_SLIIO] = 0x14C1E000, > + [ASPEED_GIC_DIST] = 0x12200000, > + [ASPEED_GIC_REDIST] = 0x12280000, > +}; > + > +#define AST2700_MAX_IRQ 288 > + > +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ > +static const int aspeed_soc_ast2700_irqmap[] = { > + [ASPEED_DEV_UART0] = 132, > + [ASPEED_DEV_UART1] = 132, > + [ASPEED_DEV_UART2] = 132, > + [ASPEED_DEV_UART3] = 132, > + [ASPEED_DEV_UART4] = 8, > + [ASPEED_DEV_UART5] = 132, > + [ASPEED_DEV_UART6] = 132, > + [ASPEED_DEV_UART7] = 132, > + [ASPEED_DEV_UART8] = 132, > + [ASPEED_DEV_UART9] = 132, > + [ASPEED_DEV_UART10] = 132, > + [ASPEED_DEV_UART11] = 132, > + [ASPEED_DEV_UART12] = 132, > + [ASPEED_DEV_FMC] = 131, > + [ASPEED_DEV_SDMC] = 0, > + [ASPEED_DEV_SCU] = 12, > + [ASPEED_DEV_ADC] = 130, > + [ASPEED_DEV_XDMA] = 5, > + [ASPEED_DEV_EMMC] = 15, > + [ASPEED_DEV_GPIO] = 11, > + [ASPEED_DEV_GPIO_1_8V] = 130, > + [ASPEED_DEV_RTC] = 13, > + [ASPEED_DEV_TIMER1] = 16, > + [ASPEED_DEV_TIMER2] = 17, > + [ASPEED_DEV_TIMER3] = 18, > + [ASPEED_DEV_TIMER4] = 19, > + [ASPEED_DEV_TIMER5] = 20, > + [ASPEED_DEV_TIMER6] = 21, > + [ASPEED_DEV_TIMER7] = 22, > + [ASPEED_DEV_TIMER8] = 23, > + [ASPEED_DEV_WDT] = 131, > + [ASPEED_DEV_PWM] = 131, > + [ASPEED_DEV_LPC] = 128, > + [ASPEED_DEV_IBT] = 128, > + [ASPEED_DEV_I2C] = 130, > + [ASPEED_DEV_PECI] = 133, > + [ASPEED_DEV_ETH1] = 132, > + [ASPEED_DEV_ETH2] = 132, > + [ASPEED_DEV_ETH3] = 132, > + [ASPEED_DEV_HACE] = 4, > + [ASPEED_DEV_KCS] = 128, > + [ASPEED_DEV_DP] = 28, > + [ASPEED_DEV_I3C] = 131, > +}; > + > +/* GICINT 128 */ > +static const int aspeed_soc_ast2700_gic128_intcmap[] = { > + [ASPEED_DEV_LPC] = 0, > + [ASPEED_DEV_IBT] = 2, > + [ASPEED_DEV_KCS] = 4, > +}; > + > +/* GICINT 130 */ > +static const int aspeed_soc_ast2700_gic130_intcmap[] = { > + [ASPEED_DEV_I2C] = 0, > + [ASPEED_DEV_ADC] = 16, > + [ASPEED_DEV_GPIO_1_8V] = 18, > +}; > + > +/* GICINT 131 */ > +static const int aspeed_soc_ast2700_gic131_intcmap[] = { > + [ASPEED_DEV_I3C] = 0, > + [ASPEED_DEV_WDT] = 16, > + [ASPEED_DEV_FMC] = 25, > + [ASPEED_DEV_PWM] = 29, > +}; > + > +/* GICINT 132 */ > +static const int aspeed_soc_ast2700_gic132_intcmap[] = { > + [ASPEED_DEV_ETH1] = 0, > + [ASPEED_DEV_ETH2] = 1, > + [ASPEED_DEV_ETH3] = 2, > + [ASPEED_DEV_UART0] = 7, > + [ASPEED_DEV_UART1] = 8, > + [ASPEED_DEV_UART2] = 9, > + [ASPEED_DEV_UART3] = 10, > + [ASPEED_DEV_UART5] = 11, > + [ASPEED_DEV_UART6] = 12, > + [ASPEED_DEV_UART7] = 13, > + [ASPEED_DEV_UART8] = 14, > + [ASPEED_DEV_UART9] = 15, > + [ASPEED_DEV_UART10] = 16, > + [ASPEED_DEV_UART11] = 17, > + [ASPEED_DEV_UART12] = 18, > +}; > + > +/* GICINT 133 */ > +static const int aspeed_soc_ast2700_gic133_intcmap[] = { > + [ASPEED_DEV_PECI] = 4, > +}; > + > +/* GICINT 128 ~ 136 */ > +struct gic_intc_irq_info { > + int irq; > + const int *ptr; > +}; > + > +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { > + {128, aspeed_soc_ast2700_gic128_intcmap}, > + {129, NULL}, > + {130, aspeed_soc_ast2700_gic130_intcmap}, > + {131, aspeed_soc_ast2700_gic131_intcmap}, > + {132, aspeed_soc_ast2700_gic132_intcmap}, > + {133, aspeed_soc_ast2700_gic133_intcmap}, > + {134, NULL}, > + {135, NULL}, > + {136, NULL}, > +}; > + > +static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(s); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + int i; > + > + for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { > + if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { > + assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); > + return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), > + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); > + } > + } > + > + return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]); > +} > + > +static void aspeed_soc_ast2700_init(Object *obj) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); > + AspeedSoCState *s = ASPEED_SOC(obj); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + int i; > + char socname[8]; > + char typename[64]; > + > + if (sscanf(sc->name, "%7s", socname) != 1) { > + g_assert_not_reached(); > + } > + > + for (i = 0; i < sc->num_cpus; i++) { > + object_initialize_child(obj, "cpu[*]", &a->cpu[i], > + aspeed_soc_cpu_type(sc)); > + } > + > + object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); > + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", > + sc->silicon_rev); > + object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), > + "hw-strap1"); > + object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), > + "hw-strap2"); > + object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), > + "hw-prot-key"); > + > + object_initialize_child(obj, "scuio", &s->scuio, TYPE_ASPEED_2700_SCUIO); > + qdev_prop_set_uint32(DEVICE(&s->scuio), "silicon-rev", > + sc->silicon_rev); > + > + snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); > + object_initialize_child(obj, "fmc", &s->fmc, typename); > + > + for (i = 0; i < sc->spis_num; i++) { > + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i, socname); > + object_initialize_child(obj, "spi[*]", &s->spi[i], typename); > + } > + > + snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname); > + object_initialize_child(obj, "sdmc", &s->sdmc, typename); > + object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), > + "ram-size"); > + > + for (i = 0; i < sc->wdts_num; i++) { > + snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname); > + object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename); > + } > + > + for (i = 0; i < sc->macs_num; i++) { > + object_initialize_child(obj, "ftgmac100[*]", &s->ftgmac100[i], > + TYPE_FTGMAC100); > + > + object_initialize_child(obj, "mii[*]", &s->mii[i], TYPE_ASPEED_MII); > + } > + > + for (i = 0; i < sc->uarts_num; i++) { > + object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_MM); > + } > + > + object_initialize_child(obj, "sli", &s->sli, TYPE_ASPEED_2700_SLI); > + object_initialize_child(obj, "sliio", &s->sliio, TYPE_ASPEED_2700_SLIIO); > + object_initialize_child(obj, "intc", &a->intc, TYPE_ASPEED_2700_INTC); > +} > + > +/* > + * ASPEED ast2700 has 0x0 as cluster ID > + * > + * https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 > + */ > +static uint64_t aspeed_calc_affinity(int cpu) > +{ > + return (0x0 << ARM_AFF1_SHIFT) | cpu; > +} > + > +static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) > +{ > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > + AspeedSoCState *s = ASPEED_SOC(dev); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + SysBusDevice *gicbusdev; > + QList *redist_region_count; > + int i; > + > + a->intc.gic = qdev_new(gicv3_class_name()); > + qdev_prop_set_uint32(a->intc.gic, "revision", 3); > + qdev_prop_set_uint32(a->intc.gic, "num-cpu", sc->num_cpus); > + qdev_prop_set_uint32(a->intc.gic, "num-irq", AST2700_MAX_IRQ); > + > + redist_region_count = qlist_new(); > + qlist_append_int(redist_region_count, sc->num_cpus); > + qdev_prop_set_array(a->intc.gic, "redist-region-count", > + redist_region_count); > + > + gicbusdev = SYS_BUS_DEVICE(a->intc.gic); > + if (!sysbus_realize(gicbusdev, errp)) { > + return false; > + } > + sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > + sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); > + > + for (i = 0; i < sc->num_cpus; i++) { > + DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; > + int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > + > + const int timer_irq[] = { > + [GTIMER_PHYS] = 14, > + [GTIMER_VIRT] = 11, > + [GTIMER_HYP] = 10, > + [GTIMER_SEC] = 13, > + }; > + int j; > + > + for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > + qdev_connect_gpio_out(cpudev, j, > + qdev_get_gpio_in(a->intc.gic, ppibase + timer_irq[j])); > + } > + > + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, > + ppibase + ARCH_GIC_MAINT_IRQ); > + qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", > + 0, irq); > + qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > + qdev_get_gpio_in(a->intc.gic, ppibase + VIRTUAL_PMU_IRQ)); > + > + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); > + sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); > + sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); > + sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); > + } > + > + return true; > +} > + > +static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) > +{ > + int i; > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > + AspeedSoCState *s = ASPEED_SOC(dev); > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > + g_autofree char *sram_name = NULL; > + uint32_t num_ints; > + > + /* Default boot region (SPI memory or ROMs) */ > + memory_region_init(&s->spi_boot_container, OBJECT(s), > + "aspeed.spi_boot_container", 0x400000000); > + memory_region_add_subregion(s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT], > + &s->spi_boot_container); > + > + /* CPU */ > + for (i = 0; i < sc->num_cpus; i++) { > + object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", > + aspeed_calc_affinity(i), &error_abort); > + > + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq", 1125000000, > + &error_abort); > + object_property_set_link(OBJECT(&a->cpu[i]), "memory", > + OBJECT(s->memory), &error_abort); > + > + if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) { > + return; > + } > + } > + > + /* GIC */ > + if (!aspeed_soc_ast2700_gic(dev, errp)) { > + return; > + } > + > + /* INTC */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) { > + return; > + } > + > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, > + sc->memmap[ASPEED_DEV_INTC]); > + > + /* GICINT orgates -> INTC -> GIC */ > + num_ints = object_property_get_int(OBJECT(&a->intc), "num-ints", > + &error_abort); Please use the num_ints value from the AspeedINTCClass instead. Thanks, C. > + for (i = 0; i < num_ints; i++) { > + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, > + qdev_get_gpio_in(DEVICE(&a->intc), i)); > + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, > + qdev_get_gpio_in(a->intc.gic, > + aspeed_soc_ast2700_gic_intcmap[i].irq)); > + } > + > + /* SRAM */ > + sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index); > + if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, > + errp)) { > + return; > + } > + memory_region_add_subregion(s->memory, > + sc->memmap[ASPEED_DEV_SRAM], &s->sram); > + > + /* SCU */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]); > + > + /* SCU1 */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scuio), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scuio), 0, > + sc->memmap[ASPEED_DEV_SCUIO]); > + > + /* UART */ > + if (!aspeed_soc_uart_realize(s, errp)) { > + return; > + } > + > + /* FMC, The number of CS is set at the board level */ > + object_property_set_int(OBJECT(&s->fmc), "dram-base", > + sc->memmap[ASPEED_DEV_SDRAM], > + &error_abort); > + object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr), > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]); > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, > + ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, > + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); > + > + /* Set up an alias on the FMC CE0 region (boot default) */ > + MemoryRegion *fmc0_mmio = &s->fmc.flashes[0].mmio; > + memory_region_init_alias(&s->spi_boot, OBJECT(s), "aspeed.spi_boot", > + fmc0_mmio, 0, memory_region_size(fmc0_mmio)); > + memory_region_add_subregion(&s->spi_boot_container, 0x0, &s->spi_boot); > + > + /* SPI */ > + for (i = 0; i < sc->spis_num; i++) { > + object_property_set_link(OBJECT(&s->spi[i]), "dram", > + OBJECT(s->dram_mr), &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0, > + sc->memmap[ASPEED_DEV_SPI0 + i]); > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, > + ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); > + } > + > + /* > + * SDMC - SDRAM Memory Controller > + * The SDMC controller is unlocked at SPL stage. > + * At present, only supports to emulate booting > + * start from u-boot stage. Set SDMC controller > + * unlocked by default. It is a temporarily solution. > + */ > + object_property_set_bool(OBJECT(&s->sdmc), "unlocked", true, > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sdmc), 0, > + sc->memmap[ASPEED_DEV_SDMC]); > + > + /* RAM */ > + if (!aspeed_soc_dram_init(s, errp)) { > + return; > + } > + > + for (i = 0; i < sc->macs_num; i++) { > + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed", true, > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > + sc->memmap[ASPEED_DEV_ETH1 + i]); > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 + i)); > + > + object_property_set_link(OBJECT(&s->mii[i]), "nic", > + OBJECT(&s->ftgmac100[i]), &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mii[i]), errp)) { > + return; > + } > + > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0, > + sc->memmap[ASPEED_DEV_MII1 + i]); > + } > + > + /* Watch dog */ > + for (i = 0; i < sc->wdts_num; i++) { > + AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]); > + hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * awc->iosize; > + > + object_property_set_link(OBJECT(&s->wdt[i]), "scu", OBJECT(&s->scu), > + &error_abort); > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, wdt_offset); > + } > + > + /* SLI */ > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sli), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sli), 0, sc->memmap[ASPEED_DEV_SLI]); > + > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sliio), errp)) { > + return; > + } > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sliio), 0, > + sc->memmap[ASPEED_DEV_SLIIO]); > + > + create_unimplemented_device("ast2700.dpmcu", 0x11000000, 0x40000); > + create_unimplemented_device("ast2700.iomem0", 0x12000000, 0x01000000); > + create_unimplemented_device("ast2700.iomem1", 0x14000000, 0x01000000); > + create_unimplemented_device("ast2700.ltpi", 0x30000000, 0x1000000); > + create_unimplemented_device("ast2700.io", 0x0, 0x4000000); > +} > + > +static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data) > +{ > + static const char * const valid_cpu_types[] = { > + ARM_CPU_TYPE_NAME("cortex-a35"), > + NULL > + }; > + DeviceClass *dc = DEVICE_CLASS(oc); > + AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); > + > + /* Reason: The Aspeed SoC can only be instantiated from a board */ > + dc->user_creatable = false; > + dc->realize = aspeed_soc_ast2700_realize; > + > + sc->name = "ast2700-a0"; > + sc->valid_cpu_types = valid_cpu_types; > + sc->silicon_rev = AST2700_A0_SILICON_REV; > + sc->sram_size = 0x20000; > + sc->spis_num = 3; > + sc->wdts_num = 8; > + sc->macs_num = 1; > + sc->uarts_num = 13; > + sc->num_cpus = 4; > + sc->uarts_base = ASPEED_DEV_UART0; > + sc->irqmap = aspeed_soc_ast2700_irqmap; > + sc->memmap = aspeed_soc_ast2700_memmap; > + sc->get_irq = aspeed_soc_ast2700_get_irq; > +} > + > +static const TypeInfo aspeed_soc_ast27x0_types[] = { > + { > + .name = TYPE_ASPEED27X0_SOC, > + .parent = TYPE_ASPEED_SOC, > + .instance_size = sizeof(Aspeed27x0SoCState), > + .abstract = true, > + }, { > + .name = "ast2700-a0", > + .parent = TYPE_ASPEED27X0_SOC, > + .instance_init = aspeed_soc_ast2700_init, > + .class_init = aspeed_soc_ast2700_class_init, > + }, > +}; > + > +DEFINE_TYPES(aspeed_soc_ast27x0_types) > diff --git a/hw/arm/meson.build b/hw/arm/meson.build > index 6808135c1f..1e3295a423 100644 > --- a/hw/arm/meson.build > +++ b/hw/arm/meson.build > @@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > 'aspeed_soc_common.c', > 'aspeed_ast2400.c', > 'aspeed_ast2600.c', > + 'aspeed_ast27x0.c', > 'aspeed_ast10x0.c', > 'aspeed_eeprom.c', > 'fby35.c')) > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h > index c60fac900a..9f177b6037 100644 > --- a/include/hw/arm/aspeed_soc.h > +++ b/include/hw/arm/aspeed_soc.h > @@ -15,6 +15,7 @@ > #include "hw/cpu/a15mpcore.h" > #include "hw/arm/armv7m.h" > #include "hw/intc/aspeed_vic.h" > +#include "hw/intc/aspeed_intc.h" > #include "hw/misc/aspeed_scu.h" > #include "hw/adc/aspeed_adc.h" > #include "hw/misc/aspeed_sdmc.h" > @@ -26,6 +27,7 @@ > #include "hw/ssi/aspeed_smc.h" > #include "hw/misc/aspeed_hace.h" > #include "hw/misc/aspeed_sbc.h" > +#include "hw/misc/aspeed_sli.h" > #include "hw/watchdog/wdt_aspeed.h" > #include "hw/net/ftgmac100.h" > #include "target/arm/cpu.h" > @@ -41,8 +43,8 @@ > > #define ASPEED_SPIS_NUM 2 > #define ASPEED_EHCIS_NUM 2 > -#define ASPEED_WDTS_NUM 4 > -#define ASPEED_CPUS_NUM 2 > +#define ASPEED_WDTS_NUM 8 > +#define ASPEED_CPUS_NUM 4 > #define ASPEED_MACS_NUM 4 > #define ASPEED_UARTS_NUM 13 > #define ASPEED_JTAG_NUM 2 > @@ -61,6 +63,7 @@ struct AspeedSoCState { > AspeedI2CState i2c; > AspeedI3CState i3c; > AspeedSCUState scu; > + AspeedSCUState scuio; > AspeedHACEState hace; > AspeedXDMAState xdma; > AspeedADCState adc; > @@ -68,6 +71,8 @@ struct AspeedSoCState { > AspeedSMCState spi[ASPEED_SPIS_NUM]; > EHCISysBusState ehci[ASPEED_EHCIS_NUM]; > AspeedSBCState sbc; > + AspeedSLIState sli; > + AspeedSLIState sliio; > MemoryRegion secsram; > UnimplementedDeviceState sbc_unimplemented; > AspeedSDMCState sdmc; > @@ -117,6 +122,16 @@ struct Aspeed2600SoCState { > #define TYPE_ASPEED2600_SOC "aspeed2600-soc" > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) > > +struct Aspeed27x0SoCState { > + AspeedSoCState parent; > + > + ARMCPU cpu[ASPEED_CPUS_NUM]; > + AspeedINTCState intc; > +}; > + > +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > + > struct Aspeed10x0SoCState { > AspeedSoCState parent; > > @@ -168,11 +183,13 @@ enum { > ASPEED_DEV_UART13, > ASPEED_DEV_VUART, > ASPEED_DEV_FMC, > + ASPEED_DEV_SPI0, > ASPEED_DEV_SPI1, > ASPEED_DEV_SPI2, > ASPEED_DEV_EHCI1, > ASPEED_DEV_EHCI2, > ASPEED_DEV_VIC, > + ASPEED_DEV_INTC, > ASPEED_DEV_SDMC, > ASPEED_DEV_SCU, > ASPEED_DEV_ADC, > @@ -222,6 +239,11 @@ enum { > ASPEED_DEV_JTAG1, > ASPEED_DEV_FSI1, > ASPEED_DEV_FSI2, > + ASPEED_DEV_SCUIO, > + ASPEED_DEV_SLI, > + ASPEED_DEV_SLIIO, > + ASPEED_GIC_DIST, > + ASPEED_GIC_REDIST, > }; > > qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);
Hi Cedric, > From: Cédric Le Goater <clg@kaod.org> > Subject: Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support > > On 5/27/24 10:02, Jamin Lin wrote: > > Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 > CPU). > > > > AST2700 SOC and its interrupt controller are too complex to handle in > > the common Aspeed SoC framework. We introduce a new ast2700 class with > > instance_init and realize handlers. > > > > AST2700 is a 64 bits quad core cpus and support 8 watchdog. > > Update maximum ASPEED_CPUS_NUM to 4 and ASPEED_WDTS_NUM to 8. > > In addition, update AspeedSocState to support scuio, sli, sliio and intc. > > > > Add TYPE_ASPEED27X0_SOC machine type. > > > > The SDMC controller is unlocked at SPL stage. > > At present, only supports to emulate booting start from u-boot stage. > > Set SDMC controller unlocked by default. > > > > In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. > > It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. > > And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is > > connected to GICINT or-gates instead of GIC device. > > > > Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> > > --- > > hw/arm/aspeed_ast27x0.c | 563 > ++++++++++++++++++++++++++++++++++++ > > hw/arm/meson.build | 1 + > > include/hw/arm/aspeed_soc.h | 26 +- > > 3 files changed, 588 insertions(+), 2 deletions(-) > > create mode 100644 hw/arm/aspeed_ast27x0.c > > > > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c new > > file mode 100644 index 0000000000..a3a03fc1ca > > --- /dev/null > > +++ b/hw/arm/aspeed_ast27x0.c > > @@ -0,0 +1,563 @@ > > +/* > > + * ASPEED SoC 27x0 family > > + * > > + * Copyright (C) 2024 ASPEED Technology Inc. > > + * > > + * This code is licensed under the GPL version 2 or later. See > > + * the COPYING file in the top-level directory. > > + * > > + * Implementation extracted from the AST2600 and adapted for AST27x0. > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/error.h" > > +#include "hw/misc/unimp.h" > > +#include "hw/arm/aspeed_soc.h" > > +#include "qemu/module.h" > > +#include "qemu/error-report.h" > > +#include "hw/i2c/aspeed_i2c.h" > > +#include "net/net.h" > > +#include "sysemu/sysemu.h" > > +#include "hw/intc/arm_gicv3.h" > > +#include "qapi/qmp/qlist.h" > > + > > +static const hwaddr aspeed_soc_ast2700_memmap[] = { > > + [ASPEED_DEV_SPI_BOOT] = 0x400000000, > > + [ASPEED_DEV_SRAM] = 0x10000000, > > + [ASPEED_DEV_SDMC] = 0x12C00000, > > + [ASPEED_DEV_SCU] = 0x12C02000, > > + [ASPEED_DEV_SCUIO] = 0x14C02000, > > + [ASPEED_DEV_UART0] = 0X14C33000, > > + [ASPEED_DEV_UART1] = 0X14C33100, > > + [ASPEED_DEV_UART2] = 0X14C33200, > > + [ASPEED_DEV_UART3] = 0X14C33300, > > + [ASPEED_DEV_UART4] = 0X12C1A000, > > + [ASPEED_DEV_UART5] = 0X14C33400, > > + [ASPEED_DEV_UART6] = 0X14C33500, > > + [ASPEED_DEV_UART7] = 0X14C33600, > > + [ASPEED_DEV_UART8] = 0X14C33700, > > + [ASPEED_DEV_UART9] = 0X14C33800, > > + [ASPEED_DEV_UART10] = 0X14C33900, > > + [ASPEED_DEV_UART11] = 0X14C33A00, > > + [ASPEED_DEV_UART12] = 0X14C33B00, > > + [ASPEED_DEV_WDT] = 0x14C37000, > > + [ASPEED_DEV_VUART] = 0X14C30000, > > + [ASPEED_DEV_FMC] = 0x14000000, > > + [ASPEED_DEV_SPI0] = 0x14010000, > > + [ASPEED_DEV_SPI1] = 0x14020000, > > + [ASPEED_DEV_SPI2] = 0x14030000, > > + [ASPEED_DEV_SDRAM] = 0x400000000, > > + [ASPEED_DEV_MII1] = 0x14040000, > > + [ASPEED_DEV_MII2] = 0x14040008, > > + [ASPEED_DEV_MII3] = 0x14040010, > > + [ASPEED_DEV_ETH1] = 0x14050000, > > + [ASPEED_DEV_ETH2] = 0x14060000, > > + [ASPEED_DEV_ETH3] = 0x14070000, > > + [ASPEED_DEV_EMMC] = 0x12090000, > > + [ASPEED_DEV_INTC] = 0x12100000, > > + [ASPEED_DEV_SLI] = 0x12C17000, > > + [ASPEED_DEV_SLIIO] = 0x14C1E000, > > + [ASPEED_GIC_DIST] = 0x12200000, > > + [ASPEED_GIC_REDIST] = 0x12280000, > > +}; > > + > > +#define AST2700_MAX_IRQ 288 > > + > > +/* Shared Peripheral Interrupt values below are offset by -32 from > > +datasheet */ static const int aspeed_soc_ast2700_irqmap[] = { > > + [ASPEED_DEV_UART0] = 132, > > + [ASPEED_DEV_UART1] = 132, > > + [ASPEED_DEV_UART2] = 132, > > + [ASPEED_DEV_UART3] = 132, > > + [ASPEED_DEV_UART4] = 8, > > + [ASPEED_DEV_UART5] = 132, > > + [ASPEED_DEV_UART6] = 132, > > + [ASPEED_DEV_UART7] = 132, > > + [ASPEED_DEV_UART8] = 132, > > + [ASPEED_DEV_UART9] = 132, > > + [ASPEED_DEV_UART10] = 132, > > + [ASPEED_DEV_UART11] = 132, > > + [ASPEED_DEV_UART12] = 132, > > + [ASPEED_DEV_FMC] = 131, > > + [ASPEED_DEV_SDMC] = 0, > > + [ASPEED_DEV_SCU] = 12, > > + [ASPEED_DEV_ADC] = 130, > > + [ASPEED_DEV_XDMA] = 5, > > + [ASPEED_DEV_EMMC] = 15, > > + [ASPEED_DEV_GPIO] = 11, > > + [ASPEED_DEV_GPIO_1_8V] = 130, > > + [ASPEED_DEV_RTC] = 13, > > + [ASPEED_DEV_TIMER1] = 16, > > + [ASPEED_DEV_TIMER2] = 17, > > + [ASPEED_DEV_TIMER3] = 18, > > + [ASPEED_DEV_TIMER4] = 19, > > + [ASPEED_DEV_TIMER5] = 20, > > + [ASPEED_DEV_TIMER6] = 21, > > + [ASPEED_DEV_TIMER7] = 22, > > + [ASPEED_DEV_TIMER8] = 23, > > + [ASPEED_DEV_WDT] = 131, > > + [ASPEED_DEV_PWM] = 131, > > + [ASPEED_DEV_LPC] = 128, > > + [ASPEED_DEV_IBT] = 128, > > + [ASPEED_DEV_I2C] = 130, > > + [ASPEED_DEV_PECI] = 133, > > + [ASPEED_DEV_ETH1] = 132, > > + [ASPEED_DEV_ETH2] = 132, > > + [ASPEED_DEV_ETH3] = 132, > > + [ASPEED_DEV_HACE] = 4, > > + [ASPEED_DEV_KCS] = 128, > > + [ASPEED_DEV_DP] = 28, > > + [ASPEED_DEV_I3C] = 131, > > +}; > > + > > +/* GICINT 128 */ > > +static const int aspeed_soc_ast2700_gic128_intcmap[] = { > > + [ASPEED_DEV_LPC] = 0, > > + [ASPEED_DEV_IBT] = 2, > > + [ASPEED_DEV_KCS] = 4, > > +}; > > + > > +/* GICINT 130 */ > > +static const int aspeed_soc_ast2700_gic130_intcmap[] = { > > + [ASPEED_DEV_I2C] = 0, > > + [ASPEED_DEV_ADC] = 16, > > + [ASPEED_DEV_GPIO_1_8V] = 18, > > +}; > > + > > +/* GICINT 131 */ > > +static const int aspeed_soc_ast2700_gic131_intcmap[] = { > > + [ASPEED_DEV_I3C] = 0, > > + [ASPEED_DEV_WDT] = 16, > > + [ASPEED_DEV_FMC] = 25, > > + [ASPEED_DEV_PWM] = 29, > > +}; > > + > > +/* GICINT 132 */ > > +static const int aspeed_soc_ast2700_gic132_intcmap[] = { > > + [ASPEED_DEV_ETH1] = 0, > > + [ASPEED_DEV_ETH2] = 1, > > + [ASPEED_DEV_ETH3] = 2, > > + [ASPEED_DEV_UART0] = 7, > > + [ASPEED_DEV_UART1] = 8, > > + [ASPEED_DEV_UART2] = 9, > > + [ASPEED_DEV_UART3] = 10, > > + [ASPEED_DEV_UART5] = 11, > > + [ASPEED_DEV_UART6] = 12, > > + [ASPEED_DEV_UART7] = 13, > > + [ASPEED_DEV_UART8] = 14, > > + [ASPEED_DEV_UART9] = 15, > > + [ASPEED_DEV_UART10] = 16, > > + [ASPEED_DEV_UART11] = 17, > > + [ASPEED_DEV_UART12] = 18, > > +}; > > + > > +/* GICINT 133 */ > > +static const int aspeed_soc_ast2700_gic133_intcmap[] = { > > + [ASPEED_DEV_PECI] = 4, > > +}; > > + > > +/* GICINT 128 ~ 136 */ > > +struct gic_intc_irq_info { > > + int irq; > > + const int *ptr; > > +}; > > + > > +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { > > + {128, aspeed_soc_ast2700_gic128_intcmap}, > > + {129, NULL}, > > + {130, aspeed_soc_ast2700_gic130_intcmap}, > > + {131, aspeed_soc_ast2700_gic131_intcmap}, > > + {132, aspeed_soc_ast2700_gic132_intcmap}, > > + {133, aspeed_soc_ast2700_gic133_intcmap}, > > + {134, NULL}, > > + {135, NULL}, > > + {136, NULL}, > > +}; > > + > > +static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int > > +dev) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(s); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + int i; > > + > > + for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { > > + if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { > > + assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); > > + return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), > > + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); > > + } > > + } > > + > > + return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]); } > > + > > +static void aspeed_soc_ast2700_init(Object *obj) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); > > + AspeedSoCState *s = ASPEED_SOC(obj); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + int i; > > + char socname[8]; > > + char typename[64]; > > + > > + if (sscanf(sc->name, "%7s", socname) != 1) { > > + g_assert_not_reached(); > > + } > > + > > + for (i = 0; i < sc->num_cpus; i++) { > > + object_initialize_child(obj, "cpu[*]", &a->cpu[i], > > + aspeed_soc_cpu_type(sc)); > > + } > > + > > + object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); > > + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", > > + sc->silicon_rev); > > + object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), > > + "hw-strap1"); > > + object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), > > + "hw-strap2"); > > + object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), > > + "hw-prot-key"); > > + > > + object_initialize_child(obj, "scuio", &s->scuio, > TYPE_ASPEED_2700_SCUIO); > > + qdev_prop_set_uint32(DEVICE(&s->scuio), "silicon-rev", > > + sc->silicon_rev); > > + > > + snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); > > + object_initialize_child(obj, "fmc", &s->fmc, typename); > > + > > + for (i = 0; i < sc->spis_num; i++) { > > + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i, > socname); > > + object_initialize_child(obj, "spi[*]", &s->spi[i], typename); > > + } > > + > > + snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname); > > + object_initialize_child(obj, "sdmc", &s->sdmc, typename); > > + object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), > > + "ram-size"); > > + > > + for (i = 0; i < sc->wdts_num; i++) { > > + snprintf(typename, sizeof(typename), "aspeed.wdt-%s", > socname); > > + object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename); > > + } > > + > > + for (i = 0; i < sc->macs_num; i++) { > > + object_initialize_child(obj, "ftgmac100[*]", &s->ftgmac100[i], > > + TYPE_FTGMAC100); > > + > > + object_initialize_child(obj, "mii[*]", &s->mii[i], > TYPE_ASPEED_MII); > > + } > > + > > + for (i = 0; i < sc->uarts_num; i++) { > > + object_initialize_child(obj, "uart[*]", &s->uart[i], > TYPE_SERIAL_MM); > > + } > > + > > + object_initialize_child(obj, "sli", &s->sli, TYPE_ASPEED_2700_SLI); > > + object_initialize_child(obj, "sliio", &s->sliio, > TYPE_ASPEED_2700_SLIIO); > > + object_initialize_child(obj, "intc", &a->intc, > > +TYPE_ASPEED_2700_INTC); } > > + > > +/* > > + * ASPEED ast2700 has 0x0 as cluster ID > > + * > > + * > > +https://developer.arm.com/documentation/100236/0100/register-descript > > +ions/aarch64-system-registers/multiprocessor-affinity-register--el1 > > + */ > > +static uint64_t aspeed_calc_affinity(int cpu) { > > + return (0x0 << ARM_AFF1_SHIFT) | cpu; } > > + > > +static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > > + AspeedSoCState *s = ASPEED_SOC(dev); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + SysBusDevice *gicbusdev; > > + QList *redist_region_count; > > + int i; > > + > > + a->intc.gic = qdev_new(gicv3_class_name()); > > This object doesn't need to be allocated. See versal_create_apu_gic() Thanks for review and suggestion. I updated this function and please see my new changes as below. > > > + qdev_prop_set_uint32(a->intc.gic, "revision", 3); > > + qdev_prop_set_uint32(a->intc.gic, "num-cpu", sc->num_cpus); > > + qdev_prop_set_uint32(a->intc.gic, "num-irq", AST2700_MAX_IRQ); > > + > > + redist_region_count = qlist_new(); > > + qlist_append_int(redist_region_count, sc->num_cpus); > > + qdev_prop_set_array(a->intc.gic, "redist-region-count", > > + redist_region_count); > > + > > + gicbusdev = SYS_BUS_DEVICE(a->intc.gic); > > + if (!sysbus_realize(gicbusdev, errp)) { > > + return false; > > I would find clearer to initialize/realize the underlying gic object under the > AspeedINTCState model. You could add property aliases. > > or > > add a GICv3State gic object under the SoC. Probably better, since the > AspeedINTCState doesn't need to know about the GIC. > Thanks review and suggestion. I refer to versal_create_apu_gic function, https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67 and updated aspeed_soc_ast2700_gic as following. If you have any concerned about the new changes, please let me know. Thanks-Jamin static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) { Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); AspeedSoCState *s = ASPEED_SOC(dev); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); SysBusDevice *gicbusdev; DeviceState *gicdev; QList *redist_region_count; int i; object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, gicv3_class_name()); gicbusdev = SYS_BUS_DEVICE(&a->gic); gicdev = DEVICE(&a->gic); qdev_prop_set_uint32(gicdev, "revision", 3); qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus); qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ); redist_region_count = qlist_new(); qlist_append_int(redist_region_count, sc->num_cpus); qdev_prop_set_array(gicdev, "redist-region-count", redist_region_count); if (!sysbus_realize(gicbusdev, errp)) { return false; } sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); for (i = 0; i < sc->num_cpus; i++) { DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; const int timer_irq[] = { [GTIMER_PHYS] = 14, [GTIMER_VIRT] = 11, [GTIMER_HYP] = 10, [GTIMER_SEC] = 13, }; int j; for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { qdev_connect_gpio_out(cpudev, j, qdev_get_gpio_in(gicdev, ppibase + timer_irq[j])); } qemu_irq irq = qdev_get_gpio_in(gicdev, ppibase + ARCH_GIC_MAINT_IRQ); qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", 0, irq); qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, qdev_get_gpio_in(gicdev, ppibase + VIRTUAL_PMU_IRQ)); sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); sysbus_connect_irq(gicbusdev, i + sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); } return true; } struct Aspeed27x0SoCState { AspeedSoCState parent; ARMCPU cpu[ASPEED_CPUS_NUM]; AspeedINTCState intc; GICv3State gic; }; #define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > > > + sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > > + sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); > > + > > + for (i = 0; i < sc->num_cpus; i++) { > > + DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > > + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, > VIRTUAL_PMU_IRQ = 7; > > + int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > > + > > + const int timer_irq[] = { > > + [GTIMER_PHYS] = 14, > > + [GTIMER_VIRT] = 11, > > + [GTIMER_HYP] = 10, > > + [GTIMER_SEC] = 13, > > + }; > > + int j; > > + > > + for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > > + qdev_connect_gpio_out(cpudev, j, > > + qdev_get_gpio_in(a->intc.gic, ppibase + > timer_irq[j])); > > + } > > + > > + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, > > + ppibase + > ARCH_GIC_MAINT_IRQ); > > + qdev_connect_gpio_out_named(cpudev, > "gicv3-maintenance-interrupt", > > + 0, irq); > > + qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > > + qdev_get_gpio_in(a->intc.gic, ppibase + > > + VIRTUAL_PMU_IRQ)); > > + > > + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, > ARM_CPU_IRQ)); > > + sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_FIQ)); > > + sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_VIRQ)); > > + sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_VFIQ)); > > + } > > + > > + return true; > > +} > > + > > +static void aspeed_soc_ast2700_realize(DeviceState *dev, Error > > +**errp) { > > + int i; > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > > + AspeedSoCState *s = ASPEED_SOC(dev); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + g_autofree char *sram_name = NULL; > > + uint32_t num_ints; > > + > > + /* Default boot region (SPI memory or ROMs) */ > > + memory_region_init(&s->spi_boot_container, OBJECT(s), > > + "aspeed.spi_boot_container", 0x400000000); > > + memory_region_add_subregion(s->memory, > sc->memmap[ASPEED_DEV_SPI_BOOT], > > + &s->spi_boot_container); > > + > > + /* CPU */ > > + for (i = 0; i < sc->num_cpus; i++) { > > + object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", > > + aspeed_calc_affinity(i), > > + &error_abort); > > + > > + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq", > 1125000000, > > + &error_abort); > > + object_property_set_link(OBJECT(&a->cpu[i]), "memory", > > + OBJECT(s->memory), > &error_abort); > > + > > + if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) { > > + return; > > + } > > + } > > + > > + /* GIC */ > > + if (!aspeed_soc_ast2700_gic(dev, errp)) { > > + return; > > + } > > + > > + /* INTC */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) { > > + return; > > + } > > + > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, > > + sc->memmap[ASPEED_DEV_INTC]); > > + > > + /* GICINT orgates -> INTC -> GIC */ > > + num_ints = object_property_get_int(OBJECT(&a->intc), "num-ints", > > + &error_abort); > > + for (i = 0; i < num_ints; i++) { > > + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, > > + qdev_get_gpio_in(DEVICE(&a->intc), > i)); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, > > + qdev_get_gpio_in(a->intc.gic, > > + > aspeed_soc_ast2700_gic_intcmap[i].irq)); > > + } > > + > > + /* SRAM */ > > + sram_name = g_strdup_printf("aspeed.sram.%d", > CPU(&a->cpu[0])->cpu_index); > > + if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, > sc->sram_size, > > + errp)) { > > + return; > > + } > > + memory_region_add_subregion(s->memory, > > + sc->memmap[ASPEED_DEV_SRAM], > > + &s->sram); > > + > > + /* SCU */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, > > + sc->memmap[ASPEED_DEV_SCU]); > > + > > + /* SCU1 */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scuio), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scuio), 0, > > + sc->memmap[ASPEED_DEV_SCUIO]); > > + > > + /* UART */ > > + if (!aspeed_soc_uart_realize(s, errp)) { > > + return; > > + } > > + > > + /* FMC, The number of CS is set at the board level */ > > + object_property_set_int(OBJECT(&s->fmc), "dram-base", > > + sc->memmap[ASPEED_DEV_SDRAM], > > + &error_abort); > > + object_property_set_link(OBJECT(&s->fmc), "dram", > OBJECT(s->dram_mr), > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, > sc->memmap[ASPEED_DEV_FMC]); > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, > > + > ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, > > + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); > > + > > + /* Set up an alias on the FMC CE0 region (boot default) */ > > + MemoryRegion *fmc0_mmio = &s->fmc.flashes[0].mmio; > > + memory_region_init_alias(&s->spi_boot, OBJECT(s), > "aspeed.spi_boot", > > + fmc0_mmio, 0, > memory_region_size(fmc0_mmio)); > > + memory_region_add_subregion(&s->spi_boot_container, 0x0, > > + &s->spi_boot); > > + > > + /* SPI */ > > + for (i = 0; i < sc->spis_num; i++) { > > + object_property_set_link(OBJECT(&s->spi[i]), "dram", > > + OBJECT(s->dram_mr), > &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0, > > + sc->memmap[ASPEED_DEV_SPI0 + i]); > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, > > + > ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); > > + } > > + > > + /* > > + * SDMC - SDRAM Memory Controller > > + * The SDMC controller is unlocked at SPL stage. > > + * At present, only supports to emulate booting > > + * start from u-boot stage. Set SDMC controller > > + * unlocked by default. It is a temporarily solution. > > + */ > > + object_property_set_bool(OBJECT(&s->sdmc), "unlocked", true, > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sdmc), 0, > > + sc->memmap[ASPEED_DEV_SDMC]); > > + > > + /* RAM */ > > + if (!aspeed_soc_dram_init(s, errp)) { > > + return; > > + } > > + > > + for (i = 0; i < sc->macs_num; i++) { > > + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed", > true, > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > > + sc->memmap[ASPEED_DEV_ETH1 + i]); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > > + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 > + > > + i)); > > + > > + object_property_set_link(OBJECT(&s->mii[i]), "nic", > > + OBJECT(&s->ftgmac100[i]), > &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mii[i]), errp)) { > > + return; > > + } > > + > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0, > > + sc->memmap[ASPEED_DEV_MII1 + i]); > > + } > > + > > + /* Watch dog */ > > + for (i = 0; i < sc->wdts_num; i++) { > > + AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]); > > + hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * > > + awc->iosize; > > + > > + object_property_set_link(OBJECT(&s->wdt[i]), "scu", > OBJECT(&s->scu), > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, > wdt_offset); > > + } > > + > > + /* SLI */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sli), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sli), 0, > > + sc->memmap[ASPEED_DEV_SLI]); > > + > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sliio), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sliio), 0, > > + sc->memmap[ASPEED_DEV_SLIIO]); > > + > > + create_unimplemented_device("ast2700.dpmcu", 0x11000000, > 0x40000); > > + create_unimplemented_device("ast2700.iomem0", 0x12000000, > 0x01000000); > > + create_unimplemented_device("ast2700.iomem1", 0x14000000, > 0x01000000); > > + create_unimplemented_device("ast2700.ltpi", 0x30000000, > 0x1000000); > > + create_unimplemented_device("ast2700.io", 0x0, 0x4000000); } > > + > > +static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void > > +*data) { > > + static const char * const valid_cpu_types[] = { > > + ARM_CPU_TYPE_NAME("cortex-a35"), > > + NULL > > + }; > > + DeviceClass *dc = DEVICE_CLASS(oc); > > + AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); > > + > > + /* Reason: The Aspeed SoC can only be instantiated from a board */ > > + dc->user_creatable = false; > > + dc->realize = aspeed_soc_ast2700_realize; > > + > > + sc->name = "ast2700-a0"; > > + sc->valid_cpu_types = valid_cpu_types; > > + sc->silicon_rev = AST2700_A0_SILICON_REV; > > + sc->sram_size = 0x20000; > > + sc->spis_num = 3; > > + sc->wdts_num = 8; > > + sc->macs_num = 1; > > + sc->uarts_num = 13; > > + sc->num_cpus = 4; > > + sc->uarts_base = ASPEED_DEV_UART0; > > + sc->irqmap = aspeed_soc_ast2700_irqmap; > > + sc->memmap = aspeed_soc_ast2700_memmap; > > + sc->get_irq = aspeed_soc_ast2700_get_irq; > > +} > > + > > +static const TypeInfo aspeed_soc_ast27x0_types[] = { > > + { > > + .name = TYPE_ASPEED27X0_SOC, > > + .parent = TYPE_ASPEED_SOC, > > + .instance_size = sizeof(Aspeed27x0SoCState), > > + .abstract = true, > > + }, { > > + .name = "ast2700-a0", > > + .parent = TYPE_ASPEED27X0_SOC, > > + .instance_init = aspeed_soc_ast2700_init, > > + .class_init = aspeed_soc_ast2700_class_init, > > + }, > > +}; > > + > > +DEFINE_TYPES(aspeed_soc_ast27x0_types) > > diff --git a/hw/arm/meson.build b/hw/arm/meson.build index > > 6808135c1f..1e3295a423 100644 > > --- a/hw/arm/meson.build > > +++ b/hw/arm/meson.build > > @@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: > files( > > 'aspeed_soc_common.c', > > 'aspeed_ast2400.c', > > 'aspeed_ast2600.c', > > + 'aspeed_ast27x0.c', > > 'aspeed_ast10x0.c', > > 'aspeed_eeprom.c', > > 'fby35.c')) > > Please change that to : > > arm_ss.add(when: ['CONFIG_ASPEED_SOC', 'TARGET_AARCH64'], if_true: > files('aspeed_ast27x0.c')) > > The AST2700 SoC model uses aarch64 CPUs. > > > Thanks, > > C. > Thanks review and suggestion. Wii fix it in v5 patch. Jamin > > > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h > > index c60fac900a..9f177b6037 100644 > > --- a/include/hw/arm/aspeed_soc.h > > +++ b/include/hw/arm/aspeed_soc.h > > @@ -15,6 +15,7 @@ > > #include "hw/cpu/a15mpcore.h" > > #include "hw/arm/armv7m.h" > > #include "hw/intc/aspeed_vic.h" > > +#include "hw/intc/aspeed_intc.h" > > #include "hw/misc/aspeed_scu.h" > > #include "hw/adc/aspeed_adc.h" > > #include "hw/misc/aspeed_sdmc.h" > > @@ -26,6 +27,7 @@ > > #include "hw/ssi/aspeed_smc.h" > > #include "hw/misc/aspeed_hace.h" > > #include "hw/misc/aspeed_sbc.h" > > +#include "hw/misc/aspeed_sli.h" > > #include "hw/watchdog/wdt_aspeed.h" > > #include "hw/net/ftgmac100.h" > > #include "target/arm/cpu.h" > > @@ -41,8 +43,8 @@ > > > > #define ASPEED_SPIS_NUM 2 > > #define ASPEED_EHCIS_NUM 2 > > -#define ASPEED_WDTS_NUM 4 > > -#define ASPEED_CPUS_NUM 2 > > +#define ASPEED_WDTS_NUM 8 > > +#define ASPEED_CPUS_NUM 4 > > #define ASPEED_MACS_NUM 4 > > #define ASPEED_UARTS_NUM 13 > > #define ASPEED_JTAG_NUM 2 > > @@ -61,6 +63,7 @@ struct AspeedSoCState { > > AspeedI2CState i2c; > > AspeedI3CState i3c; > > AspeedSCUState scu; > > + AspeedSCUState scuio; > > AspeedHACEState hace; > > AspeedXDMAState xdma; > > AspeedADCState adc; > > @@ -68,6 +71,8 @@ struct AspeedSoCState { > > AspeedSMCState spi[ASPEED_SPIS_NUM]; > > EHCISysBusState ehci[ASPEED_EHCIS_NUM]; > > AspeedSBCState sbc; > > + AspeedSLIState sli; > > + AspeedSLIState sliio; > > MemoryRegion secsram; > > UnimplementedDeviceState sbc_unimplemented; > > AspeedSDMCState sdmc; > > @@ -117,6 +122,16 @@ struct Aspeed2600SoCState { > > #define TYPE_ASPEED2600_SOC "aspeed2600-soc" > > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, > ASPEED2600_SOC) > > > > +struct Aspeed27x0SoCState { > > + AspeedSoCState parent; > > + > > + ARMCPU cpu[ASPEED_CPUS_NUM]; > > + AspeedINTCState intc; > > +}; > > + > > +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > > +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > > + > > struct Aspeed10x0SoCState { > > AspeedSoCState parent; > > > > @@ -168,11 +183,13 @@ enum { > > ASPEED_DEV_UART13, > > ASPEED_DEV_VUART, > > ASPEED_DEV_FMC, > > + ASPEED_DEV_SPI0, > > ASPEED_DEV_SPI1, > > ASPEED_DEV_SPI2, > > ASPEED_DEV_EHCI1, > > ASPEED_DEV_EHCI2, > > ASPEED_DEV_VIC, > > + ASPEED_DEV_INTC, > > ASPEED_DEV_SDMC, > > ASPEED_DEV_SCU, > > ASPEED_DEV_ADC, > > @@ -222,6 +239,11 @@ enum { > > ASPEED_DEV_JTAG1, > > ASPEED_DEV_FSI1, > > ASPEED_DEV_FSI2, > > + ASPEED_DEV_SCUIO, > > + ASPEED_DEV_SLI, > > + ASPEED_DEV_SLIIO, > > + ASPEED_GIC_DIST, > > + ASPEED_GIC_REDIST, > > }; > > > > qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);
Hello Jamin, > I refer to versal_create_apu_gic function, https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67 > and updated aspeed_soc_ast2700_gic as following. > If you have any concerned about the new changes, please let me know. > Thanks-Jamin > > static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) Please rename to aspeed_soc_ast2700_gic_realize() > { > Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > AspeedSoCState *s = ASPEED_SOC(dev); > AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > SysBusDevice *gicbusdev; > DeviceState *gicdev; > QList *redist_region_count; > int i; > > object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, > gicv3_class_name()); and object_initialize_child() can be called in aspeed_soc_ast2700_init(). > gicbusdev = SYS_BUS_DEVICE(&a->gic); > gicdev = DEVICE(&a->gic); > qdev_prop_set_uint32(gicdev, "revision", 3); > qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus); > qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ); > > redist_region_count = qlist_new(); > qlist_append_int(redist_region_count, sc->num_cpus); > qdev_prop_set_array(gicdev, "redist-region-count", redist_region_count); > > if (!sysbus_realize(gicbusdev, errp)) { > return false; > } > sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); > > for (i = 0; i < sc->num_cpus; i++) { > DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); Could we avoid qemu_get_cpu() and use the cpu array of the SoC instead ? > int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; > int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > > const int timer_irq[] = { > [GTIMER_PHYS] = 14, > [GTIMER_VIRT] = 11, > [GTIMER_HYP] = 10, > [GTIMER_SEC] = 13, > }; > int j; > > for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > qdev_connect_gpio_out(cpudev, j, > qdev_get_gpio_in(gicdev, ppibase + timer_irq[j])); > } > > qemu_irq irq = qdev_get_gpio_in(gicdev, > ppibase + ARCH_GIC_MAINT_IRQ); > qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", > 0, irq); > qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > qdev_get_gpio_in(gicdev, ppibase + VIRTUAL_PMU_IRQ)); > > sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); > sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); > sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); > sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); > } > > return true; > } > > struct Aspeed27x0SoCState { > AspeedSoCState parent; > > ARMCPU cpu[ASPEED_CPUS_NUM]; > AspeedINTCState intc; > GICv3State gic; > }; > > #define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) Thanks, C.
Hi Cedric, > From: Cédric Le Goater <clg@kaod.org> > Subject: Re: [PATCH v4 12/16] aspeed/soc: Add AST2700 support > > > Hello Jamin, > > I refer to versal_create_apu_gic function, > https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67 > > and updated aspeed_soc_ast2700_gic as following. > > If you have any concerned about the new changes, please let me know. > > Thanks-Jamin > > > > static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) > > Please rename to aspeed_soc_ast2700_gic_realize() Will fix in v5 patch > > > { > > Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > > AspeedSoCState *s = ASPEED_SOC(dev); > > AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > SysBusDevice *gicbusdev; > > DeviceState *gicdev; > > QList *redist_region_count; > > int i; > > > > object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, > > gicv3_class_name()); > > and object_initialize_child() can be called in aspeed_soc_ast2700_init(). Will fix in v5 patch My new changes as following, static void aspeed_soc_ast2700_init(Object *obj) { -- object_initialize_child(obj, "gic", &a->gic, gicv3_class_name()); -- } > > > gicbusdev = SYS_BUS_DEVICE(&a->gic); > > gicdev = DEVICE(&a->gic); > > qdev_prop_set_uint32(gicdev, "revision", 3); > > qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus); > > qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ); > > > > redist_region_count = qlist_new(); > > qlist_append_int(redist_region_count, sc->num_cpus); > > qdev_prop_set_array(gicdev, "redist-region-count", > redist_region_count); > > > > if (!sysbus_realize(gicbusdev, errp)) { > > return false; > > } > > sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > > sysbus_mmio_map(gicbusdev, 1, > sc->memmap[ASPEED_GIC_REDIST]); > > > > for (i = 0; i < sc->num_cpus; i++) { > > DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > > Could we avoid qemu_get_cpu() and use the cpu array of the SoC instead ? Yes, I can change it and my new changes as following. DeviceState *cpudev = DEVICE(&a->cpu[i]); Will fix in v5 patch. Thanks for review. Jamin > > > int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, > VIRTUAL_PMU_IRQ = 7; > > int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > > > > const int timer_irq[] = { > > [GTIMER_PHYS] = 14, > > [GTIMER_VIRT] = 11, > > [GTIMER_HYP] = 10, > > [GTIMER_SEC] = 13, > > }; > > int j; > > > > for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > > qdev_connect_gpio_out(cpudev, j, > > qdev_get_gpio_in(gicdev, ppibase + timer_irq[j])); > > } > > > > qemu_irq irq = qdev_get_gpio_in(gicdev, > > ppibase + > ARCH_GIC_MAINT_IRQ); > > qdev_connect_gpio_out_named(cpudev, > "gicv3-maintenance-interrupt", > > 0, irq); > > qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > > qdev_get_gpio_in(gicdev, ppibase + > VIRTUAL_PMU_IRQ)); > > > > sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, > ARM_CPU_IRQ)); > > sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > > qdev_get_gpio_in(cpudev, > ARM_CPU_FIQ)); > > sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > > qdev_get_gpio_in(cpudev, > ARM_CPU_VIRQ)); > > sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > > qdev_get_gpio_in(cpudev, > ARM_CPU_VFIQ)); > > } > > > > return true; > > } > > > > struct Aspeed27x0SoCState { > > AspeedSoCState parent; > > > > ARMCPU cpu[ASPEED_CPUS_NUM]; > > AspeedINTCState intc; > > GICv3State gic; > > }; > > > > #define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > > Thanks, > > C. > >
Hi Cedric, > From: Cédric Le Goater <clg@kaod.org> > On 5/27/24 10:02, Jamin Lin wrote: > > Initial definitions for a simple machine using an AST2700 SOC (Cortex-a35 > CPU). > > > > AST2700 SOC and its interrupt controller are too complex to handle in > > the common Aspeed SoC framework. We introduce a new ast2700 class with > > instance_init and realize handlers. > > > > AST2700 is a 64 bits quad core cpus and support 8 watchdog. > > Update maximum ASPEED_CPUS_NUM to 4 and ASPEED_WDTS_NUM to 8. > > In addition, update AspeedSocState to support scuio, sli, sliio and intc. > > > > Add TYPE_ASPEED27X0_SOC machine type. > > > > The SDMC controller is unlocked at SPL stage. > > At present, only supports to emulate booting start from u-boot stage. > > Set SDMC controller unlocked by default. > > > > In INTC, each interrupt of INT 128 to INT 136 combines 32 interrupts. > > It connect GICINT IRQ GPIO-OUTPUT pins to GIC device with irq 128 to 136. > > And, if a device irq is 128 to 136, its irq GPIO-OUTPUT pin is > > connected to GICINT or-gates instead of GIC device. > > > > Signed-off-by: Troy Lee <troy_lee@aspeedtech.com> > > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> > > --- > > hw/arm/aspeed_ast27x0.c | 563 > ++++++++++++++++++++++++++++++++++++ > > hw/arm/meson.build | 1 + > > include/hw/arm/aspeed_soc.h | 26 +- > > 3 files changed, 588 insertions(+), 2 deletions(-) > > create mode 100644 hw/arm/aspeed_ast27x0.c > > > > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c new > > file mode 100644 index 0000000000..a3a03fc1ca > > --- /dev/null > > +++ b/hw/arm/aspeed_ast27x0.c > > @@ -0,0 +1,563 @@ > > +/* > > + * ASPEED SoC 27x0 family > > + * > > + * Copyright (C) 2024 ASPEED Technology Inc. > > + * > > + * This code is licensed under the GPL version 2 or later. See > > + * the COPYING file in the top-level directory. > > + * > > + * Implementation extracted from the AST2600 and adapted for AST27x0. > > + */ > > + > > +#include "qemu/osdep.h" > > +#include "qapi/error.h" > > +#include "hw/misc/unimp.h" > > +#include "hw/arm/aspeed_soc.h" > > +#include "qemu/module.h" > > +#include "qemu/error-report.h" > > +#include "hw/i2c/aspeed_i2c.h" > > +#include "net/net.h" > > +#include "sysemu/sysemu.h" > > +#include "hw/intc/arm_gicv3.h" > > +#include "qapi/qmp/qlist.h" > > + > > +static const hwaddr aspeed_soc_ast2700_memmap[] = { > > + [ASPEED_DEV_SPI_BOOT] = 0x400000000, > > + [ASPEED_DEV_SRAM] = 0x10000000, > > + [ASPEED_DEV_SDMC] = 0x12C00000, > > + [ASPEED_DEV_SCU] = 0x12C02000, > > + [ASPEED_DEV_SCUIO] = 0x14C02000, > > + [ASPEED_DEV_UART0] = 0X14C33000, > > + [ASPEED_DEV_UART1] = 0X14C33100, > > + [ASPEED_DEV_UART2] = 0X14C33200, > > + [ASPEED_DEV_UART3] = 0X14C33300, > > + [ASPEED_DEV_UART4] = 0X12C1A000, > > + [ASPEED_DEV_UART5] = 0X14C33400, > > + [ASPEED_DEV_UART6] = 0X14C33500, > > + [ASPEED_DEV_UART7] = 0X14C33600, > > + [ASPEED_DEV_UART8] = 0X14C33700, > > + [ASPEED_DEV_UART9] = 0X14C33800, > > + [ASPEED_DEV_UART10] = 0X14C33900, > > + [ASPEED_DEV_UART11] = 0X14C33A00, > > + [ASPEED_DEV_UART12] = 0X14C33B00, > > + [ASPEED_DEV_WDT] = 0x14C37000, > > + [ASPEED_DEV_VUART] = 0X14C30000, > > + [ASPEED_DEV_FMC] = 0x14000000, > > + [ASPEED_DEV_SPI0] = 0x14010000, > > + [ASPEED_DEV_SPI1] = 0x14020000, > > + [ASPEED_DEV_SPI2] = 0x14030000, > > + [ASPEED_DEV_SDRAM] = 0x400000000, > > + [ASPEED_DEV_MII1] = 0x14040000, > > + [ASPEED_DEV_MII2] = 0x14040008, > > + [ASPEED_DEV_MII3] = 0x14040010, > > + [ASPEED_DEV_ETH1] = 0x14050000, > > + [ASPEED_DEV_ETH2] = 0x14060000, > > + [ASPEED_DEV_ETH3] = 0x14070000, > > + [ASPEED_DEV_EMMC] = 0x12090000, > > + [ASPEED_DEV_INTC] = 0x12100000, > > + [ASPEED_DEV_SLI] = 0x12C17000, > > + [ASPEED_DEV_SLIIO] = 0x14C1E000, > > + [ASPEED_GIC_DIST] = 0x12200000, > > + [ASPEED_GIC_REDIST] = 0x12280000, > > +}; > > + > > +#define AST2700_MAX_IRQ 288 > > + > > +/* Shared Peripheral Interrupt values below are offset by -32 from > > +datasheet */ static const int aspeed_soc_ast2700_irqmap[] = { > > + [ASPEED_DEV_UART0] = 132, > > + [ASPEED_DEV_UART1] = 132, > > + [ASPEED_DEV_UART2] = 132, > > + [ASPEED_DEV_UART3] = 132, > > + [ASPEED_DEV_UART4] = 8, > > + [ASPEED_DEV_UART5] = 132, > > + [ASPEED_DEV_UART6] = 132, > > + [ASPEED_DEV_UART7] = 132, > > + [ASPEED_DEV_UART8] = 132, > > + [ASPEED_DEV_UART9] = 132, > > + [ASPEED_DEV_UART10] = 132, > > + [ASPEED_DEV_UART11] = 132, > > + [ASPEED_DEV_UART12] = 132, > > + [ASPEED_DEV_FMC] = 131, > > + [ASPEED_DEV_SDMC] = 0, > > + [ASPEED_DEV_SCU] = 12, > > + [ASPEED_DEV_ADC] = 130, > > + [ASPEED_DEV_XDMA] = 5, > > + [ASPEED_DEV_EMMC] = 15, > > + [ASPEED_DEV_GPIO] = 11, > > + [ASPEED_DEV_GPIO_1_8V] = 130, > > + [ASPEED_DEV_RTC] = 13, > > + [ASPEED_DEV_TIMER1] = 16, > > + [ASPEED_DEV_TIMER2] = 17, > > + [ASPEED_DEV_TIMER3] = 18, > > + [ASPEED_DEV_TIMER4] = 19, > > + [ASPEED_DEV_TIMER5] = 20, > > + [ASPEED_DEV_TIMER6] = 21, > > + [ASPEED_DEV_TIMER7] = 22, > > + [ASPEED_DEV_TIMER8] = 23, > > + [ASPEED_DEV_WDT] = 131, > > + [ASPEED_DEV_PWM] = 131, > > + [ASPEED_DEV_LPC] = 128, > > + [ASPEED_DEV_IBT] = 128, > > + [ASPEED_DEV_I2C] = 130, > > + [ASPEED_DEV_PECI] = 133, > > + [ASPEED_DEV_ETH1] = 132, > > + [ASPEED_DEV_ETH2] = 132, > > + [ASPEED_DEV_ETH3] = 132, > > + [ASPEED_DEV_HACE] = 4, > > + [ASPEED_DEV_KCS] = 128, > > + [ASPEED_DEV_DP] = 28, > > + [ASPEED_DEV_I3C] = 131, > > +}; > > + > > +/* GICINT 128 */ > > +static const int aspeed_soc_ast2700_gic128_intcmap[] = { > > + [ASPEED_DEV_LPC] = 0, > > + [ASPEED_DEV_IBT] = 2, > > + [ASPEED_DEV_KCS] = 4, > > +}; > > + > > +/* GICINT 130 */ > > +static const int aspeed_soc_ast2700_gic130_intcmap[] = { > > + [ASPEED_DEV_I2C] = 0, > > + [ASPEED_DEV_ADC] = 16, > > + [ASPEED_DEV_GPIO_1_8V] = 18, > > +}; > > + > > +/* GICINT 131 */ > > +static const int aspeed_soc_ast2700_gic131_intcmap[] = { > > + [ASPEED_DEV_I3C] = 0, > > + [ASPEED_DEV_WDT] = 16, > > + [ASPEED_DEV_FMC] = 25, > > + [ASPEED_DEV_PWM] = 29, > > +}; > > + > > +/* GICINT 132 */ > > +static const int aspeed_soc_ast2700_gic132_intcmap[] = { > > + [ASPEED_DEV_ETH1] = 0, > > + [ASPEED_DEV_ETH2] = 1, > > + [ASPEED_DEV_ETH3] = 2, > > + [ASPEED_DEV_UART0] = 7, > > + [ASPEED_DEV_UART1] = 8, > > + [ASPEED_DEV_UART2] = 9, > > + [ASPEED_DEV_UART3] = 10, > > + [ASPEED_DEV_UART5] = 11, > > + [ASPEED_DEV_UART6] = 12, > > + [ASPEED_DEV_UART7] = 13, > > + [ASPEED_DEV_UART8] = 14, > > + [ASPEED_DEV_UART9] = 15, > > + [ASPEED_DEV_UART10] = 16, > > + [ASPEED_DEV_UART11] = 17, > > + [ASPEED_DEV_UART12] = 18, > > +}; > > + > > +/* GICINT 133 */ > > +static const int aspeed_soc_ast2700_gic133_intcmap[] = { > > + [ASPEED_DEV_PECI] = 4, > > +}; > > + > > +/* GICINT 128 ~ 136 */ > > +struct gic_intc_irq_info { > > + int irq; > > + const int *ptr; > > +}; > > + > > +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { > > + {128, aspeed_soc_ast2700_gic128_intcmap}, > > + {129, NULL}, > > + {130, aspeed_soc_ast2700_gic130_intcmap}, > > + {131, aspeed_soc_ast2700_gic131_intcmap}, > > + {132, aspeed_soc_ast2700_gic132_intcmap}, > > + {133, aspeed_soc_ast2700_gic133_intcmap}, > > + {134, NULL}, > > + {135, NULL}, > > + {136, NULL}, > > +}; > > + > > +static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int > > +dev) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(s); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + int i; > > + > > + for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { > > + if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { > > + assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); > > + return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), > > + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); > > + } > > + } > > + > > + return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]); } > > + > > +static void aspeed_soc_ast2700_init(Object *obj) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); > > + AspeedSoCState *s = ASPEED_SOC(obj); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + int i; > > + char socname[8]; > > + char typename[64]; > > + > > + if (sscanf(sc->name, "%7s", socname) != 1) { > > + g_assert_not_reached(); > > + } > > + > > + for (i = 0; i < sc->num_cpus; i++) { > > + object_initialize_child(obj, "cpu[*]", &a->cpu[i], > > + aspeed_soc_cpu_type(sc)); > > + } > > + > > + object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); > > + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", > > + sc->silicon_rev); > > + object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), > > + "hw-strap1"); > > + object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), > > + "hw-strap2"); > > + object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), > > + "hw-prot-key"); > > + > > + object_initialize_child(obj, "scuio", &s->scuio, > TYPE_ASPEED_2700_SCUIO); > > + qdev_prop_set_uint32(DEVICE(&s->scuio), "silicon-rev", > > + sc->silicon_rev); > > + > > + snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); > > + object_initialize_child(obj, "fmc", &s->fmc, typename); > > + > > + for (i = 0; i < sc->spis_num; i++) { > > + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i, > socname); > > + object_initialize_child(obj, "spi[*]", &s->spi[i], typename); > > + } > > + > > + snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname); > > + object_initialize_child(obj, "sdmc", &s->sdmc, typename); > > + object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), > > + "ram-size"); > > + > > + for (i = 0; i < sc->wdts_num; i++) { > > + snprintf(typename, sizeof(typename), "aspeed.wdt-%s", > socname); > > + object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename); > > + } > > + > > + for (i = 0; i < sc->macs_num; i++) { > > + object_initialize_child(obj, "ftgmac100[*]", &s->ftgmac100[i], > > + TYPE_FTGMAC100); > > + > > + object_initialize_child(obj, "mii[*]", &s->mii[i], > TYPE_ASPEED_MII); > > + } > > + > > + for (i = 0; i < sc->uarts_num; i++) { > > + object_initialize_child(obj, "uart[*]", &s->uart[i], > TYPE_SERIAL_MM); > > + } > > + > > + object_initialize_child(obj, "sli", &s->sli, TYPE_ASPEED_2700_SLI); > > + object_initialize_child(obj, "sliio", &s->sliio, > TYPE_ASPEED_2700_SLIIO); > > + object_initialize_child(obj, "intc", &a->intc, > > +TYPE_ASPEED_2700_INTC); } > > + > > +/* > > + * ASPEED ast2700 has 0x0 as cluster ID > > + * > > + * > > +https://developer.arm.com/documentation/100236/0100/register-descript > > +ions/aarch64-system-registers/multiprocessor-affinity-register--el1 > > + */ > > +static uint64_t aspeed_calc_affinity(int cpu) { > > + return (0x0 << ARM_AFF1_SHIFT) | cpu; } > > + > > +static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) { > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > > + AspeedSoCState *s = ASPEED_SOC(dev); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + SysBusDevice *gicbusdev; > > + QList *redist_region_count; > > + int i; > > + > > + a->intc.gic = qdev_new(gicv3_class_name()); > > + qdev_prop_set_uint32(a->intc.gic, "revision", 3); > > + qdev_prop_set_uint32(a->intc.gic, "num-cpu", sc->num_cpus); > > + qdev_prop_set_uint32(a->intc.gic, "num-irq", AST2700_MAX_IRQ); > > + > > + redist_region_count = qlist_new(); > > + qlist_append_int(redist_region_count, sc->num_cpus); > > + qdev_prop_set_array(a->intc.gic, "redist-region-count", > > + redist_region_count); > > + > > + gicbusdev = SYS_BUS_DEVICE(a->intc.gic); > > + if (!sysbus_realize(gicbusdev, errp)) { > > + return false; > > + } > > + sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); > > + sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); > > + > > + for (i = 0; i < sc->num_cpus; i++) { > > + DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > > + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, > VIRTUAL_PMU_IRQ = 7; > > + int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; > > + > > + const int timer_irq[] = { > > + [GTIMER_PHYS] = 14, > > + [GTIMER_VIRT] = 11, > > + [GTIMER_HYP] = 10, > > + [GTIMER_SEC] = 13, > > + }; > > + int j; > > + > > + for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { > > + qdev_connect_gpio_out(cpudev, j, > > + qdev_get_gpio_in(a->intc.gic, ppibase + > timer_irq[j])); > > + } > > + > > + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, > > + ppibase + > ARCH_GIC_MAINT_IRQ); > > + qdev_connect_gpio_out_named(cpudev, > "gicv3-maintenance-interrupt", > > + 0, irq); > > + qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, > > + qdev_get_gpio_in(a->intc.gic, ppibase + > > + VIRTUAL_PMU_IRQ)); > > + > > + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, > ARM_CPU_IRQ)); > > + sysbus_connect_irq(gicbusdev, i + sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_FIQ)); > > + sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_VIRQ)); > > + sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, > > + qdev_get_gpio_in(cpudev, > ARM_CPU_VFIQ)); > > + } > > + > > + return true; > > +} > > + > > +static void aspeed_soc_ast2700_realize(DeviceState *dev, Error > > +**errp) { > > + int i; > > + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); > > + AspeedSoCState *s = ASPEED_SOC(dev); > > + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); > > + g_autofree char *sram_name = NULL; > > + uint32_t num_ints; > > + > > + /* Default boot region (SPI memory or ROMs) */ > > + memory_region_init(&s->spi_boot_container, OBJECT(s), > > + "aspeed.spi_boot_container", 0x400000000); > > + memory_region_add_subregion(s->memory, > sc->memmap[ASPEED_DEV_SPI_BOOT], > > + &s->spi_boot_container); > > + > > + /* CPU */ > > + for (i = 0; i < sc->num_cpus; i++) { > > + object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", > > + aspeed_calc_affinity(i), > > + &error_abort); > > + > > + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq", > 1125000000, > > + &error_abort); > > + object_property_set_link(OBJECT(&a->cpu[i]), "memory", > > + OBJECT(s->memory), > &error_abort); > > + > > + if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) { > > + return; > > + } > > + } > > + > > + /* GIC */ > > + if (!aspeed_soc_ast2700_gic(dev, errp)) { > > + return; > > + } > > + > > + /* INTC */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) { > > + return; > > + } > > + > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, > > + sc->memmap[ASPEED_DEV_INTC]); > > + > > + /* GICINT orgates -> INTC -> GIC */ > > + num_ints = object_property_get_int(OBJECT(&a->intc), "num-ints", > > + &error_abort); > > Please use the num_ints value from the AspeedINTCClass instead. Will fix it in v5 patch. Thanks-Jamin > > > Thanks, > > C. > > > > > + for (i = 0; i < num_ints; i++) { > > + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, > > + qdev_get_gpio_in(DEVICE(&a->intc), > i)); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, > > + qdev_get_gpio_in(a->intc.gic, > > + > aspeed_soc_ast2700_gic_intcmap[i].irq)); > > + } > > + > > + /* SRAM */ > > + sram_name = g_strdup_printf("aspeed.sram.%d", > CPU(&a->cpu[0])->cpu_index); > > + if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, > sc->sram_size, > > + errp)) { > > + return; > > + } > > + memory_region_add_subregion(s->memory, > > + sc->memmap[ASPEED_DEV_SRAM], > > + &s->sram); > > + > > + /* SCU */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, > > + sc->memmap[ASPEED_DEV_SCU]); > > + > > + /* SCU1 */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scuio), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scuio), 0, > > + sc->memmap[ASPEED_DEV_SCUIO]); > > + > > + /* UART */ > > + if (!aspeed_soc_uart_realize(s, errp)) { > > + return; > > + } > > + > > + /* FMC, The number of CS is set at the board level */ > > + object_property_set_int(OBJECT(&s->fmc), "dram-base", > > + sc->memmap[ASPEED_DEV_SDRAM], > > + &error_abort); > > + object_property_set_link(OBJECT(&s->fmc), "dram", > OBJECT(s->dram_mr), > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, > sc->memmap[ASPEED_DEV_FMC]); > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, > > + > ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, > > + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); > > + > > + /* Set up an alias on the FMC CE0 region (boot default) */ > > + MemoryRegion *fmc0_mmio = &s->fmc.flashes[0].mmio; > > + memory_region_init_alias(&s->spi_boot, OBJECT(s), > "aspeed.spi_boot", > > + fmc0_mmio, 0, > memory_region_size(fmc0_mmio)); > > + memory_region_add_subregion(&s->spi_boot_container, 0x0, > > + &s->spi_boot); > > + > > + /* SPI */ > > + for (i = 0; i < sc->spis_num; i++) { > > + object_property_set_link(OBJECT(&s->spi[i]), "dram", > > + OBJECT(s->dram_mr), > &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0, > > + sc->memmap[ASPEED_DEV_SPI0 + i]); > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, > > + > ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); > > + } > > + > > + /* > > + * SDMC - SDRAM Memory Controller > > + * The SDMC controller is unlocked at SPL stage. > > + * At present, only supports to emulate booting > > + * start from u-boot stage. Set SDMC controller > > + * unlocked by default. It is a temporarily solution. > > + */ > > + object_property_set_bool(OBJECT(&s->sdmc), "unlocked", true, > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sdmc), 0, > > + sc->memmap[ASPEED_DEV_SDMC]); > > + > > + /* RAM */ > > + if (!aspeed_soc_dram_init(s, errp)) { > > + return; > > + } > > + > > + for (i = 0; i < sc->macs_num; i++) { > > + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed", > true, > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > > + sc->memmap[ASPEED_DEV_ETH1 + i]); > > + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, > > + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 > + > > + i)); > > + > > + object_property_set_link(OBJECT(&s->mii[i]), "nic", > > + OBJECT(&s->ftgmac100[i]), > &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mii[i]), errp)) { > > + return; > > + } > > + > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0, > > + sc->memmap[ASPEED_DEV_MII1 + i]); > > + } > > + > > + /* Watch dog */ > > + for (i = 0; i < sc->wdts_num; i++) { > > + AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]); > > + hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * > > + awc->iosize; > > + > > + object_property_set_link(OBJECT(&s->wdt[i]), "scu", > OBJECT(&s->scu), > > + &error_abort); > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, > wdt_offset); > > + } > > + > > + /* SLI */ > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sli), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sli), 0, > > + sc->memmap[ASPEED_DEV_SLI]); > > + > > + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sliio), errp)) { > > + return; > > + } > > + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sliio), 0, > > + sc->memmap[ASPEED_DEV_SLIIO]); > > + > > + create_unimplemented_device("ast2700.dpmcu", 0x11000000, > 0x40000); > > + create_unimplemented_device("ast2700.iomem0", 0x12000000, > 0x01000000); > > + create_unimplemented_device("ast2700.iomem1", 0x14000000, > 0x01000000); > > + create_unimplemented_device("ast2700.ltpi", 0x30000000, > 0x1000000); > > + create_unimplemented_device("ast2700.io", 0x0, 0x4000000); } > > + > > +static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void > > +*data) { > > + static const char * const valid_cpu_types[] = { > > + ARM_CPU_TYPE_NAME("cortex-a35"), > > + NULL > > + }; > > + DeviceClass *dc = DEVICE_CLASS(oc); > > + AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); > > + > > + /* Reason: The Aspeed SoC can only be instantiated from a board */ > > + dc->user_creatable = false; > > + dc->realize = aspeed_soc_ast2700_realize; > > + > > + sc->name = "ast2700-a0"; > > + sc->valid_cpu_types = valid_cpu_types; > > + sc->silicon_rev = AST2700_A0_SILICON_REV; > > + sc->sram_size = 0x20000; > > + sc->spis_num = 3; > > + sc->wdts_num = 8; > > + sc->macs_num = 1; > > + sc->uarts_num = 13; > > + sc->num_cpus = 4; > > + sc->uarts_base = ASPEED_DEV_UART0; > > + sc->irqmap = aspeed_soc_ast2700_irqmap; > > + sc->memmap = aspeed_soc_ast2700_memmap; > > + sc->get_irq = aspeed_soc_ast2700_get_irq; > > +} > > + > > +static const TypeInfo aspeed_soc_ast27x0_types[] = { > > + { > > + .name = TYPE_ASPEED27X0_SOC, > > + .parent = TYPE_ASPEED_SOC, > > + .instance_size = sizeof(Aspeed27x0SoCState), > > + .abstract = true, > > + }, { > > + .name = "ast2700-a0", > > + .parent = TYPE_ASPEED27X0_SOC, > > + .instance_init = aspeed_soc_ast2700_init, > > + .class_init = aspeed_soc_ast2700_class_init, > > + }, > > +}; > > + > > +DEFINE_TYPES(aspeed_soc_ast27x0_types) > > diff --git a/hw/arm/meson.build b/hw/arm/meson.build index > > 6808135c1f..1e3295a423 100644 > > --- a/hw/arm/meson.build > > +++ b/hw/arm/meson.build > > @@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: > files( > > 'aspeed_soc_common.c', > > 'aspeed_ast2400.c', > > 'aspeed_ast2600.c', > > + 'aspeed_ast27x0.c', > > 'aspeed_ast10x0.c', > > 'aspeed_eeprom.c', > > 'fby35.c')) > > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h > > index c60fac900a..9f177b6037 100644 > > --- a/include/hw/arm/aspeed_soc.h > > +++ b/include/hw/arm/aspeed_soc.h > > @@ -15,6 +15,7 @@ > > #include "hw/cpu/a15mpcore.h" > > #include "hw/arm/armv7m.h" > > #include "hw/intc/aspeed_vic.h" > > +#include "hw/intc/aspeed_intc.h" > > #include "hw/misc/aspeed_scu.h" > > #include "hw/adc/aspeed_adc.h" > > #include "hw/misc/aspeed_sdmc.h" > > @@ -26,6 +27,7 @@ > > #include "hw/ssi/aspeed_smc.h" > > #include "hw/misc/aspeed_hace.h" > > #include "hw/misc/aspeed_sbc.h" > > +#include "hw/misc/aspeed_sli.h" > > #include "hw/watchdog/wdt_aspeed.h" > > #include "hw/net/ftgmac100.h" > > #include "target/arm/cpu.h" > > @@ -41,8 +43,8 @@ > > > > #define ASPEED_SPIS_NUM 2 > > #define ASPEED_EHCIS_NUM 2 > > -#define ASPEED_WDTS_NUM 4 > > -#define ASPEED_CPUS_NUM 2 > > +#define ASPEED_WDTS_NUM 8 > > +#define ASPEED_CPUS_NUM 4 > > #define ASPEED_MACS_NUM 4 > > #define ASPEED_UARTS_NUM 13 > > #define ASPEED_JTAG_NUM 2 > > @@ -61,6 +63,7 @@ struct AspeedSoCState { > > AspeedI2CState i2c; > > AspeedI3CState i3c; > > AspeedSCUState scu; > > + AspeedSCUState scuio; > > AspeedHACEState hace; > > AspeedXDMAState xdma; > > AspeedADCState adc; > > @@ -68,6 +71,8 @@ struct AspeedSoCState { > > AspeedSMCState spi[ASPEED_SPIS_NUM]; > > EHCISysBusState ehci[ASPEED_EHCIS_NUM]; > > AspeedSBCState sbc; > > + AspeedSLIState sli; > > + AspeedSLIState sliio; > > MemoryRegion secsram; > > UnimplementedDeviceState sbc_unimplemented; > > AspeedSDMCState sdmc; > > @@ -117,6 +122,16 @@ struct Aspeed2600SoCState { > > #define TYPE_ASPEED2600_SOC "aspeed2600-soc" > > OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, > ASPEED2600_SOC) > > > > +struct Aspeed27x0SoCState { > > + AspeedSoCState parent; > > + > > + ARMCPU cpu[ASPEED_CPUS_NUM]; > > + AspeedINTCState intc; > > +}; > > + > > +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" > > +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) > > + > > struct Aspeed10x0SoCState { > > AspeedSoCState parent; > > > > @@ -168,11 +183,13 @@ enum { > > ASPEED_DEV_UART13, > > ASPEED_DEV_VUART, > > ASPEED_DEV_FMC, > > + ASPEED_DEV_SPI0, > > ASPEED_DEV_SPI1, > > ASPEED_DEV_SPI2, > > ASPEED_DEV_EHCI1, > > ASPEED_DEV_EHCI2, > > ASPEED_DEV_VIC, > > + ASPEED_DEV_INTC, > > ASPEED_DEV_SDMC, > > ASPEED_DEV_SCU, > > ASPEED_DEV_ADC, > > @@ -222,6 +239,11 @@ enum { > > ASPEED_DEV_JTAG1, > > ASPEED_DEV_FSI1, > > ASPEED_DEV_FSI2, > > + ASPEED_DEV_SCUIO, > > + ASPEED_DEV_SLI, > > + ASPEED_DEV_SLIIO, > > + ASPEED_GIC_DIST, > > + ASPEED_GIC_REDIST, > > }; > > > > qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);
On 31/5/24 09:46, Cédric Le Goater wrote: > > Hello Jamin, >> I refer to versal_create_apu_gic function, >> https://github.com/qemu/qemu/blob/master/hw/arm/xlnx-versal.c#L67 >> and updated aspeed_soc_ast2700_gic as following. >> If you have any concerned about the new changes, please let me know. >> Thanks-Jamin >> >> static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) > > Please rename to aspeed_soc_ast2700_gic_realize() > >> { >> Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); >> AspeedSoCState *s = ASPEED_SOC(dev); >> AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); >> SysBusDevice *gicbusdev; >> DeviceState *gicdev; >> QList *redist_region_count; >> int i; >> >> object_initialize_child(OBJECT(a), "ast2700-gic", &a->gic, >> gicv3_class_name()); > > and object_initialize_child() can be called in aspeed_soc_ast2700_init(). > >> gicbusdev = SYS_BUS_DEVICE(&a->gic); >> gicdev = DEVICE(&a->gic); >> qdev_prop_set_uint32(gicdev, "revision", 3); >> qdev_prop_set_uint32(gicdev, "num-cpu", sc->num_cpus); >> qdev_prop_set_uint32(gicdev, "num-irq", AST2700_MAX_IRQ); >> >> redist_region_count = qlist_new(); >> qlist_append_int(redist_region_count, sc->num_cpus); >> qdev_prop_set_array(gicdev, "redist-region-count", >> redist_region_count); >> >> if (!sysbus_realize(gicbusdev, errp)) { >> return false; >> } >> sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); >> sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); >> >> for (i = 0; i < sc->num_cpus; i++) { >> DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); > > Could we avoid qemu_get_cpu() and use the cpu array of the SoC instead ? If it is too invasive, I might take care of it later when respinning https://lore.kernel.org/qemu-devel/20231212162935.42910-1-philmd@linaro.org
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c new file mode 100644 index 0000000000..a3a03fc1ca --- /dev/null +++ b/hw/arm/aspeed_ast27x0.c @@ -0,0 +1,563 @@ +/* + * ASPEED SoC 27x0 family + * + * Copyright (C) 2024 ASPEED Technology Inc. + * + * This code is licensed under the GPL version 2 or later. See + * the COPYING file in the top-level directory. + * + * Implementation extracted from the AST2600 and adapted for AST27x0. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" +#include "qemu/module.h" +#include "qemu/error-report.h" +#include "hw/i2c/aspeed_i2c.h" +#include "net/net.h" +#include "sysemu/sysemu.h" +#include "hw/intc/arm_gicv3.h" +#include "qapi/qmp/qlist.h" + +static const hwaddr aspeed_soc_ast2700_memmap[] = { + [ASPEED_DEV_SPI_BOOT] = 0x400000000, + [ASPEED_DEV_SRAM] = 0x10000000, + [ASPEED_DEV_SDMC] = 0x12C00000, + [ASPEED_DEV_SCU] = 0x12C02000, + [ASPEED_DEV_SCUIO] = 0x14C02000, + [ASPEED_DEV_UART0] = 0X14C33000, + [ASPEED_DEV_UART1] = 0X14C33100, + [ASPEED_DEV_UART2] = 0X14C33200, + [ASPEED_DEV_UART3] = 0X14C33300, + [ASPEED_DEV_UART4] = 0X12C1A000, + [ASPEED_DEV_UART5] = 0X14C33400, + [ASPEED_DEV_UART6] = 0X14C33500, + [ASPEED_DEV_UART7] = 0X14C33600, + [ASPEED_DEV_UART8] = 0X14C33700, + [ASPEED_DEV_UART9] = 0X14C33800, + [ASPEED_DEV_UART10] = 0X14C33900, + [ASPEED_DEV_UART11] = 0X14C33A00, + [ASPEED_DEV_UART12] = 0X14C33B00, + [ASPEED_DEV_WDT] = 0x14C37000, + [ASPEED_DEV_VUART] = 0X14C30000, + [ASPEED_DEV_FMC] = 0x14000000, + [ASPEED_DEV_SPI0] = 0x14010000, + [ASPEED_DEV_SPI1] = 0x14020000, + [ASPEED_DEV_SPI2] = 0x14030000, + [ASPEED_DEV_SDRAM] = 0x400000000, + [ASPEED_DEV_MII1] = 0x14040000, + [ASPEED_DEV_MII2] = 0x14040008, + [ASPEED_DEV_MII3] = 0x14040010, + [ASPEED_DEV_ETH1] = 0x14050000, + [ASPEED_DEV_ETH2] = 0x14060000, + [ASPEED_DEV_ETH3] = 0x14070000, + [ASPEED_DEV_EMMC] = 0x12090000, + [ASPEED_DEV_INTC] = 0x12100000, + [ASPEED_DEV_SLI] = 0x12C17000, + [ASPEED_DEV_SLIIO] = 0x14C1E000, + [ASPEED_GIC_DIST] = 0x12200000, + [ASPEED_GIC_REDIST] = 0x12280000, +}; + +#define AST2700_MAX_IRQ 288 + +/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ +static const int aspeed_soc_ast2700_irqmap[] = { + [ASPEED_DEV_UART0] = 132, + [ASPEED_DEV_UART1] = 132, + [ASPEED_DEV_UART2] = 132, + [ASPEED_DEV_UART3] = 132, + [ASPEED_DEV_UART4] = 8, + [ASPEED_DEV_UART5] = 132, + [ASPEED_DEV_UART6] = 132, + [ASPEED_DEV_UART7] = 132, + [ASPEED_DEV_UART8] = 132, + [ASPEED_DEV_UART9] = 132, + [ASPEED_DEV_UART10] = 132, + [ASPEED_DEV_UART11] = 132, + [ASPEED_DEV_UART12] = 132, + [ASPEED_DEV_FMC] = 131, + [ASPEED_DEV_SDMC] = 0, + [ASPEED_DEV_SCU] = 12, + [ASPEED_DEV_ADC] = 130, + [ASPEED_DEV_XDMA] = 5, + [ASPEED_DEV_EMMC] = 15, + [ASPEED_DEV_GPIO] = 11, + [ASPEED_DEV_GPIO_1_8V] = 130, + [ASPEED_DEV_RTC] = 13, + [ASPEED_DEV_TIMER1] = 16, + [ASPEED_DEV_TIMER2] = 17, + [ASPEED_DEV_TIMER3] = 18, + [ASPEED_DEV_TIMER4] = 19, + [ASPEED_DEV_TIMER5] = 20, + [ASPEED_DEV_TIMER6] = 21, + [ASPEED_DEV_TIMER7] = 22, + [ASPEED_DEV_TIMER8] = 23, + [ASPEED_DEV_WDT] = 131, + [ASPEED_DEV_PWM] = 131, + [ASPEED_DEV_LPC] = 128, + [ASPEED_DEV_IBT] = 128, + [ASPEED_DEV_I2C] = 130, + [ASPEED_DEV_PECI] = 133, + [ASPEED_DEV_ETH1] = 132, + [ASPEED_DEV_ETH2] = 132, + [ASPEED_DEV_ETH3] = 132, + [ASPEED_DEV_HACE] = 4, + [ASPEED_DEV_KCS] = 128, + [ASPEED_DEV_DP] = 28, + [ASPEED_DEV_I3C] = 131, +}; + +/* GICINT 128 */ +static const int aspeed_soc_ast2700_gic128_intcmap[] = { + [ASPEED_DEV_LPC] = 0, + [ASPEED_DEV_IBT] = 2, + [ASPEED_DEV_KCS] = 4, +}; + +/* GICINT 130 */ +static const int aspeed_soc_ast2700_gic130_intcmap[] = { + [ASPEED_DEV_I2C] = 0, + [ASPEED_DEV_ADC] = 16, + [ASPEED_DEV_GPIO_1_8V] = 18, +}; + +/* GICINT 131 */ +static const int aspeed_soc_ast2700_gic131_intcmap[] = { + [ASPEED_DEV_I3C] = 0, + [ASPEED_DEV_WDT] = 16, + [ASPEED_DEV_FMC] = 25, + [ASPEED_DEV_PWM] = 29, +}; + +/* GICINT 132 */ +static const int aspeed_soc_ast2700_gic132_intcmap[] = { + [ASPEED_DEV_ETH1] = 0, + [ASPEED_DEV_ETH2] = 1, + [ASPEED_DEV_ETH3] = 2, + [ASPEED_DEV_UART0] = 7, + [ASPEED_DEV_UART1] = 8, + [ASPEED_DEV_UART2] = 9, + [ASPEED_DEV_UART3] = 10, + [ASPEED_DEV_UART5] = 11, + [ASPEED_DEV_UART6] = 12, + [ASPEED_DEV_UART7] = 13, + [ASPEED_DEV_UART8] = 14, + [ASPEED_DEV_UART9] = 15, + [ASPEED_DEV_UART10] = 16, + [ASPEED_DEV_UART11] = 17, + [ASPEED_DEV_UART12] = 18, +}; + +/* GICINT 133 */ +static const int aspeed_soc_ast2700_gic133_intcmap[] = { + [ASPEED_DEV_PECI] = 4, +}; + +/* GICINT 128 ~ 136 */ +struct gic_intc_irq_info { + int irq; + const int *ptr; +}; + +static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { + {128, aspeed_soc_ast2700_gic128_intcmap}, + {129, NULL}, + {130, aspeed_soc_ast2700_gic130_intcmap}, + {131, aspeed_soc_ast2700_gic131_intcmap}, + {132, aspeed_soc_ast2700_gic132_intcmap}, + {133, aspeed_soc_ast2700_gic133_intcmap}, + {134, NULL}, + {135, NULL}, + {136, NULL}, +}; + +static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev) +{ + Aspeed27x0SoCState *a = ASPEED27X0_SOC(s); + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); + int i; + + for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { + if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { + assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); + return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), + aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); + } + } + + return qdev_get_gpio_in(a->intc.gic, sc->irqmap[dev]); +} + +static void aspeed_soc_ast2700_init(Object *obj) +{ + Aspeed27x0SoCState *a = ASPEED27X0_SOC(obj); + AspeedSoCState *s = ASPEED_SOC(obj); + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); + int i; + char socname[8]; + char typename[64]; + + if (sscanf(sc->name, "%7s", socname) != 1) { + g_assert_not_reached(); + } + + for (i = 0; i < sc->num_cpus; i++) { + object_initialize_child(obj, "cpu[*]", &a->cpu[i], + aspeed_soc_cpu_type(sc)); + } + + object_initialize_child(obj, "scu", &s->scu, TYPE_ASPEED_2700_SCU); + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", + sc->silicon_rev); + object_property_add_alias(obj, "hw-strap1", OBJECT(&s->scu), + "hw-strap1"); + object_property_add_alias(obj, "hw-strap2", OBJECT(&s->scu), + "hw-strap2"); + object_property_add_alias(obj, "hw-prot-key", OBJECT(&s->scu), + "hw-prot-key"); + + object_initialize_child(obj, "scuio", &s->scuio, TYPE_ASPEED_2700_SCUIO); + qdev_prop_set_uint32(DEVICE(&s->scuio), "silicon-rev", + sc->silicon_rev); + + snprintf(typename, sizeof(typename), "aspeed.fmc-%s", socname); + object_initialize_child(obj, "fmc", &s->fmc, typename); + + for (i = 0; i < sc->spis_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.spi%d-%s", i, socname); + object_initialize_child(obj, "spi[*]", &s->spi[i], typename); + } + + snprintf(typename, sizeof(typename), "aspeed.sdmc-%s", socname); + object_initialize_child(obj, "sdmc", &s->sdmc, typename); + object_property_add_alias(obj, "ram-size", OBJECT(&s->sdmc), + "ram-size"); + + for (i = 0; i < sc->wdts_num; i++) { + snprintf(typename, sizeof(typename), "aspeed.wdt-%s", socname); + object_initialize_child(obj, "wdt[*]", &s->wdt[i], typename); + } + + for (i = 0; i < sc->macs_num; i++) { + object_initialize_child(obj, "ftgmac100[*]", &s->ftgmac100[i], + TYPE_FTGMAC100); + + object_initialize_child(obj, "mii[*]", &s->mii[i], TYPE_ASPEED_MII); + } + + for (i = 0; i < sc->uarts_num; i++) { + object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_MM); + } + + object_initialize_child(obj, "sli", &s->sli, TYPE_ASPEED_2700_SLI); + object_initialize_child(obj, "sliio", &s->sliio, TYPE_ASPEED_2700_SLIIO); + object_initialize_child(obj, "intc", &a->intc, TYPE_ASPEED_2700_INTC); +} + +/* + * ASPEED ast2700 has 0x0 as cluster ID + * + * https://developer.arm.com/documentation/100236/0100/register-descriptions/aarch64-system-registers/multiprocessor-affinity-register--el1 + */ +static uint64_t aspeed_calc_affinity(int cpu) +{ + return (0x0 << ARM_AFF1_SHIFT) | cpu; +} + +static bool aspeed_soc_ast2700_gic(DeviceState *dev, Error **errp) +{ + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); + AspeedSoCState *s = ASPEED_SOC(dev); + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); + SysBusDevice *gicbusdev; + QList *redist_region_count; + int i; + + a->intc.gic = qdev_new(gicv3_class_name()); + qdev_prop_set_uint32(a->intc.gic, "revision", 3); + qdev_prop_set_uint32(a->intc.gic, "num-cpu", sc->num_cpus); + qdev_prop_set_uint32(a->intc.gic, "num-irq", AST2700_MAX_IRQ); + + redist_region_count = qlist_new(); + qlist_append_int(redist_region_count, sc->num_cpus); + qdev_prop_set_array(a->intc.gic, "redist-region-count", + redist_region_count); + + gicbusdev = SYS_BUS_DEVICE(a->intc.gic); + if (!sysbus_realize(gicbusdev, errp)) { + return false; + } + sysbus_mmio_map(gicbusdev, 0, sc->memmap[ASPEED_GIC_DIST]); + sysbus_mmio_map(gicbusdev, 1, sc->memmap[ASPEED_GIC_REDIST]); + + for (i = 0; i < sc->num_cpus; i++) { + DeviceState *cpudev = DEVICE(qemu_get_cpu(i)); + int NUM_IRQS = 256, ARCH_GIC_MAINT_IRQ = 9, VIRTUAL_PMU_IRQ = 7; + int ppibase = NUM_IRQS + i * GIC_INTERNAL + GIC_NR_SGIS; + + const int timer_irq[] = { + [GTIMER_PHYS] = 14, + [GTIMER_VIRT] = 11, + [GTIMER_HYP] = 10, + [GTIMER_SEC] = 13, + }; + int j; + + for (j = 0; j < ARRAY_SIZE(timer_irq); j++) { + qdev_connect_gpio_out(cpudev, j, + qdev_get_gpio_in(a->intc.gic, ppibase + timer_irq[j])); + } + + qemu_irq irq = qdev_get_gpio_in(a->intc.gic, + ppibase + ARCH_GIC_MAINT_IRQ); + qdev_connect_gpio_out_named(cpudev, "gicv3-maintenance-interrupt", + 0, irq); + qdev_connect_gpio_out_named(cpudev, "pmu-interrupt", 0, + qdev_get_gpio_in(a->intc.gic, ppibase + VIRTUAL_PMU_IRQ)); + + sysbus_connect_irq(gicbusdev, i, qdev_get_gpio_in(cpudev, ARM_CPU_IRQ)); + sysbus_connect_irq(gicbusdev, i + sc->num_cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_FIQ)); + sysbus_connect_irq(gicbusdev, i + 2 * sc->num_cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_VIRQ)); + sysbus_connect_irq(gicbusdev, i + 3 * sc->num_cpus, + qdev_get_gpio_in(cpudev, ARM_CPU_VFIQ)); + } + + return true; +} + +static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp) +{ + int i; + Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev); + AspeedSoCState *s = ASPEED_SOC(dev); + AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); + g_autofree char *sram_name = NULL; + uint32_t num_ints; + + /* Default boot region (SPI memory or ROMs) */ + memory_region_init(&s->spi_boot_container, OBJECT(s), + "aspeed.spi_boot_container", 0x400000000); + memory_region_add_subregion(s->memory, sc->memmap[ASPEED_DEV_SPI_BOOT], + &s->spi_boot_container); + + /* CPU */ + for (i = 0; i < sc->num_cpus; i++) { + object_property_set_int(OBJECT(&a->cpu[i]), "mp-affinity", + aspeed_calc_affinity(i), &error_abort); + + object_property_set_int(OBJECT(&a->cpu[i]), "cntfrq", 1125000000, + &error_abort); + object_property_set_link(OBJECT(&a->cpu[i]), "memory", + OBJECT(s->memory), &error_abort); + + if (!qdev_realize(DEVICE(&a->cpu[i]), NULL, errp)) { + return; + } + } + + /* GIC */ + if (!aspeed_soc_ast2700_gic(dev, errp)) { + return; + } + + /* INTC */ + if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) { + return; + } + + aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, + sc->memmap[ASPEED_DEV_INTC]); + + /* GICINT orgates -> INTC -> GIC */ + num_ints = object_property_get_int(OBJECT(&a->intc), "num-ints", + &error_abort); + for (i = 0; i < num_ints; i++) { + qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, + qdev_get_gpio_in(DEVICE(&a->intc), i)); + sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, + qdev_get_gpio_in(a->intc.gic, + aspeed_soc_ast2700_gic_intcmap[i].irq)); + } + + /* SRAM */ + sram_name = g_strdup_printf("aspeed.sram.%d", CPU(&a->cpu[0])->cpu_index); + if (!memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, + errp)) { + return; + } + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SRAM], &s->sram); + + /* SCU */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_SCU]); + + /* SCU1 */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scuio), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scuio), 0, + sc->memmap[ASPEED_DEV_SCUIO]); + + /* UART */ + if (!aspeed_soc_uart_realize(s, errp)) { + return; + } + + /* FMC, The number of CS is set at the board level */ + object_property_set_int(OBJECT(&s->fmc), "dram-base", + sc->memmap[ASPEED_DEV_SDRAM], + &error_abort); + object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr), + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 0, sc->memmap[ASPEED_DEV_FMC]); + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->fmc), 1, + ASPEED_SMC_GET_CLASS(&s->fmc)->flash_window_base); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->fmc), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_FMC)); + + /* Set up an alias on the FMC CE0 region (boot default) */ + MemoryRegion *fmc0_mmio = &s->fmc.flashes[0].mmio; + memory_region_init_alias(&s->spi_boot, OBJECT(s), "aspeed.spi_boot", + fmc0_mmio, 0, memory_region_size(fmc0_mmio)); + memory_region_add_subregion(&s->spi_boot_container, 0x0, &s->spi_boot); + + /* SPI */ + for (i = 0; i < sc->spis_num; i++) { + object_property_set_link(OBJECT(&s->spi[i]), "dram", + OBJECT(s->dram_mr), &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->spi[i]), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 0, + sc->memmap[ASPEED_DEV_SPI0 + i]); + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->spi[i]), 1, + ASPEED_SMC_GET_CLASS(&s->spi[i])->flash_window_base); + } + + /* + * SDMC - SDRAM Memory Controller + * The SDMC controller is unlocked at SPL stage. + * At present, only supports to emulate booting + * start from u-boot stage. Set SDMC controller + * unlocked by default. It is a temporarily solution. + */ + object_property_set_bool(OBJECT(&s->sdmc), "unlocked", true, + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sdmc), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sdmc), 0, + sc->memmap[ASPEED_DEV_SDMC]); + + /* RAM */ + if (!aspeed_soc_dram_init(s, errp)) { + return; + } + + for (i = 0; i < sc->macs_num; i++) { + object_property_set_bool(OBJECT(&s->ftgmac100[i]), "aspeed", true, + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->ftgmac100[i]), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, + sc->memmap[ASPEED_DEV_ETH1 + i]); + sysbus_connect_irq(SYS_BUS_DEVICE(&s->ftgmac100[i]), 0, + aspeed_soc_get_irq(s, ASPEED_DEV_ETH1 + i)); + + object_property_set_link(OBJECT(&s->mii[i]), "nic", + OBJECT(&s->ftgmac100[i]), &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->mii[i]), errp)) { + return; + } + + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->mii[i]), 0, + sc->memmap[ASPEED_DEV_MII1 + i]); + } + + /* Watch dog */ + for (i = 0; i < sc->wdts_num; i++) { + AspeedWDTClass *awc = ASPEED_WDT_GET_CLASS(&s->wdt[i]); + hwaddr wdt_offset = sc->memmap[ASPEED_DEV_WDT] + i * awc->iosize; + + object_property_set_link(OBJECT(&s->wdt[i]), "scu", OBJECT(&s->scu), + &error_abort); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->wdt[i]), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->wdt[i]), 0, wdt_offset); + } + + /* SLI */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sli), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sli), 0, sc->memmap[ASPEED_DEV_SLI]); + + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sliio), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->sliio), 0, + sc->memmap[ASPEED_DEV_SLIIO]); + + create_unimplemented_device("ast2700.dpmcu", 0x11000000, 0x40000); + create_unimplemented_device("ast2700.iomem0", 0x12000000, 0x01000000); + create_unimplemented_device("ast2700.iomem1", 0x14000000, 0x01000000); + create_unimplemented_device("ast2700.ltpi", 0x30000000, 0x1000000); + create_unimplemented_device("ast2700.io", 0x0, 0x4000000); +} + +static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data) +{ + static const char * const valid_cpu_types[] = { + ARM_CPU_TYPE_NAME("cortex-a35"), + NULL + }; + DeviceClass *dc = DEVICE_CLASS(oc); + AspeedSoCClass *sc = ASPEED_SOC_CLASS(oc); + + /* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable = false; + dc->realize = aspeed_soc_ast2700_realize; + + sc->name = "ast2700-a0"; + sc->valid_cpu_types = valid_cpu_types; + sc->silicon_rev = AST2700_A0_SILICON_REV; + sc->sram_size = 0x20000; + sc->spis_num = 3; + sc->wdts_num = 8; + sc->macs_num = 1; + sc->uarts_num = 13; + sc->num_cpus = 4; + sc->uarts_base = ASPEED_DEV_UART0; + sc->irqmap = aspeed_soc_ast2700_irqmap; + sc->memmap = aspeed_soc_ast2700_memmap; + sc->get_irq = aspeed_soc_ast2700_get_irq; +} + +static const TypeInfo aspeed_soc_ast27x0_types[] = { + { + .name = TYPE_ASPEED27X0_SOC, + .parent = TYPE_ASPEED_SOC, + .instance_size = sizeof(Aspeed27x0SoCState), + .abstract = true, + }, { + .name = "ast2700-a0", + .parent = TYPE_ASPEED27X0_SOC, + .instance_init = aspeed_soc_ast2700_init, + .class_init = aspeed_soc_ast2700_class_init, + }, +}; + +DEFINE_TYPES(aspeed_soc_ast27x0_types) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 6808135c1f..1e3295a423 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -46,6 +46,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c')) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index c60fac900a..9f177b6037 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -15,6 +15,7 @@ #include "hw/cpu/a15mpcore.h" #include "hw/arm/armv7m.h" #include "hw/intc/aspeed_vic.h" +#include "hw/intc/aspeed_intc.h" #include "hw/misc/aspeed_scu.h" #include "hw/adc/aspeed_adc.h" #include "hw/misc/aspeed_sdmc.h" @@ -26,6 +27,7 @@ #include "hw/ssi/aspeed_smc.h" #include "hw/misc/aspeed_hace.h" #include "hw/misc/aspeed_sbc.h" +#include "hw/misc/aspeed_sli.h" #include "hw/watchdog/wdt_aspeed.h" #include "hw/net/ftgmac100.h" #include "target/arm/cpu.h" @@ -41,8 +43,8 @@ #define ASPEED_SPIS_NUM 2 #define ASPEED_EHCIS_NUM 2 -#define ASPEED_WDTS_NUM 4 -#define ASPEED_CPUS_NUM 2 +#define ASPEED_WDTS_NUM 8 +#define ASPEED_CPUS_NUM 4 #define ASPEED_MACS_NUM 4 #define ASPEED_UARTS_NUM 13 #define ASPEED_JTAG_NUM 2 @@ -61,6 +63,7 @@ struct AspeedSoCState { AspeedI2CState i2c; AspeedI3CState i3c; AspeedSCUState scu; + AspeedSCUState scuio; AspeedHACEState hace; AspeedXDMAState xdma; AspeedADCState adc; @@ -68,6 +71,8 @@ struct AspeedSoCState { AspeedSMCState spi[ASPEED_SPIS_NUM]; EHCISysBusState ehci[ASPEED_EHCIS_NUM]; AspeedSBCState sbc; + AspeedSLIState sli; + AspeedSLIState sliio; MemoryRegion secsram; UnimplementedDeviceState sbc_unimplemented; AspeedSDMCState sdmc; @@ -117,6 +122,16 @@ struct Aspeed2600SoCState { #define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) +struct Aspeed27x0SoCState { + AspeedSoCState parent; + + ARMCPU cpu[ASPEED_CPUS_NUM]; + AspeedINTCState intc; +}; + +#define TYPE_ASPEED27X0_SOC "aspeed27x0-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0SoCState, ASPEED27X0_SOC) + struct Aspeed10x0SoCState { AspeedSoCState parent; @@ -168,11 +183,13 @@ enum { ASPEED_DEV_UART13, ASPEED_DEV_VUART, ASPEED_DEV_FMC, + ASPEED_DEV_SPI0, ASPEED_DEV_SPI1, ASPEED_DEV_SPI2, ASPEED_DEV_EHCI1, ASPEED_DEV_EHCI2, ASPEED_DEV_VIC, + ASPEED_DEV_INTC, ASPEED_DEV_SDMC, ASPEED_DEV_SCU, ASPEED_DEV_ADC, @@ -222,6 +239,11 @@ enum { ASPEED_DEV_JTAG1, ASPEED_DEV_FSI1, ASPEED_DEV_FSI2, + ASPEED_DEV_SCUIO, + ASPEED_DEV_SLI, + ASPEED_DEV_SLIIO, + ASPEED_GIC_DIST, + ASPEED_GIC_REDIST, }; qemu_irq aspeed_soc_get_irq(AspeedSoCState *s, int dev);