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

hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0

Browse Source 
Currently, AST2700 SoC only supports A0. To support AST2700 A1, rename its IRQ
table and machine name.

To follow the machine deprecation rule, the initial machine "ast2700-evb" is
aliased to "ast2700a0-evb." In the future, we will alias "ast2700-evb" to new
SoCs, such as "ast2700a1-evb."

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-9-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:17 +08:00 committed by Cédric Le Goater
parent 49da40cf5f
commit de4e979973
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/arm/aspeed.c
View File

@ -1673,12 +1673,13 @@ static void ast2700_evb_i2c_init(AspeedMachineState *bmc)
TYPE_TMP105, 0x4d); TYPE_TMP105, 0x4d);
} }
static void aspeed_machine_ast2700_evb_class_init(ObjectClass *oc, void *data) static void aspeed_machine_ast2700a0_evb_class_init(ObjectClass *oc, void *data)
{ {
MachineClass *mc = MACHINE_CLASS(oc); MachineClass *mc = MACHINE_CLASS(oc);
AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
mc->desc = "Aspeed AST2700 EVB (Cortex-A35)"; mc->alias = "ast2700-evb";
mc->desc = "Aspeed AST2700 A0 EVB (Cortex-A35)";
amc->soc_name = "ast2700-a0"; amc->soc_name = "ast2700-a0";
amc->hw_strap1 = AST2700_EVB_HW_STRAP1; amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
amc->hw_strap2 = AST2700_EVB_HW_STRAP2; amc->hw_strap2 = AST2700_EVB_HW_STRAP2;
@ -1817,9 +1818,9 @@ static const TypeInfo aspeed_machine_types[] = {
.class_init = aspeed_minibmc_machine_ast1030_evb_class_init, .class_init = aspeed_minibmc_machine_ast1030_evb_class_init,
#ifdef TARGET_AARCH64 #ifdef TARGET_AARCH64
}, { }, {
.name = MACHINE_TYPE_NAME("ast2700-evb"), .name = MACHINE_TYPE_NAME("ast2700a0-evb"),
.parent = TYPE_ASPEED_MACHINE, .parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_ast2700_evb_class_init, .class_init = aspeed_machine_ast2700a0_evb_class_init,
#endif #endif
}, { }, {
.name = TYPE_ASPEED_MACHINE, .name = TYPE_ASPEED_MACHINE,

8
hw/arm/aspeed_ast27x0.c
View File

@ -73,7 +73,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
#define AST2700_MAX_IRQ 256 #define AST2700_MAX_IRQ 256
/* Shared Peripheral Interrupt values below are offset by -32 from datasheet */ /* Shared Peripheral Interrupt values below are offset by -32 from datasheet */
static const int aspeed_soc_ast2700_irqmap[] = { static const int aspeed_soc_ast2700a0_irqmap[] = {
[ASPEED_DEV_UART0] = 132, [ASPEED_DEV_UART0] = 132,
[ASPEED_DEV_UART1] = 132, [ASPEED_DEV_UART1] = 132,
[ASPEED_DEV_UART2] = 132, [ASPEED_DEV_UART2] = 132,
@ -766,7 +766,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
create_unimplemented_device("ast2700.io", 0x0, 0x4000000); create_unimplemented_device("ast2700.io", 0x0, 0x4000000);
} }
static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data) static void aspeed_soc_ast2700a0_class_init(ObjectClass *oc, void *data)
{ {
static const char * const valid_cpu_types[] = { static const char * const valid_cpu_types[] = {
ARM_CPU_TYPE_NAME("cortex-a35"), ARM_CPU_TYPE_NAME("cortex-a35"),
@ -788,7 +788,7 @@ static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data)
sc->uarts_num = 13; sc->uarts_num = 13;
sc->num_cpus = 4; sc->num_cpus = 4;
sc->uarts_base = ASPEED_DEV_UART0; sc->uarts_base = ASPEED_DEV_UART0;
sc->irqmap = aspeed_soc_ast2700_irqmap; sc->irqmap = aspeed_soc_ast2700a0_irqmap;
sc->memmap = aspeed_soc_ast2700_memmap; sc->memmap = aspeed_soc_ast2700_memmap;
sc->get_irq = aspeed_soc_ast2700_get_irq; sc->get_irq = aspeed_soc_ast2700_get_irq;
} }
@ -803,7 +803,7 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
.name = "ast2700-a0", .name = "ast2700-a0",
.parent = TYPE_ASPEED27X0_SOC, .parent = TYPE_ASPEED27X0_SOC,
.instance_init = aspeed_soc_ast2700_init, .instance_init = aspeed_soc_ast2700_init,
.class_init = aspeed_soc_ast2700_class_init, .class_init = aspeed_soc_ast2700a0_class_init,
}, },
}; };