SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/arm/aspeed_ast27x0.c Support AST2700 A1 GIC Interrupt Mapping

Browse Source 
Currently, these IRQ tables support from GIC 128 - 136 for AST2700 A0.
These IRQ tables can be reused for AST2700 A1 from GIC 192 - 197.
Updates the interrupt mapping to include support for AST2700 A1 by extending
the existing mappings to the new GIC range.

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/20250307035945.3698802-20-jamin_lin@aspeedtech.com
Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
Jamin Lin 2025-03-07 11:59:28 +08:00 committed by Cédric Le Goater
parent d3b38cbbed
commit d2c8093567
1 changed files with 50 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
hw/arm/aspeed_ast27x0.c
View File

@ -120,21 +120,27 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
}; };
/* GICINT 128 */ /* GICINT 128 */
static const int aspeed_soc_ast2700_gic128_intcmap[] = { /* GICINT 192 */
static const int ast2700_gic128_gic192_intcmap[] = {
[ASPEED_DEV_LPC] = 0, [ASPEED_DEV_LPC] = 0,
[ASPEED_DEV_IBT] = 2, [ASPEED_DEV_IBT] = 2,
[ASPEED_DEV_KCS] = 4, [ASPEED_DEV_KCS] = 4,
}; };
/* GICINT 129 */
/* GICINT 193 */
/* GICINT 130 */ /* GICINT 130 */
static const int aspeed_soc_ast2700_gic130_intcmap[] = { /* GICINT 194 */
static const int ast2700_gic130_gic194_intcmap[] = {
[ASPEED_DEV_I2C] = 0, [ASPEED_DEV_I2C] = 0,
[ASPEED_DEV_ADC] = 16, [ASPEED_DEV_ADC] = 16,
[ASPEED_DEV_GPIO] = 18, [ASPEED_DEV_GPIO] = 18,
}; };
/* GICINT 131 */ /* GICINT 131 */
static const int aspeed_soc_ast2700_gic131_intcmap[] = { /* GICINT 195 */
static const int ast2700_gic131_gic195_intcmap[] = {
[ASPEED_DEV_I3C] = 0, [ASPEED_DEV_I3C] = 0,
[ASPEED_DEV_WDT] = 16, [ASPEED_DEV_WDT] = 16,
[ASPEED_DEV_FMC] = 25, [ASPEED_DEV_FMC] = 25,
@ -142,7 +148,8 @@ static const int aspeed_soc_ast2700_gic131_intcmap[] = {
}; };
/* GICINT 132 */ /* GICINT 132 */
static const int aspeed_soc_ast2700_gic132_intcmap[] = { /* GICINT 196 */
static const int ast2700_gic132_gic196_intcmap[] = {
[ASPEED_DEV_ETH1] = 0, [ASPEED_DEV_ETH1] = 0,
[ASPEED_DEV_ETH2] = 1, [ASPEED_DEV_ETH2] = 1,
[ASPEED_DEV_ETH3] = 2, [ASPEED_DEV_ETH3] = 2,
@ -161,24 +168,26 @@ static const int aspeed_soc_ast2700_gic132_intcmap[] = {
}; };
/* GICINT 133 */ /* GICINT 133 */
static const int aspeed_soc_ast2700_gic133_intcmap[] = { /* GICINT 197 */
static const int ast2700_gic133_gic197_intcmap[] = {
[ASPEED_DEV_SDHCI] = 1, [ASPEED_DEV_SDHCI] = 1,
[ASPEED_DEV_PECI] = 4, [ASPEED_DEV_PECI] = 4,
}; };
/* GICINT 128 ~ 136 */ /* GICINT 128 ~ 136 */
/* GICINT 192 ~ 201 */
struct gic_intc_irq_info { struct gic_intc_irq_info {
int irq; int irq;
const int *ptr; const int *ptr;
}; };
static const struct gic_intc_irq_info aspeed_soc_ast2700_gic_intcmap[] = { static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
{128, aspeed_soc_ast2700_gic128_intcmap}, {128, ast2700_gic128_gic192_intcmap},
{129, NULL}, {129, NULL},
{130, aspeed_soc_ast2700_gic130_intcmap}, {130, ast2700_gic130_gic194_intcmap},
{131, aspeed_soc_ast2700_gic131_intcmap}, {131, ast2700_gic131_gic195_intcmap},
{132, aspeed_soc_ast2700_gic132_intcmap}, {132, ast2700_gic132_gic196_intcmap},
{133, aspeed_soc_ast2700_gic133_intcmap}, {133, ast2700_gic133_gic197_intcmap},
{134, NULL}, {134, NULL},
{135, NULL}, {135, NULL},
{136, NULL}, {136, NULL},
@ -190,11 +199,11 @@ static qemu_irq aspeed_soc_ast2700_get_irq(AspeedSoCState *s, int dev)
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
int i; int i;
for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); assert(ast2700_gic_intcmap[i].ptr);
return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
aspeed_soc_ast2700_gic_intcmap[i].ptr[dev]); ast2700_gic_intcmap[i].ptr[dev]);
} }
} }
@ -208,16 +217,17 @@ static qemu_irq aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev,
AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s); AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
int i; int i;
for (i = 0; i < ARRAY_SIZE(aspeed_soc_ast2700_gic_intcmap); i++) { for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
if (sc->irqmap[dev] == aspeed_soc_ast2700_gic_intcmap[i].irq) { if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
assert(aspeed_soc_ast2700_gic_intcmap[i].ptr); assert(ast2700_gic_intcmap[i].ptr);
return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]), return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
aspeed_soc_ast2700_gic_intcmap[i].ptr[dev] + index); ast2700_gic_intcmap[i].ptr[dev] + index);
} }
} }
/* /*
* Invalid orgate index, device irq should be 128 to 136. * Invalid OR gate index, device IRQ should be between 128 to 136
* and 192 to 201.
*/ */
g_assert_not_reached(); g_assert_not_reached();
} }
@ -534,17 +544,18 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0, aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0,
sc->memmap[ASPEED_DEV_INTC]); sc->memmap[ASPEED_DEV_INTC]);
/* source orgates -> INTC */ /* irq sources -> orgates -> INTC */
for (i = 0; i < ic->num_inpins; i++) { for (i = 0; i < ic->num_inpins; i++) {
qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0, qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0,
qdev_get_gpio_in(DEVICE(&a->intc), i)); qdev_get_gpio_in(DEVICE(&a->intc), i));
} }
/* INTC -> GIC192 - GIC201 */
/* INTC -> GIC128 - GIC136 */ /* INTC -> GIC128 - GIC136 */
for (i = 0; i < ic->num_outpins; i++) { for (i = 0; i < ic->num_outpins; i++) {
sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i, sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
qdev_get_gpio_in(DEVICE(&a->gic), qdev_get_gpio_in(DEVICE(&a->gic),
aspeed_soc_ast2700_gic_intcmap[i].irq)); ast2700_gic_intcmap[i].irq));
} }
/* SRAM */ /* SRAM */
@ -695,10 +706,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) { for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
/* /*
* The AST2700 I2C controller has one source INTC per bus. * The AST2700 I2C controller has one source INTC per bus.
* I2C buses interrupt are connected to GICINT130_INTC *
* from bit 0 to bit 15. * For AST2700 A0:
* I2C bus 0 is connected to GICINT130_INTC at bit 0. * I2C bus interrupts are connected to the OR gate from bit 0 to bit
* I2C bus 15 is connected to GICINT130_INTC at bit 15. * 15, and the OR gate output pin is connected to the input pin of
* GICINT130 of INTC (CPU Die). Then, the output pin is connected to
* the GIC.
*
* For AST2700 A1:
* I2C bus interrupts are connected to the OR gate from bit 0 to bit
* 15, and the OR gate output pin is connected to the input pin of
* GICINT194 of INTCIO (IO Die). Then, the output pin is connected
* to the INTC (CPU Die) input pin, and its output pin is connected
* to the GIC.
*
* I2C bus 0 is connected to the OR gate at bit 0.
* I2C bus 15 is connected to the OR gate at bit 15.
*/ */
irq = aspeed_soc_ast2700_get_irq_index(s, ASPEED_DEV_I2C, i); irq = aspeed_soc_ast2700_get_irq_index(s, ASPEED_DEV_I2C, i);
sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq); sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq);