@samitouri / QOSamiQemu / commits / 7b9cd36bc1

hw/arm/aspeed_ast1040: Add SGPIO controller support

The AST1040 SGPIO controller is compatible with the AST2700 SGPIO controller implementation. AST1040 contains two SGPIO controllers, so reuse the existing "aspeed.sgpio-ast2700" device model instead of keeping them as unimplemented devices. MMIO mapping: - SGPIOM0 : 0x74C0C000 - SGPIOM1 : 0x74C0D000 IRQ mapping: - SGPIOM0 : IRQ 85 - SGPIOM1 : IRQ 88 Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Link: https://lore.kernel.org/qemu-devel/20260603040027.938816-7-jamin_lin@aspeedtech.com Signed-off-by: Cédric Le Goater <clg@redhat.com>

Jamin Lin committed Jun 3, 2026 at 04:00 UTC 7b9cd36bc1f4fb3569b79ca9ddfa1ed743d82f02
1 file changed +17 -12
hw/arm/aspeed_ast1040.c
+17 -12
@@ -56,6 +56,7 @@ static const int aspeed_soc_ast1040_irqmap[] = {
56 [ASPEED_DEV_ADC] = 80,
57 [ASPEED_DEV_GPIO] = 82,
58 [ASPEED_DEV_SGPIOM0] = 85,
59 + [ASPEED_DEV_SGPIOM1] = 88,
60 [ASPEED_DEV_TIMER1] = 92,
61 [ASPEED_DEV_I3C] = 96, /* 96 ~ 103 */
62 [ASPEED_DEV_WDT] = 112,
@@ -112,14 +113,14 @@ static void aspeed_soc_ast1040_init(Object *obj)
113 object_initialize_child(obj, "adc", &s->adc, TYPE_ASPEED_2700_ADC);
114 object_initialize_child(obj, "peci", &s->peci, TYPE_ASPEED_PECI);
115 object_initialize_child(obj, "gpio", &s->gpio, "aspeed.gpio-ast2700");
116 + for (i = 0; i < sc->sgpio_num; i++) {
117 + object_initialize_child(obj, "sgpio[*]", &s->sgpiom[i],
118 + "aspeed.sgpio-ast2700");
119 + }
120
121 object_initialize_child(obj, "pwm", &s->pwm, TYPE_UNIMPLEMENTED_DEVICE);
122 object_initialize_child(obj, "espi", &s->espi, TYPE_UNIMPLEMENTED_DEVICE);
123 object_initialize_child(obj, "udc", &s->udc, TYPE_UNIMPLEMENTED_DEVICE);
119 - object_initialize_child(obj, "sgpiom[0]", &s->sgpiom[0],
120 - TYPE_UNIMPLEMENTED_DEVICE);
121 - object_initialize_child(obj, "sgpiom[1]", &s->sgpiom[1],
122 - TYPE_UNIMPLEMENTED_DEVICE);
124 object_initialize_child(obj, "jtag[0]", &s->jtag[0],
125 TYPE_UNIMPLEMENTED_DEVICE);
126 object_initialize_child(obj, "jtag[1]", &s->jtag[1],
@@ -221,6 +222,17 @@ static void aspeed_soc_ast1040_realize(DeviceState *dev_soc, Error **errp)
222 sysbus_connect_irq(SYS_BUS_DEVICE(&s->gpio), 0,
223 aspeed_soc_ast1040_get_irq(s, ASPEED_DEV_GPIO));
224
225 + /* SGPIO */
226 + for (i = 0; i < sc->sgpio_num; i++) {
227 + if (!sysbus_realize(SYS_BUS_DEVICE(&s->sgpiom[i]), errp)) {
228 + return;
229 + }
230 + aspeed_mmio_map(s->memory, SYS_BUS_DEVICE(&s->sgpiom[i]), 0,
231 + sc->memmap[ASPEED_DEV_SGPIOM0 + i]);
232 + sysbus_connect_irq(SYS_BUS_DEVICE(&s->sgpiom[i]), 0,
233 + aspeed_soc_ast1040_get_irq(s, ASPEED_DEV_SGPIOM0 + i));
234 + }
235 +
236 /* Unimplemented peripherals */
237 aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->pwm),
238 "aspeed.pwm",
@@ -234,14 +246,6 @@ static void aspeed_soc_ast1040_realize(DeviceState *dev_soc, Error **errp)
246 "aspeed.udc",
247 sc->memmap[ASPEED_DEV_UDC], 0x4000);
248
237 - aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->sgpiom[0]),
238 - "aspeed.sgpiom0",
239 - sc->memmap[ASPEED_DEV_SGPIOM0], 0x1000);
240 -
241 - aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->sgpiom[1]),
242 - "aspeed.sgpiom1",
243 - sc->memmap[ASPEED_DEV_SGPIOM1], 0x1000);
244 -
249 aspeed_mmio_map_unimplemented(s->memory, SYS_BUS_DEVICE(&s->jtag[0]),
250 "aspeed.jtag0",
251 sc->memmap[ASPEED_DEV_JTAG0], 0x100);
@@ -269,6 +273,7 @@ static void aspeed_soc_ast1040_class_init(ObjectClass *klass, const void *data)
273 sc->sram_size[0] = 128 * KiB;
274 sc->sram_size[1] = 16 * MiB; /* Hyper RAM */
275 sc->uarts_num = 13;
276 + sc->sgpio_num = 2;
277 sc->uarts_base = ASPEED_DEV_UART0;
278 sc->irqmap = aspeed_soc_ast1040_irqmap;
279 sc->memmap = aspeed_soc_ast1040_memmap;