@@ -56,7 +56,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
[ASPEED_DEV_ETH2] = 0x14060000,
[ASPEED_DEV_ETH3] = 0x14070000,
[ASPEED_DEV_EMMC] = 0x12090000,
- [ASPEED_DEV_INTC] = 0x12100000,
+ [ASPEED_DEV_INTC0] = 0x12100000,
[ASPEED_DEV_SLI] = 0x12C17000,
[ASPEED_DEV_SLIIO] = 0x14C1E000,
[ASPEED_GIC_DIST] = 0x12200000,
@@ -372,7 +372,7 @@ static void aspeed_soc_ast2700_init(Object *obj)
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);
+ object_initialize_child(obj, "intc", &a->intc, TYPE_ASPEED_2700_INTC0);
snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname);
object_initialize_child(obj, "adc", &s->adc, typename);
@@ -517,7 +517,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
}
aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0,
- sc->memmap[ASPEED_DEV_INTC]);
+ sc->memmap[ASPEED_DEV_INTC0]);
/* GICINT orgates -> INTC -> GIC */
for (i = 0; i < ic->num_ints; i++) {
@@ -14,27 +14,27 @@
#include "hw/registerfields.h"
#include "qapi/error.h"
-/* INTC Registers */
-REG32(GICINT128_EN, 0x1000)
-REG32(GICINT128_STATUS, 0x1004)
-REG32(GICINT129_EN, 0x1100)
-REG32(GICINT129_STATUS, 0x1104)
-REG32(GICINT130_EN, 0x1200)
-REG32(GICINT130_STATUS, 0x1204)
-REG32(GICINT131_EN, 0x1300)
-REG32(GICINT131_STATUS, 0x1304)
-REG32(GICINT132_EN, 0x1400)
-REG32(GICINT132_STATUS, 0x1404)
-REG32(GICINT133_EN, 0x1500)
-REG32(GICINT133_STATUS, 0x1504)
-REG32(GICINT134_EN, 0x1600)
-REG32(GICINT134_STATUS, 0x1604)
-REG32(GICINT135_EN, 0x1700)
-REG32(GICINT135_STATUS, 0x1704)
-REG32(GICINT136_EN, 0x1800)
-REG32(GICINT136_STATUS, 0x1804)
-
-#define GICINT_STATUS_BASE R_GICINT128_STATUS
+/* AST2700 INTC0 Registers */
+REG32(INTC0_GICINT128_EN, 0x1000)
+REG32(INTC0_GICINT128_STATUS, 0x1004)
+REG32(INTC0_GICINT129_EN, 0x1100)
+REG32(INTC0_GICINT129_STATUS, 0x1104)
+REG32(INTC0_GICINT130_EN, 0x1200)
+REG32(INTC0_GICINT130_STATUS, 0x1204)
+REG32(INTC0_GICINT131_EN, 0x1300)
+REG32(INTC0_GICINT131_STATUS, 0x1304)
+REG32(INTC0_GICINT132_EN, 0x1400)
+REG32(INTC0_GICINT132_STATUS, 0x1404)
+REG32(INTC0_GICINT133_EN, 0x1500)
+REG32(INTC0_GICINT133_STATUS, 0x1504)
+REG32(INTC0_GICINT134_EN, 0x1600)
+REG32(INTC0_GICINT134_STATUS, 0x1604)
+REG32(INTC0_GICINT135_EN, 0x1700)
+REG32(INTC0_GICINT135_STATUS, 0x1704)
+REG32(INTC0_GICINT136_EN, 0x1800)
+REG32(INTC0_GICINT136_STATUS, 0x1804)
+
+#define GICINT_STATUS_BASE R_INTC0_GICINT128_STATUS
static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
{
@@ -153,15 +153,15 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
trace_aspeed_intc_write(offset, size, data);
switch (addr) {
- case R_GICINT128_EN:
- case R_GICINT129_EN:
- case R_GICINT130_EN:
- case R_GICINT131_EN:
- case R_GICINT132_EN:
- case R_GICINT133_EN:
- case R_GICINT134_EN:
- case R_GICINT135_EN:
- case R_GICINT136_EN:
+ case R_INTC0_GICINT128_EN:
+ case R_INTC0_GICINT129_EN:
+ case R_INTC0_GICINT130_EN:
+ case R_INTC0_GICINT131_EN:
+ case R_INTC0_GICINT132_EN:
+ case R_INTC0_GICINT133_EN:
+ case R_INTC0_GICINT134_EN:
+ case R_INTC0_GICINT135_EN:
+ case R_INTC0_GICINT136_EN:
irq = (offset & 0x0f00) >> 8;
if (irq >= aic->num_ints) {
@@ -202,15 +202,15 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
}
s->regs[addr] = data;
break;
- case R_GICINT128_STATUS:
- case R_GICINT129_STATUS:
- case R_GICINT130_STATUS:
- case R_GICINT131_STATUS:
- case R_GICINT132_STATUS:
- case R_GICINT133_STATUS:
- case R_GICINT134_STATUS:
- case R_GICINT135_STATUS:
- case R_GICINT136_STATUS:
+ case R_INTC0_GICINT128_STATUS:
+ case R_INTC0_GICINT129_STATUS:
+ case R_INTC0_GICINT130_STATUS:
+ case R_INTC0_GICINT131_STATUS:
+ case R_INTC0_GICINT132_STATUS:
+ case R_INTC0_GICINT133_STATUS:
+ case R_INTC0_GICINT134_STATUS:
+ case R_INTC0_GICINT135_STATUS:
+ case R_INTC0_GICINT136_STATUS:
irq = (offset & 0x0f00) >> 8;
if (irq >= aic->num_ints) {
@@ -336,26 +336,26 @@ static const TypeInfo aspeed_intc_info = {
.abstract = true,
};
-static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
+static void aspeed_2700_intc0_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
AspeedINTCClass *aic = ASPEED_INTC_CLASS(klass);
- dc->desc = "ASPEED 2700 INTC Controller";
+ dc->desc = "ASPEED 2700 INTC 0 Controller";
aic->num_lines = 32;
aic->num_ints = 9;
}
-static const TypeInfo aspeed_2700_intc_info = {
- .name = TYPE_ASPEED_2700_INTC,
+static const TypeInfo aspeed_2700_intc0_info = {
+ .name = TYPE_ASPEED_2700_INTC0,
.parent = TYPE_ASPEED_INTC,
- .class_init = aspeed_2700_intc_class_init,
+ .class_init = aspeed_2700_intc0_class_init,
};
static void aspeed_intc_register_types(void)
{
type_register_static(&aspeed_intc_info);
- type_register_static(&aspeed_2700_intc_info);
+ type_register_static(&aspeed_2700_intc0_info);
}
type_init(aspeed_intc_register_types);
@@ -194,7 +194,7 @@ enum {
ASPEED_DEV_EHCI1,
ASPEED_DEV_EHCI2,
ASPEED_DEV_VIC,
- ASPEED_DEV_INTC,
+ ASPEED_DEV_INTC0,
ASPEED_DEV_SDMC,
ASPEED_DEV_SCU,
ASPEED_DEV_ADC,
@@ -13,7 +13,7 @@
#include "hw/or-irq.h"
#define TYPE_ASPEED_INTC "aspeed.intc"
-#define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
+#define TYPE_ASPEED_2700_INTC0 TYPE_ASPEED_INTC "0" "-ast2700"
OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
#define ASPEED_INTC_NR_REGS (0x2000 >> 2)
The design of the INTC has significant changes in the AST2700 A1. In the AST2700 A0, there was one INTC controller, whereas in the AST2700 A1, there were two INTC controllers: INTC0 (CPU DIE) and INTC1 (I/O DIE). The previous INTC model only supported the AST2700 A0 and was implemented for the INTC0 (CPU DIE). To support the future INTC1 (I/O DIE) model, rename INTC to INTC0. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> --- hw/arm/aspeed_ast27x0.c | 6 +-- hw/intc/aspeed_intc.c | 90 +++++++++++++++++------------------ include/hw/arm/aspeed_soc.h | 2 +- include/hw/intc/aspeed_intc.h | 2 +- 4 files changed, 50 insertions(+), 50 deletions(-)