[PATCH v4 00/23] Support AST2700 A1

[PATCH v4 00/23] Support AST2700 A1

[Jamin Lin via]

v1:
 1. Refactor INTC model to support both INTC0 and INTC1.
 2. Support AST2700 A1.
 3. Create ast2700a0-evb machine.
 
v2:
  To streamline the review process, split the following patch series into
  three parts.
  https://patchwork.kernel.org/project/qemu-devel/cover/20250121070424.2465942-1-jamin_lin@aspeedtech.com/
  This patch series focuses on cleaning up the INTC model to
  facilitate future support for the INTC_IO model.

v3:
 1. Update and add functional test for AST2700
 2. Add AST2700 INTC design guidance and its block diagram.
 3. Retaining the INTC naming and introducing a new INTCIO model to support the AST2700 A1.
 4. Create ast2700a1-evb machine and rename ast2700a0-evb machine
 5. Fix silicon revision issue and support AST2700 A1.

v4:
 1. rework functional test for AST2700
 2. the initial machine "ast2700-evb" is aliased to "ast2700a0-evb.
 3. intc: Reduce regs array size by adding a register sub-region
 4. intc: split patch for Support setting different register sizes
 5. update ast2700a1-evb machine parent to TYPE_ASPEED_MACHINE

With the patch applied, QEMU now supports two machines for running AST2700 SoCs:
ast2700a0-evb: Designed for AST2700 A0
ast2700a1-evb: Designed for AST2700 A1

Test information
1. QEMU version: https://github.com/qemu/qemu/commit/50d38b8921837827ea397d4b20c8bc5efe186e53
2. ASPEED SDK v09.05 pre-built image
   https://github.com/AspeedTech-BMC/openbmc/releases/tag/v09.05
   ast2700-default-obmc.tar.gz (AST2700 A1)
   https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-default-obmc.tar.gz
   ast2700-a0-default-obmc.tar.gz (AST2700 A0)
   https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-a0-default-obmc.tar.gz
   
This patch series depends on the following patch series:
https://patchwork.kernel.org/project/qemu-devel/cover/20250303073547.1145080-1-jamin_lin@aspeedtech.com/
https://patchwork.kernel.org/project/qemu-devel/cover/20250225075622.305515-1-jamin_lin@aspeedtech.com/

Jamin Lin (23):
  hw/intc/aspeed: Support setting different memory size
  hw/intc/aspeed: Support setting different register sizes
  hw/intc/aspeed: Reduce regs array size by adding a register sub-region
  hw/intc/aspeed: Introduce helper functions for enable and status
    registers
  hw/intc/aspeed: Add object type name to trace events for better
    debugging
  hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0
  hw/arm/aspeed_ast27x0: Sort the IRQ table by IRQ number
  hw/intc/aspeed: Support different memory region ops
  hw/intc/aspeed: Rename num_ints to num_inpins for clarity
  hw/intc/aspeed: Add support for multiple output pins in INTC
  hw/intc/aspeed: Refactor INTC to support separate input and output pin
    indices
  hw/intc/aspeed: Introduce AspeedINTCIRQ structure to save the irq
    index and register address
  hw/intc/aspeed: Introduce IRQ handler function to reduce code
    duplication
  hw/intc/aspeed: Add Support for Multi-Output IRQ Handling
  hw/intc/aspeed: Add Support for AST2700 INTCIO Controller
  hw/misc/aspeed_scu: Add Support for AST2700/AST2750 A1 Silicon
    Revisions
  hw/arm/aspeed_ast27x0.c Support AST2700 A1 GIC Interrupt Mapping
  hw/arm/aspeed_ast27x0: Support two levels of INTC controllers for
    AST2700 A1
  hw/arm/aspeed: Add SoC and Machine Support for AST2700 A1
  tests/functional/aspeed: Introduce start_ast2700_test API and update
    hwmon path
  tests/functional/aspeed: Update test ASPEED SDK v09.05
  tests/functional/aspeed: Add test case for AST2700 A1
  docs/specs: Add aspeed-intc

 docs/specs/aspeed-intc.rst              | 136 +++++
 docs/specs/index.rst                    |   1 +
 include/hw/arm/aspeed_soc.h             |   3 +-
 include/hw/intc/aspeed_intc.h           |  35 +-
 include/hw/misc/aspeed_scu.h            |   2 +
 hw/arm/aspeed.c                         |  33 +-
 hw/arm/aspeed_ast27x0.c                 | 276 +++++++---
 hw/intc/aspeed_intc.c                   | 636 ++++++++++++++++++------
 hw/misc/aspeed_scu.c                    |   2 +
 hw/intc/trace-events                    |  25 +-
 tests/functional/test_aarch64_aspeed.py |  47 +-
 11 files changed, 942 insertions(+), 254 deletions(-)
 create mode 100644 docs/specs/aspeed-intc.rst

-- 
2.34.1

[PATCH v4 01/23] hw/intc/aspeed: Support setting different memory size

[Jamin Lin via]

According to the AST2700 datasheet, the INTC(CPU DIE) controller has 16KB
(0x4000) of register space, and the INTCIO (I/O DIE) controller has 1KB (0x400)
of register space.

Introduced a new class attribute "mem_size" to set different memory sizes for
the INTC models in AST2700.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h | 3 +++
 hw/intc/aspeed_intc.c         | 9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 18cb43476c..03324f05ab 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -25,6 +25,8 @@ struct AspeedINTCState {
 
     /*< public >*/
     MemoryRegion iomem;
+    MemoryRegion iomem_container;
+
     uint32_t regs[ASPEED_INTC_NR_REGS];
     OrIRQState orgates[ASPEED_INTC_NR_INTS];
     qemu_irq output_pins[ASPEED_INTC_NR_INTS];
@@ -39,6 +41,7 @@ struct AspeedINTCClass {
 
     uint32_t num_lines;
     uint32_t num_ints;
+    uint64_t mem_size;
 };
 
 #endif /* ASPEED_INTC_H */
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 126b711b94..033b574c1e 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -302,10 +302,16 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     int i;
 
+    memory_region_init(&s->iomem_container, OBJECT(s),
+            TYPE_ASPEED_INTC ".container", aic->mem_size);
+
+    sysbus_init_mmio(sbd, &s->iomem_container);
+
     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
                           TYPE_ASPEED_INTC ".regs", ASPEED_INTC_NR_REGS << 2);
 
-    sysbus_init_mmio(sbd, &s->iomem);
+    memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
+
     qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_ints);
 
     for (i = 0; i < aic->num_ints; i++) {
@@ -344,6 +350,7 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
     dc->desc = "ASPEED 2700 INTC Controller";
     aic->num_lines = 32;
     aic->num_ints = 9;
+    aic->mem_size = 0x4000;
 }
 
 static const TypeInfo aspeed_2700_intc_info = {
-- 
2.34.1

[PATCH v4 02/23] hw/intc/aspeed: Support setting different register sizes

[Jamin Lin via]

Currently, the size of the regs array is 0x2000, which is too large. So far,
it only use GICINT128 - GICINT134, and the offsets from 0 to 0x1000 are unused.
To save code size, introduce a new class attribute "reg_size" to set the
different register sizes for the INTC models in AST2700 and add a regs
sub-region in the memory container.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h | 1 +
 hw/intc/aspeed_intc.c         | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 03324f05ab..ecaeb15aea 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -42,6 +42,7 @@ struct AspeedINTCClass {
     uint32_t num_lines;
     uint32_t num_ints;
     uint64_t mem_size;
+    uint64_t reg_size;
 };
 
 #endif /* ASPEED_INTC_H */
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 033b574c1e..316885a27a 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -117,10 +117,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
 {
     AspeedINTCState *s = ASPEED_INTC(opaque);
+    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     uint32_t addr = offset >> 2;
     uint32_t value = 0;
 
-    if (addr >= ASPEED_INTC_NR_REGS) {
+    if (offset >= aic->reg_size) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx "\n",
                       __func__, offset);
@@ -143,7 +144,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     uint32_t change;
     uint32_t irq;
 
-    if (addr >= ASPEED_INTC_NR_REGS) {
+    if (offset >= aic->reg_size) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx "\n",
                       __func__, offset);
@@ -308,7 +309,7 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
     sysbus_init_mmio(sbd, &s->iomem_container);
 
     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
-                          TYPE_ASPEED_INTC ".regs", ASPEED_INTC_NR_REGS << 2);
+                          TYPE_ASPEED_INTC ".regs", aic->reg_size);
 
     memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
 
@@ -351,6 +352,7 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
     aic->num_lines = 32;
     aic->num_ints = 9;
     aic->mem_size = 0x4000;
+    aic->reg_size = 0x2000;
 }
 
 static const TypeInfo aspeed_2700_intc_info = {
-- 
2.34.1

[PATCH v4 03/23] hw/intc/aspeed: Reduce regs array size by adding a register sub-region

[Jamin Lin via]

Currently, the size of the "regs" array is 0x2000, which is too large. So far,
it only uses "GICINT128 to `GICINT134", and the offsets from 0 to 0x1000 are
unused. To save code size and avoid mapping large unused gaps, update to only
map the useful set of registers:

INTC register [0x1000 – 0x1804]

Update "reg_size" to 0x808. Introduce a new class attribute "reg_offset" to set
the start offset of a "INTC" sub-region. Set the "reg_offset" to 0x1000 for INTC
registers.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h |  3 ++-
 hw/intc/aspeed_intc.c         | 50 ++++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index ecaeb15aea..18ca405336 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -16,7 +16,7 @@
 #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
 OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 
-#define ASPEED_INTC_NR_REGS (0x2000 >> 2)
+#define ASPEED_INTC_NR_REGS (0x808 >> 2)
 #define ASPEED_INTC_NR_INTS 9
 
 struct AspeedINTCState {
@@ -43,6 +43,7 @@ struct AspeedINTCClass {
     uint32_t num_ints;
     uint64_t mem_size;
     uint64_t reg_size;
+    uint64_t reg_offset;
 };
 
 #endif /* ASPEED_INTC_H */
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 316885a27a..0f630ffab7 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -14,25 +14,31 @@
 #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)
+/*
+ * INTC Registers
+ *
+ * values below are offset by - 0x1000 from datasheet
+ * because its memory region is start at 0x1000
+ *
+ */
+REG32(GICINT128_EN,         0x000)
+REG32(GICINT128_STATUS,     0x004)
+REG32(GICINT129_EN,         0x100)
+REG32(GICINT129_STATUS,     0x104)
+REG32(GICINT130_EN,         0x200)
+REG32(GICINT130_STATUS,     0x204)
+REG32(GICINT131_EN,         0x300)
+REG32(GICINT131_STATUS,     0x304)
+REG32(GICINT132_EN,         0x400)
+REG32(GICINT132_STATUS,     0x404)
+REG32(GICINT133_EN,         0x500)
+REG32(GICINT133_STATUS,     0x504)
+REG32(GICINT134_EN,         0x600)
+REG32(GICINT134_STATUS,     0x604)
+REG32(GICINT135_EN,         0x700)
+REG32(GICINT135_STATUS,     0x704)
+REG32(GICINT136_EN,         0x800)
+REG32(GICINT136_STATUS,     0x804)
 
 #define GICINT_STATUS_BASE     R_GICINT128_STATUS
 
@@ -311,7 +317,8 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
                           TYPE_ASPEED_INTC ".regs", aic->reg_size);
 
-    memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
+    memory_region_add_subregion(&s->iomem_container, aic->reg_offset,
+                                &s->iomem);
 
     qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_ints);
 
@@ -352,7 +359,8 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
     aic->num_lines = 32;
     aic->num_ints = 9;
     aic->mem_size = 0x4000;
-    aic->reg_size = 0x2000;
+    aic->reg_size = 0x808;
+    aic->reg_offset = 0x1000;
 }
 
 static const TypeInfo aspeed_2700_intc_info = {
-- 
2.34.1

[PATCH v4 04/23] hw/intc/aspeed: Introduce helper functions for enable and status registers

[Jamin Lin via]

The behavior of the enable and status registers is almost identical between
INTC(CPU Die) and INTCIO(IO Die). To reduce duplicated code, adds
"aspeed_intc_enable_handler" functions to handle enable register write
behavior and "aspeed_intc_status_handler" functions to handle status
register write behavior. No functional change.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 hw/intc/aspeed_intc.c | 190 ++++++++++++++++++++++++------------------
 1 file changed, 108 insertions(+), 82 deletions(-)

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 0f630ffab7..906331fa32 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -120,6 +120,112 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     }
 }
 
+static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
+                                       uint64_t data)
+{
+    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    uint32_t addr = offset >> 2;
+    uint32_t old_enable;
+    uint32_t change;
+    uint32_t irq;
+
+    irq = (offset & 0x0f00) >> 8;
+
+    if (irq >= aic->num_ints) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+                      __func__, irq);
+        return;
+    }
+
+    /*
+     * The enable registers are used to enable source interrupts.
+     * They also handle masking and unmasking of source interrupts
+     * during the execution of the source ISR.
+     */
+
+    /* disable all source interrupt */
+    if (!data && !s->enable[irq]) {
+        s->regs[addr] = data;
+        return;
+    }
+
+    old_enable = s->enable[irq];
+    s->enable[irq] |= data;
+
+    /* enable new source interrupt */
+    if (old_enable != s->enable[irq]) {
+        trace_aspeed_intc_enable(s->enable[irq]);
+        s->regs[addr] = data;
+        return;
+    }
+
+    /* mask and unmask source interrupt */
+    change = s->regs[addr] ^ data;
+    if (change & data) {
+        s->mask[irq] &= ~change;
+        trace_aspeed_intc_unmask(change, s->mask[irq]);
+    } else {
+        s->mask[irq] |= change;
+        trace_aspeed_intc_mask(change, s->mask[irq]);
+    }
+
+    s->regs[addr] = data;
+}
+
+static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
+                                       uint64_t data)
+{
+    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    uint32_t addr = offset >> 2;
+    uint32_t irq;
+
+    if (!data) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
+        return;
+    }
+
+    irq = (offset & 0x0f00) >> 8;
+
+    if (irq >= aic->num_ints) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+                      __func__, irq);
+        return;
+    }
+
+    /* clear status */
+    s->regs[addr] &= ~data;
+
+    /*
+     * These status registers are used for notify sources ISR are executed.
+     * If one source ISR is executed, it will clear one bit.
+     * If it clear all bits, it means to initialize this register status
+     * rather than sources ISR are executed.
+     */
+    if (data == 0xffffffff) {
+        return;
+    }
+
+    /* All source ISR execution are done */
+    if (!s->regs[addr]) {
+        trace_aspeed_intc_all_isr_done(irq);
+        if (s->pending[irq]) {
+            /*
+             * handle pending source interrupt
+             * notify firmware which source interrupt are pending
+             * by setting status register
+             */
+            s->regs[addr] = s->pending[irq];
+            s->pending[irq] = 0;
+            trace_aspeed_intc_trigger_irq(irq, s->regs[addr]);
+            aspeed_intc_update(s, irq, 1);
+        } else {
+            /* clear irq */
+            trace_aspeed_intc_clear_irq(irq, 0);
+            aspeed_intc_update(s, irq, 0);
+        }
+    }
+}
+
 static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
 {
     AspeedINTCState *s = ASPEED_INTC(opaque);
@@ -146,9 +252,6 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     AspeedINTCState *s = ASPEED_INTC(opaque);
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     uint32_t addr = offset >> 2;
-    uint32_t old_enable;
-    uint32_t change;
-    uint32_t irq;
 
     if (offset >= aic->reg_size) {
         qemu_log_mask(LOG_GUEST_ERROR,
@@ -169,45 +272,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     case R_GICINT134_EN:
     case R_GICINT135_EN:
     case R_GICINT136_EN:
-        irq = (offset & 0x0f00) >> 8;
-
-        if (irq >= aic->num_ints) {
-            qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
-                          __func__, irq);
-            return;
-        }
-
-        /*
-         * These registers are used for enable sources interrupt and
-         * mask and unmask source interrupt while executing source ISR.
-         */
-
-        /* disable all source interrupt */
-        if (!data && !s->enable[irq]) {
-            s->regs[addr] = data;
-            return;
-        }
-
-        old_enable = s->enable[irq];
-        s->enable[irq] |= data;
-
-        /* enable new source interrupt */
-        if (old_enable != s->enable[irq]) {
-            trace_aspeed_intc_enable(s->enable[irq]);
-            s->regs[addr] = data;
-            return;
-        }
-
-        /* mask and unmask source interrupt */
-        change = s->regs[addr] ^ data;
-        if (change & data) {
-            s->mask[irq] &= ~change;
-            trace_aspeed_intc_unmask(change, s->mask[irq]);
-        } else {
-            s->mask[irq] |= change;
-            trace_aspeed_intc_mask(change, s->mask[irq]);
-        }
-        s->regs[addr] = data;
+        aspeed_intc_enable_handler(s, offset, data);
         break;
     case R_GICINT128_STATUS:
     case R_GICINT129_STATUS:
@@ -218,46 +283,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     case R_GICINT134_STATUS:
     case R_GICINT135_STATUS:
     case R_GICINT136_STATUS:
-        irq = (offset & 0x0f00) >> 8;
-
-        if (irq >= aic->num_ints) {
-            qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
-                          __func__, irq);
-            return;
-        }
-
-        /* clear status */
-        s->regs[addr] &= ~data;
-
-        /*
-         * These status registers are used for notify sources ISR are executed.
-         * If one source ISR is executed, it will clear one bit.
-         * If it clear all bits, it means to initialize this register status
-         * rather than sources ISR are executed.
-         */
-        if (data == 0xffffffff) {
-            return;
-        }
-
-        /* All source ISR execution are done */
-        if (!s->regs[addr]) {
-            trace_aspeed_intc_all_isr_done(irq);
-            if (s->pending[irq]) {
-                /*
-                 * handle pending source interrupt
-                 * notify firmware which source interrupt are pending
-                 * by setting status register
-                 */
-                s->regs[addr] = s->pending[irq];
-                s->pending[irq] = 0;
-                trace_aspeed_intc_trigger_irq(irq, s->regs[addr]);
-                aspeed_intc_update(s, irq, 1);
-            } else {
-                /* clear irq */
-                trace_aspeed_intc_clear_irq(irq, 0);
-                aspeed_intc_update(s, irq, 0);
-            }
-        }
+        aspeed_intc_status_handler(s, offset, data);
         break;
     default:
         s->regs[addr] = data;
-- 
2.34.1

[PATCH v4 05/23] hw/intc/aspeed: Add object type name to trace events for better debugging

[Jamin Lin via]

Currently, these trace events only refer to INTC. To simplify the INTC model,
both INTC(CPU Die) and INTCIO(IO Die) will share the same helper functions.

However, it is difficult to recognize whether these trace events are comes from
INTC or INTCIO. To make these trace events more readable, adds object type name
to the INTC trace events.
Update trace events to include the "name" field for better identification.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 hw/intc/aspeed_intc.c | 32 +++++++++++++++++++-------------
 hw/intc/trace-events  | 24 ++++++++++++------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 906331fa32..e94ebb6f4e 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -45,6 +45,7 @@ REG32(GICINT136_STATUS,     0x804)
 static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
 
     if (irq >= aic->num_ints) {
         qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
@@ -52,7 +53,7 @@ static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
         return;
     }
 
-    trace_aspeed_intc_update_irq(irq, level);
+    trace_aspeed_intc_update_irq(name, irq, level);
     qemu_set_irq(s->output_pins[irq], level);
 }
 
@@ -66,6 +67,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 {
     AspeedINTCState *s = (AspeedINTCState *)opaque;
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
     uint32_t status_addr = GICINT_STATUS_BASE + ((0x100 * irq) >> 2);
     uint32_t select = 0;
     uint32_t enable;
@@ -77,7 +79,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
         return;
     }
 
-    trace_aspeed_intc_set_irq(irq, level);
+    trace_aspeed_intc_set_irq(name, irq, level);
     enable = s->enable[irq];
 
     if (!level) {
@@ -96,7 +98,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
         return;
     }
 
-    trace_aspeed_intc_select(select);
+    trace_aspeed_intc_select(name, select);
 
     if (s->mask[irq] || s->regs[status_addr]) {
         /*
@@ -108,14 +110,14 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
          * save source interrupt to pending variable.
          */
         s->pending[irq] |= select;
-        trace_aspeed_intc_pending_irq(irq, s->pending[irq]);
+        trace_aspeed_intc_pending_irq(name, irq, s->pending[irq]);
     } else {
         /*
          * notify firmware which source interrupt are coming
          * by setting status register
          */
         s->regs[status_addr] = select;
-        trace_aspeed_intc_trigger_irq(irq, s->regs[status_addr]);
+        trace_aspeed_intc_trigger_irq(name, irq, s->regs[status_addr]);
         aspeed_intc_update(s, irq, 1);
     }
 }
@@ -124,6 +126,7 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
                                        uint64_t data)
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
     uint32_t addr = offset >> 2;
     uint32_t old_enable;
     uint32_t change;
@@ -154,7 +157,7 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
 
     /* enable new source interrupt */
     if (old_enable != s->enable[irq]) {
-        trace_aspeed_intc_enable(s->enable[irq]);
+        trace_aspeed_intc_enable(name, s->enable[irq]);
         s->regs[addr] = data;
         return;
     }
@@ -163,10 +166,10 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
     change = s->regs[addr] ^ data;
     if (change & data) {
         s->mask[irq] &= ~change;
-        trace_aspeed_intc_unmask(change, s->mask[irq]);
+        trace_aspeed_intc_unmask(name, change, s->mask[irq]);
     } else {
         s->mask[irq] |= change;
-        trace_aspeed_intc_mask(change, s->mask[irq]);
+        trace_aspeed_intc_mask(name, change, s->mask[irq]);
     }
 
     s->regs[addr] = data;
@@ -176,6 +179,7 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
                                        uint64_t data)
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
     uint32_t addr = offset >> 2;
     uint32_t irq;
 
@@ -207,7 +211,7 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
 
     /* All source ISR execution are done */
     if (!s->regs[addr]) {
-        trace_aspeed_intc_all_isr_done(irq);
+        trace_aspeed_intc_all_isr_done(name, irq);
         if (s->pending[irq]) {
             /*
              * handle pending source interrupt
@@ -216,11 +220,11 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
              */
             s->regs[addr] = s->pending[irq];
             s->pending[irq] = 0;
-            trace_aspeed_intc_trigger_irq(irq, s->regs[addr]);
+            trace_aspeed_intc_trigger_irq(name, irq, s->regs[addr]);
             aspeed_intc_update(s, irq, 1);
         } else {
             /* clear irq */
-            trace_aspeed_intc_clear_irq(irq, 0);
+            trace_aspeed_intc_clear_irq(name, irq, 0);
             aspeed_intc_update(s, irq, 0);
         }
     }
@@ -230,6 +234,7 @@ static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
 {
     AspeedINTCState *s = ASPEED_INTC(opaque);
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
     uint32_t addr = offset >> 2;
     uint32_t value = 0;
 
@@ -241,7 +246,7 @@ static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
     }
 
     value = s->regs[addr];
-    trace_aspeed_intc_read(offset, size, value);
+    trace_aspeed_intc_read(name, offset, size, value);
 
     return value;
 }
@@ -251,6 +256,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
 {
     AspeedINTCState *s = ASPEED_INTC(opaque);
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
     uint32_t addr = offset >> 2;
 
     if (offset >= aic->reg_size) {
@@ -260,7 +266,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
         return;
     }
 
-    trace_aspeed_intc_write(offset, size, data);
+    trace_aspeed_intc_write(name, offset, size, data);
 
     switch (addr) {
     case R_GICINT128_EN:
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index 3dcf147198..e9ca34755e 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -80,18 +80,18 @@ aspeed_vic_update_irq(int flags) "Raising IRQ: %d"
 aspeed_vic_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32
 aspeed_vic_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32
 # aspeed_intc.c
-aspeed_intc_read(uint64_t offset, unsigned size, uint32_t value) "From 0x%" PRIx64 " of size %u: 0x%" PRIx32
-aspeed_intc_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64 " of size %u: 0x%" PRIx32
-aspeed_intc_set_irq(int irq, int level) "Set IRQ %d: %d"
-aspeed_intc_clear_irq(int irq, int level) "Clear IRQ %d: %d"
-aspeed_intc_update_irq(int irq, int level) "Update IRQ: %d: %d"
-aspeed_intc_pending_irq(int irq, uint32_t value) "Pending IRQ: %d: 0x%x"
-aspeed_intc_trigger_irq(int irq, uint32_t value) "Trigger IRQ: %d: 0x%x"
-aspeed_intc_all_isr_done(int irq) "All source ISR execution are done: %d"
-aspeed_intc_enable(uint32_t value) "Enable: 0x%x"
-aspeed_intc_select(uint32_t value) "Select: 0x%x"
-aspeed_intc_mask(uint32_t change, uint32_t value) "Mask: 0x%x: 0x%x"
-aspeed_intc_unmask(uint32_t change, uint32_t value) "UnMask: 0x%x: 0x%x"
+aspeed_intc_read(const char *s, uint64_t offset, unsigned size, uint32_t value) "%s: From 0x%" PRIx64 " of size %u: 0x%" PRIx32
+aspeed_intc_write(const char *s, uint64_t offset, unsigned size, uint32_t data) "%s: To 0x%" PRIx64 " of size %u: 0x%" PRIx32
+aspeed_intc_set_irq(const char *s, int irq, int level) "%s: Set IRQ %d: %d"
+aspeed_intc_clear_irq(const char *s, int irq, int level) "%s: Clear IRQ %d: %d"
+aspeed_intc_update_irq(const char *s, int irq, int level) "%s: Update IRQ: %d: %d"
+aspeed_intc_pending_irq(const char *s, int irq, uint32_t value) "%s: Pending IRQ: %d: 0x%x"
+aspeed_intc_trigger_irq(const char *s, int irq, uint32_t value) "%s: Trigger IRQ: %d: 0x%x"
+aspeed_intc_all_isr_done(const char *s, int irq) "%s: All source ISR execution are done: %d"
+aspeed_intc_enable(const char *s, uint32_t value) "%s: Enable: 0x%x"
+aspeed_intc_select(const char *s, uint32_t value) "%s: Select: 0x%x"
+aspeed_intc_mask(const char *s, uint32_t change, uint32_t value) "%s: Mask: 0x%x: 0x%x"
+aspeed_intc_unmask(const char *s, uint32_t change, uint32_t value) "%s: UnMask: 0x%x: 0x%x"
 
 # arm_gic.c
 gic_enable_irq(int irq) "irq %d enabled"
-- 
2.34.1

[PATCH v4 06/23] hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0

[Jamin Lin via]

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>
---
 hw/arm/aspeed.c         | 9 +++++----
 hw/arm/aspeed_ast27x0.c | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index c6c18596d6..2482f05154 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -1673,12 +1673,13 @@ static void ast2700_evb_i2c_init(AspeedMachineState *bmc)
                             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);
     AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
 
-    mc->desc = "Aspeed AST2700 EVB (Cortex-A35)";
+    mc->desc = "Aspeed AST2700 A0 EVB (Cortex-A35)";
+    mc->alias = "ast2700-evb";
     amc->soc_name  = "ast2700-a0";
     amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
     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,
 #ifdef TARGET_AARCH64
     }, {
-        .name          = MACHINE_TYPE_NAME("ast2700-evb"),
+        .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
         .parent        = TYPE_ASPEED_MACHINE,
-        .class_init    = aspeed_machine_ast2700_evb_class_init,
+        .class_init    = aspeed_machine_ast2700a0_evb_class_init,
 #endif
     }, {
         .name          = TYPE_ASPEED_MACHINE,
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index 527a5f8245..f1beea7ece 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -73,7 +73,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
 #define AST2700_MAX_IRQ 256
 
 /* 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_UART1]     = 132,
     [ASPEED_DEV_UART2]     = 132,
@@ -762,7 +762,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
     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[] = {
         ARM_CPU_TYPE_NAME("cortex-a35"),
@@ -785,7 +785,7 @@ static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data)
     sc->uarts_num    = 13;
     sc->num_cpus     = 4;
     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->get_irq      = aspeed_soc_ast2700_get_irq;
 }
@@ -800,7 +800,7 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
         .name           = "ast2700-a0",
         .parent         = TYPE_ASPEED27X0_SOC,
         .instance_init  = aspeed_soc_ast2700_init,
-        .class_init     = aspeed_soc_ast2700_class_init,
+        .class_init     = aspeed_soc_ast2700a0_class_init,
     },
 };
 
-- 
2.34.1

[PATCH v4 07/23] hw/arm/aspeed_ast27x0: Sort the IRQ table by IRQ number

[Jamin Lin via]

To improve readability, sort the IRQ table by IRQ number.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 hw/arm/aspeed_ast27x0.c | 50 ++++++++++++++++++++---------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index f1beea7ece..b44d23b5ae 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -74,27 +74,13 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
 
 /* Shared Peripheral Interrupt values below are offset by -32 from datasheet */
 static const int aspeed_soc_ast2700a0_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_HACE]      = 4,
     [ASPEED_DEV_XDMA]      = 5,
-    [ASPEED_DEV_EMMC]      = 15,
-    [ASPEED_DEV_GPIO]      = 130,
+    [ASPEED_DEV_UART4]     = 8,
+    [ASPEED_DEV_SCU]       = 12,
     [ASPEED_DEV_RTC]       = 13,
+    [ASPEED_DEV_EMMC]      = 15,
     [ASPEED_DEV_TIMER1]    = 16,
     [ASPEED_DEV_TIMER2]    = 17,
     [ASPEED_DEV_TIMER3]    = 18,
@@ -103,19 +89,33 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
     [ASPEED_DEV_TIMER6]    = 21,
     [ASPEED_DEV_TIMER7]    = 22,
     [ASPEED_DEV_TIMER8]    = 23,
-    [ASPEED_DEV_WDT]       = 131,
-    [ASPEED_DEV_PWM]       = 131,
+    [ASPEED_DEV_DP]        = 28,
     [ASPEED_DEV_LPC]       = 128,
     [ASPEED_DEV_IBT]       = 128,
+    [ASPEED_DEV_KCS]       = 128,
+    [ASPEED_DEV_ADC]       = 130,
+    [ASPEED_DEV_GPIO]      = 130,
     [ASPEED_DEV_I2C]       = 130,
-    [ASPEED_DEV_PECI]      = 133,
+    [ASPEED_DEV_FMC]       = 131,
+    [ASPEED_DEV_WDT]       = 131,
+    [ASPEED_DEV_PWM]       = 131,
+    [ASPEED_DEV_I3C]       = 131,
+    [ASPEED_DEV_UART0]     = 132,
+    [ASPEED_DEV_UART1]     = 132,
+    [ASPEED_DEV_UART2]     = 132,
+    [ASPEED_DEV_UART3]     = 132,
+    [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_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,
+    [ASPEED_DEV_PECI]      = 133,
     [ASPEED_DEV_SDHCI]     = 133,
 };
 
-- 
2.34.1

[PATCH v4 08/23] hw/intc/aspeed: Support different memory region ops

[Jamin Lin via]

The previous implementation set the "aspeed_intc_ops" struct, containing read
and write callbacks, to be used when I/O is performed on the INTC region.
Both "aspeed_intc_read" and "aspeed_intc_write" callback functions were used
for INTC (CPU Die).

To support the INTCIO (IO Die) model, introduces a new "reg_ops" class
attribute. This allows setting different memory region operations to support
different INTC models.

Will introduce "aspeed_intcio_read" and "aspeed_intcio_write" callback
functions are used for INTCIO.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 include/hw/intc/aspeed_intc.h | 1 +
 hw/intc/aspeed_intc.c         | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 18ca405336..c1fe2dd15a 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -44,6 +44,7 @@ struct AspeedINTCClass {
     uint64_t mem_size;
     uint64_t reg_size;
     uint64_t reg_offset;
+    const MemoryRegionOps *reg_ops;
 };
 
 #endif /* ASPEED_INTC_H */
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index e94ebb6f4e..90658ffb59 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -346,7 +346,7 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
 
     sysbus_init_mmio(sbd, &s->iomem_container);
 
-    memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
+    memory_region_init_io(&s->iomem, OBJECT(s), aic->reg_ops, s,
                           TYPE_ASPEED_INTC ".regs", aic->reg_size);
 
     memory_region_add_subregion(&s->iomem_container, aic->reg_offset,
@@ -365,11 +365,14 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
 static void aspeed_intc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
+    AspeedINTCClass *aic = ASPEED_INTC_CLASS(klass);
 
     dc->desc = "ASPEED INTC Controller";
     dc->realize = aspeed_intc_realize;
     device_class_set_legacy_reset(dc, aspeed_intc_reset);
     dc->vmsd = NULL;
+
+    aic->reg_ops = &aspeed_intc_ops;
 }
 
 static const TypeInfo aspeed_intc_info = {
-- 
2.34.1

[PATCH v4 09/23] hw/intc/aspeed: Rename num_ints to num_inpins for clarity

[Jamin Lin via]

To support AST2700 A1, some registers of the INTC(CPU Die) support one input
pin to multiple output pins. Renamed "num_ints" to "num_inpins" in the INTC
controller code for better clarity and consistency in naming conventions.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 include/hw/intc/aspeed_intc.h | 11 ++++++-----
 hw/arm/aspeed_ast27x0.c       |  2 +-
 hw/intc/aspeed_intc.c         | 31 +++++++++++++++++--------------
 3 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index c1fe2dd15a..4a0512c688 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -18,6 +18,7 @@ OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 
 #define ASPEED_INTC_NR_REGS (0x808 >> 2)
 #define ASPEED_INTC_NR_INTS 9
+#define ASPEED_INTC_MAX_INPINS 9
 
 struct AspeedINTCState {
     /*< private >*/
@@ -28,19 +29,19 @@ struct AspeedINTCState {
     MemoryRegion iomem_container;
 
     uint32_t regs[ASPEED_INTC_NR_REGS];
-    OrIRQState orgates[ASPEED_INTC_NR_INTS];
+    OrIRQState orgates[ASPEED_INTC_MAX_INPINS];
     qemu_irq output_pins[ASPEED_INTC_NR_INTS];
 
-    uint32_t enable[ASPEED_INTC_NR_INTS];
-    uint32_t mask[ASPEED_INTC_NR_INTS];
-    uint32_t pending[ASPEED_INTC_NR_INTS];
+    uint32_t enable[ASPEED_INTC_MAX_INPINS];
+    uint32_t mask[ASPEED_INTC_MAX_INPINS];
+    uint32_t pending[ASPEED_INTC_MAX_INPINS];
 };
 
 struct AspeedINTCClass {
     SysBusDeviceClass parent_class;
 
     uint32_t num_lines;
-    uint32_t num_ints;
+    uint32_t num_inpins;
     uint64_t mem_size;
     uint64_t reg_size;
     uint64_t reg_offset;
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index b44d23b5ae..9aea06fb76 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -531,7 +531,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
                     sc->memmap[ASPEED_DEV_INTC]);
 
     /* GICINT orgates -> INTC -> GIC */
-    for (i = 0; i < ic->num_ints; i++) {
+    for (i = 0; i < ic->num_inpins; 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,
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 90658ffb59..f9f30c957e 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -47,8 +47,9 @@ static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     const char *name = object_get_typename(OBJECT(s));
 
-    if (irq >= aic->num_ints) {
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+    if (irq >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Invalid input pin index: %d\n",
                       __func__, irq);
         return;
     }
@@ -60,7 +61,7 @@ static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
 /*
  * The address of GICINT128 to GICINT136 are from 0x1000 to 0x1804.
  * Utilize "address & 0x0f00" to get the irq and irq output pin index
- * The value of irq should be 0 to num_ints.
+ * The value of irq should be 0 to num_inpins.
  * The irq 0 indicates GICINT128, irq 1 indicates GICINT129 and so on.
  */
 static void aspeed_intc_set_irq(void *opaque, int irq, int level)
@@ -73,8 +74,8 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     uint32_t enable;
     int i;
 
-    if (irq >= aic->num_ints) {
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+    if (irq >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin index: %d\n",
                       __func__, irq);
         return;
     }
@@ -134,8 +135,9 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
 
     irq = (offset & 0x0f00) >> 8;
 
-    if (irq >= aic->num_ints) {
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+    if (irq >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Invalid input pin index: %d\n",
                       __func__, irq);
         return;
     }
@@ -190,8 +192,9 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
 
     irq = (offset & 0x0f00) >> 8;
 
-    if (irq >= aic->num_ints) {
-        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid interrupt number: %d\n",
+    if (irq >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Invalid input pin index: %d\n",
                       __func__, irq);
         return;
     }
@@ -315,8 +318,8 @@ static void aspeed_intc_instance_init(Object *obj)
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     int i;
 
-    assert(aic->num_ints <= ASPEED_INTC_NR_INTS);
-    for (i = 0; i < aic->num_ints; i++) {
+    assert(aic->num_inpins <= ASPEED_INTC_MAX_INPINS);
+    for (i = 0; i < aic->num_inpins; i++) {
         object_initialize_child(obj, "intc-orgates[*]", &s->orgates[i],
                                 TYPE_OR_IRQ);
         object_property_set_int(OBJECT(&s->orgates[i]), "num-lines",
@@ -352,9 +355,9 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
     memory_region_add_subregion(&s->iomem_container, aic->reg_offset,
                                 &s->iomem);
 
-    qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_ints);
+    qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_inpins);
 
-    for (i = 0; i < aic->num_ints; i++) {
+    for (i = 0; i < aic->num_inpins; i++) {
         if (!qdev_realize(DEVICE(&s->orgates[i]), NULL, errp)) {
             return;
         }
@@ -392,7 +395,7 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
 
     dc->desc = "ASPEED 2700 INTC Controller";
     aic->num_lines = 32;
-    aic->num_ints = 9;
+    aic->num_inpins = 9;
     aic->mem_size = 0x4000;
     aic->reg_size = 0x808;
     aic->reg_offset = 0x1000;
-- 
2.34.1

[PATCH v4 10/23] hw/intc/aspeed: Add support for multiple output pins in INTC

[Jamin Lin via]

Added support for multiple output pins in the INTC controller to
accommodate the AST2700 A1.

Introduced "num_outpins" to represent the number of output pins. Updated the
IRQ handling logic to initialize and connect output pins separately from input
pins. Modified the "aspeed_soc_ast2700_realize" function to connect source
orgates to INTC and INTC to GIC128 - GIC136. Updated the "aspeed_intc_realize"
function to initialize output pins.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 include/hw/intc/aspeed_intc.h | 5 +++--
 hw/arm/aspeed_ast27x0.c       | 6 +++++-
 hw/intc/aspeed_intc.c         | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 4a0512c688..f9a0273f78 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -17,8 +17,8 @@
 OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 
 #define ASPEED_INTC_NR_REGS (0x808 >> 2)
-#define ASPEED_INTC_NR_INTS 9
 #define ASPEED_INTC_MAX_INPINS 9
+#define ASPEED_INTC_MAX_OUTPINS 9
 
 struct AspeedINTCState {
     /*< private >*/
@@ -30,7 +30,7 @@ struct AspeedINTCState {
 
     uint32_t regs[ASPEED_INTC_NR_REGS];
     OrIRQState orgates[ASPEED_INTC_MAX_INPINS];
-    qemu_irq output_pins[ASPEED_INTC_NR_INTS];
+    qemu_irq output_pins[ASPEED_INTC_MAX_OUTPINS];
 
     uint32_t enable[ASPEED_INTC_MAX_INPINS];
     uint32_t mask[ASPEED_INTC_MAX_INPINS];
@@ -42,6 +42,7 @@ struct AspeedINTCClass {
 
     uint32_t num_lines;
     uint32_t num_inpins;
+    uint32_t num_outpins;
     uint64_t mem_size;
     uint64_t reg_size;
     uint64_t reg_offset;
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index 9aea06fb76..09aad69e3c 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -530,10 +530,14 @@ 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]);
 
-    /* GICINT orgates -> INTC -> GIC */
+    /* source orgates -> INTC */
     for (i = 0; i < ic->num_inpins; i++) {
         qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0,
                                 qdev_get_gpio_in(DEVICE(&a->intc), i));
+    }
+
+    /* INTC -> GIC128 - GIC136 */
+    for (i = 0; i < ic->num_outpins; i++) {
         sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
                            qdev_get_gpio_in(DEVICE(&a->gic),
                                 aspeed_soc_ast2700_gic_intcmap[i].irq));
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index f9f30c957e..d558b3824c 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -361,6 +361,9 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
         if (!qdev_realize(DEVICE(&s->orgates[i]), NULL, errp)) {
             return;
         }
+    }
+
+    for (i = 0; i < aic->num_outpins; i++) {
         sysbus_init_irq(sbd, &s->output_pins[i]);
     }
 }
@@ -396,6 +399,7 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
     dc->desc = "ASPEED 2700 INTC Controller";
     aic->num_lines = 32;
     aic->num_inpins = 9;
+    aic->num_outpins = 9;
     aic->mem_size = 0x4000;
     aic->reg_size = 0x808;
     aic->reg_offset = 0x1000;
-- 
2.34.1

[PATCH v4 11/23] hw/intc/aspeed: Refactor INTC to support separate input and output pin indices

[Jamin Lin via]

Refactors the INTC to distinguish between input and output pin indices,
improving interrupt handling clarity and accuracy.

Updated the functions to handle both input and output pin indices.
Added detailed logging for input and output pin indices in trace events.

These changes ensure that the INTC controller can handle multiple input and
output pins, improving support for the AST2700 A1.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 hw/intc/aspeed_intc.c | 97 +++++++++++++++++++++++++++----------------
 hw/intc/trace-events  | 12 +++---
 2 files changed, 67 insertions(+), 42 deletions(-)

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index d558b3824c..9bc3e089d8 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -42,20 +42,32 @@ REG32(GICINT136_STATUS,     0x804)
 
 #define GICINT_STATUS_BASE     R_GICINT128_STATUS
 
-static void aspeed_intc_update(AspeedINTCState *s, int irq, int level)
+/*
+ * Update the state of an interrupt controller pin by setting
+ * the specified output pin to the given level.
+ * The input pin index should be between 0 and the number of input pins.
+ * The output pin index should be between 0 and the number of output pins.
+ */
+static void aspeed_intc_update(AspeedINTCState *s, int inpin_idx,
+                               int outpin_idx, int level)
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     const char *name = object_get_typename(OBJECT(s));
 
-    if (irq >= aic->num_inpins) {
-        qemu_log_mask(LOG_GUEST_ERROR,
-                      "%s: Invalid input pin index: %d\n",
-                      __func__, irq);
+    if (inpin_idx >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin index: %d\n",
+                      __func__, inpin_idx);
         return;
     }
 
-    trace_aspeed_intc_update_irq(name, irq, level);
-    qemu_set_irq(s->output_pins[irq], level);
+    if (outpin_idx >= aic->num_outpins) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid output pin index: %d\n",
+                      __func__, outpin_idx);
+        return;
+    }
+
+    trace_aspeed_intc_update_irq(name, inpin_idx, outpin_idx, level);
+    qemu_set_irq(s->output_pins[outpin_idx], level);
 }
 
 /*
@@ -73,6 +85,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     uint32_t select = 0;
     uint32_t enable;
     int i;
+    int inpin_idx;
+    int outpin_idx;
+
+    inpin_idx = irq;
+    outpin_idx = irq;
 
     if (irq >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin index: %d\n",
@@ -80,15 +97,15 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
         return;
     }
 
-    trace_aspeed_intc_set_irq(name, irq, level);
-    enable = s->enable[irq];
+    trace_aspeed_intc_set_irq(name, inpin_idx, level);
+    enable = s->enable[inpin_idx];
 
     if (!level) {
         return;
     }
 
     for (i = 0; i < aic->num_lines; i++) {
-        if (s->orgates[irq].levels[i]) {
+        if (s->orgates[inpin_idx].levels[i]) {
             if (enable & BIT(i)) {
                 select |= BIT(i);
             }
@@ -101,7 +118,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 
     trace_aspeed_intc_select(name, select);
 
-    if (s->mask[irq] || s->regs[status_addr]) {
+    if (s->mask[inpin_idx] || s->regs[status_addr]) {
         /*
          * a. mask is not 0 means in ISR mode
          * sources interrupt routine are executing.
@@ -110,16 +127,17 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
          *
          * save source interrupt to pending variable.
          */
-        s->pending[irq] |= select;
-        trace_aspeed_intc_pending_irq(name, irq, s->pending[irq]);
+        s->pending[inpin_idx] |= select;
+        trace_aspeed_intc_pending_irq(name, inpin_idx, s->pending[inpin_idx]);
     } else {
         /*
          * notify firmware which source interrupt are coming
          * by setting status register
          */
         s->regs[status_addr] = select;
-        trace_aspeed_intc_trigger_irq(name, irq, s->regs[status_addr]);
-        aspeed_intc_update(s, irq, 1);
+        trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
+                                      s->regs[status_addr]);
+        aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
     }
 }
 
@@ -132,13 +150,15 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
     uint32_t old_enable;
     uint32_t change;
     uint32_t irq;
+    int inpin_idx;
 
     irq = (offset & 0x0f00) >> 8;
+    inpin_idx = irq;
 
-    if (irq >= aic->num_inpins) {
+    if (inpin_idx >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Invalid input pin index: %d\n",
-                      __func__, irq);
+                      __func__, inpin_idx);
         return;
     }
 
@@ -149,17 +169,17 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
      */
 
     /* disable all source interrupt */
-    if (!data && !s->enable[irq]) {
+    if (!data && !s->enable[inpin_idx]) {
         s->regs[addr] = data;
         return;
     }
 
-    old_enable = s->enable[irq];
-    s->enable[irq] |= data;
+    old_enable = s->enable[inpin_idx];
+    s->enable[inpin_idx] |= data;
 
     /* enable new source interrupt */
-    if (old_enable != s->enable[irq]) {
-        trace_aspeed_intc_enable(name, s->enable[irq]);
+    if (old_enable != s->enable[inpin_idx]) {
+        trace_aspeed_intc_enable(name, s->enable[inpin_idx]);
         s->regs[addr] = data;
         return;
     }
@@ -167,11 +187,11 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
     /* mask and unmask source interrupt */
     change = s->regs[addr] ^ data;
     if (change & data) {
-        s->mask[irq] &= ~change;
-        trace_aspeed_intc_unmask(name, change, s->mask[irq]);
+        s->mask[inpin_idx] &= ~change;
+        trace_aspeed_intc_unmask(name, change, s->mask[inpin_idx]);
     } else {
-        s->mask[irq] |= change;
-        trace_aspeed_intc_mask(name, change, s->mask[irq]);
+        s->mask[inpin_idx] |= change;
+        trace_aspeed_intc_mask(name, change, s->mask[inpin_idx]);
     }
 
     s->regs[addr] = data;
@@ -184,6 +204,8 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
     const char *name = object_get_typename(OBJECT(s));
     uint32_t addr = offset >> 2;
     uint32_t irq;
+    int inpin_idx;
+    int outpin_idx;
 
     if (!data) {
         qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
@@ -191,11 +213,13 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
     }
 
     irq = (offset & 0x0f00) >> 8;
+    inpin_idx = irq;
+    outpin_idx = irq;
 
-    if (irq >= aic->num_inpins) {
+    if (inpin_idx >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Invalid input pin index: %d\n",
-                      __func__, irq);
+                      __func__, inpin_idx);
         return;
     }
 
@@ -214,21 +238,22 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
 
     /* All source ISR execution are done */
     if (!s->regs[addr]) {
-        trace_aspeed_intc_all_isr_done(name, irq);
-        if (s->pending[irq]) {
+        trace_aspeed_intc_all_isr_done(name, inpin_idx);
+        if (s->pending[inpin_idx]) {
             /*
              * handle pending source interrupt
              * notify firmware which source interrupt are pending
              * by setting status register
              */
-            s->regs[addr] = s->pending[irq];
-            s->pending[irq] = 0;
-            trace_aspeed_intc_trigger_irq(name, irq, s->regs[addr]);
-            aspeed_intc_update(s, irq, 1);
+            s->regs[addr] = s->pending[inpin_idx];
+            s->pending[inpin_idx] = 0;
+            trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
+                                          s->regs[addr]);
+            aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
         } else {
             /* clear irq */
-            trace_aspeed_intc_clear_irq(name, irq, 0);
-            aspeed_intc_update(s, irq, 0);
+            trace_aspeed_intc_clear_irq(name, inpin_idx, outpin_idx, 0);
+            aspeed_intc_update(s, inpin_idx, outpin_idx, 0);
         }
     }
 }
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index e9ca34755e..e97eea820b 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -82,12 +82,12 @@ aspeed_vic_write(uint64_t offset, unsigned size, uint32_t data) "To 0x%" PRIx64
 # aspeed_intc.c
 aspeed_intc_read(const char *s, uint64_t offset, unsigned size, uint32_t value) "%s: From 0x%" PRIx64 " of size %u: 0x%" PRIx32
 aspeed_intc_write(const char *s, uint64_t offset, unsigned size, uint32_t data) "%s: To 0x%" PRIx64 " of size %u: 0x%" PRIx32
-aspeed_intc_set_irq(const char *s, int irq, int level) "%s: Set IRQ %d: %d"
-aspeed_intc_clear_irq(const char *s, int irq, int level) "%s: Clear IRQ %d: %d"
-aspeed_intc_update_irq(const char *s, int irq, int level) "%s: Update IRQ: %d: %d"
-aspeed_intc_pending_irq(const char *s, int irq, uint32_t value) "%s: Pending IRQ: %d: 0x%x"
-aspeed_intc_trigger_irq(const char *s, int irq, uint32_t value) "%s: Trigger IRQ: %d: 0x%x"
-aspeed_intc_all_isr_done(const char *s, int irq) "%s: All source ISR execution are done: %d"
+aspeed_intc_set_irq(const char *s, int inpin_idx, int level) "%s: Set IRQ %d: %d"
+aspeed_intc_clear_irq(const char *s, int inpin_idx, int outpin_idx, int level) "%s: Clear IRQ %d-%d: %d"
+aspeed_intc_update_irq(const char *s, int inpin_idx, int outpin_idx, int level) "%s: Update IRQ: %d-%d: %d"
+aspeed_intc_pending_irq(const char *s, int inpin_idx, uint32_t value) "%s: Pending IRQ: %d: 0x%x"
+aspeed_intc_trigger_irq(const char *s, int inpin_idx, int outpin_idx, uint32_t value) "%s: Trigger IRQ: %d-%d: 0x%x"
+aspeed_intc_all_isr_done(const char *s, int inpin_idx) "%s: All source ISR execution are done: %d"
 aspeed_intc_enable(const char *s, uint32_t value) "%s: Enable: 0x%x"
 aspeed_intc_select(const char *s, uint32_t value) "%s: Select: 0x%x"
 aspeed_intc_mask(const char *s, uint32_t change, uint32_t value) "%s: Mask: 0x%x: 0x%x"
-- 
2.34.1

[PATCH v4 12/23] hw/intc/aspeed: Introduce AspeedINTCIRQ structure to save the irq index and register address

[Jamin Lin via]

The INTC controller supports GICINT128 to GICINT136, mapping 1:1 to input and
output IRQs 0 to 8. Previously, the formula "address & 0x0f00" was used to
derive the IRQ index numbers.

However, the INTC controller also supports GICINT192_201, mapping 1 input IRQ
pin to 10 output IRQ pins. The pin numbers for input and output are different.
It is difficult to use a formula to determine the index number of INTC model
supported input and output IRQs.

To simplify and improve readability, introduces the AspeedINTCIRQ structure to
save the input/output IRQ index and its enable/status register address.

Introduce the "aspeed_2700_intc_irqs" table to store IRQ information for INTC.
Introduce the "aspeed_intc_get_irq" function to retrieve the input/output IRQ
pin index from the provided status/enable register address.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h |  10 +++
 hw/intc/aspeed_intc.c         | 120 ++++++++++++++++++++--------------
 2 files changed, 82 insertions(+), 48 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index f9a0273f78..112a01f402 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -20,6 +20,14 @@ OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 #define ASPEED_INTC_MAX_INPINS 9
 #define ASPEED_INTC_MAX_OUTPINS 9
 
+typedef struct AspeedINTCIRQ {
+    int inpin_idx;
+    int outpin_idx;
+    int num_outpins;
+    uint32_t enable_addr;
+    uint32_t status_addr;
+} AspeedINTCIRQ;
+
 struct AspeedINTCState {
     /*< private >*/
     SysBusDevice parent_obj;
@@ -47,6 +55,8 @@ struct AspeedINTCClass {
     uint64_t reg_size;
     uint64_t reg_offset;
     const MemoryRegionOps *reg_ops;
+    const AspeedINTCIRQ *irq_table;
+    int irq_table_count;
 };
 
 #endif /* ASPEED_INTC_H */
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 9bc3e089d8..5730a7604d 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -40,7 +40,23 @@ REG32(GICINT135_STATUS,     0x704)
 REG32(GICINT136_EN,         0x800)
 REG32(GICINT136_STATUS,     0x804)
 
-#define GICINT_STATUS_BASE     R_GICINT128_STATUS
+static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
+                                                uint32_t addr)
+{
+    int i;
+
+    for (i = 0; i < aic->irq_table_count; i++) {
+        if (aic->irq_table[i].enable_addr == addr ||
+            aic->irq_table[i].status_addr == addr) {
+            return &aic->irq_table[i];
+        }
+    }
+
+    /*
+     * Invalid addr.
+     */
+    g_assert_not_reached();
+}
 
 /*
  * Update the state of an interrupt controller pin by setting
@@ -81,15 +97,10 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     AspeedINTCState *s = (AspeedINTCState *)opaque;
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     const char *name = object_get_typename(OBJECT(s));
-    uint32_t status_addr = GICINT_STATUS_BASE + ((0x100 * irq) >> 2);
+    const AspeedINTCIRQ *intc_irq;
     uint32_t select = 0;
     uint32_t enable;
     int i;
-    int inpin_idx;
-    int outpin_idx;
-
-    inpin_idx = irq;
-    outpin_idx = irq;
 
     if (irq >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin index: %d\n",
@@ -97,15 +108,16 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
         return;
     }
 
-    trace_aspeed_intc_set_irq(name, inpin_idx, level);
-    enable = s->enable[inpin_idx];
+    intc_irq = &aic->irq_table[irq];
+    trace_aspeed_intc_set_irq(name, intc_irq->inpin_idx, level);
+    enable = s->enable[intc_irq->inpin_idx];
 
     if (!level) {
         return;
     }
 
     for (i = 0; i < aic->num_lines; i++) {
-        if (s->orgates[inpin_idx].levels[i]) {
+        if (s->orgates[intc_irq->inpin_idx].levels[i]) {
             if (enable & BIT(i)) {
                 select |= BIT(i);
             }
@@ -118,7 +130,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 
     trace_aspeed_intc_select(name, select);
 
-    if (s->mask[inpin_idx] || s->regs[status_addr]) {
+    if (s->mask[intc_irq->inpin_idx] || s->regs[intc_irq->status_addr]) {
         /*
          * a. mask is not 0 means in ISR mode
          * sources interrupt routine are executing.
@@ -127,17 +139,19 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
          *
          * save source interrupt to pending variable.
          */
-        s->pending[inpin_idx] |= select;
-        trace_aspeed_intc_pending_irq(name, inpin_idx, s->pending[inpin_idx]);
+        s->pending[intc_irq->inpin_idx] |= select;
+        trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
+                                      s->pending[intc_irq->inpin_idx]);
     } else {
         /*
          * notify firmware which source interrupt are coming
          * by setting status register
          */
-        s->regs[status_addr] = select;
-        trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
-                                      s->regs[status_addr]);
-        aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
+        s->regs[intc_irq->status_addr] = select;
+        trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
+                                      intc_irq->outpin_idx,
+                                      s->regs[intc_irq->status_addr]);
+        aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
     }
 }
 
@@ -146,19 +160,17 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     const char *name = object_get_typename(OBJECT(s));
+    const AspeedINTCIRQ *intc_irq;
     uint32_t addr = offset >> 2;
     uint32_t old_enable;
     uint32_t change;
-    uint32_t irq;
-    int inpin_idx;
 
-    irq = (offset & 0x0f00) >> 8;
-    inpin_idx = irq;
+    intc_irq = aspeed_intc_get_irq(aic, addr);
 
-    if (inpin_idx >= aic->num_inpins) {
+    if (intc_irq->inpin_idx >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Invalid input pin index: %d\n",
-                      __func__, inpin_idx);
+                      __func__, intc_irq->inpin_idx);
         return;
     }
 
@@ -169,17 +181,17 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
      */
 
     /* disable all source interrupt */
-    if (!data && !s->enable[inpin_idx]) {
+    if (!data && !s->enable[intc_irq->inpin_idx]) {
         s->regs[addr] = data;
         return;
     }
 
-    old_enable = s->enable[inpin_idx];
-    s->enable[inpin_idx] |= data;
+    old_enable = s->enable[intc_irq->inpin_idx];
+    s->enable[intc_irq->inpin_idx] |= data;
 
     /* enable new source interrupt */
-    if (old_enable != s->enable[inpin_idx]) {
-        trace_aspeed_intc_enable(name, s->enable[inpin_idx]);
+    if (old_enable != s->enable[intc_irq->inpin_idx]) {
+        trace_aspeed_intc_enable(name, s->enable[intc_irq->inpin_idx]);
         s->regs[addr] = data;
         return;
     }
@@ -187,11 +199,11 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
     /* mask and unmask source interrupt */
     change = s->regs[addr] ^ data;
     if (change & data) {
-        s->mask[inpin_idx] &= ~change;
-        trace_aspeed_intc_unmask(name, change, s->mask[inpin_idx]);
+        s->mask[intc_irq->inpin_idx] &= ~change;
+        trace_aspeed_intc_unmask(name, change, s->mask[intc_irq->inpin_idx]);
     } else {
-        s->mask[inpin_idx] |= change;
-        trace_aspeed_intc_mask(name, change, s->mask[inpin_idx]);
+        s->mask[intc_irq->inpin_idx] |= change;
+        trace_aspeed_intc_mask(name, change, s->mask[intc_irq->inpin_idx]);
     }
 
     s->regs[addr] = data;
@@ -202,24 +214,20 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
 {
     AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
     const char *name = object_get_typename(OBJECT(s));
+    const AspeedINTCIRQ *intc_irq;
     uint32_t addr = offset >> 2;
-    uint32_t irq;
-    int inpin_idx;
-    int outpin_idx;
 
     if (!data) {
         qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
         return;
     }
 
-    irq = (offset & 0x0f00) >> 8;
-    inpin_idx = irq;
-    outpin_idx = irq;
+    intc_irq = aspeed_intc_get_irq(aic, addr);
 
-    if (inpin_idx >= aic->num_inpins) {
+    if (intc_irq->inpin_idx >= aic->num_inpins) {
         qemu_log_mask(LOG_GUEST_ERROR,
                       "%s: Invalid input pin index: %d\n",
-                      __func__, inpin_idx);
+                      __func__, intc_irq->inpin_idx);
         return;
     }
 
@@ -238,22 +246,24 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
 
     /* All source ISR execution are done */
     if (!s->regs[addr]) {
-        trace_aspeed_intc_all_isr_done(name, inpin_idx);
-        if (s->pending[inpin_idx]) {
+        trace_aspeed_intc_all_isr_done(name, intc_irq->inpin_idx);
+        if (s->pending[intc_irq->inpin_idx]) {
             /*
              * handle pending source interrupt
              * notify firmware which source interrupt are pending
              * by setting status register
              */
-            s->regs[addr] = s->pending[inpin_idx];
-            s->pending[inpin_idx] = 0;
-            trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
+            s->regs[addr] = s->pending[intc_irq->inpin_idx];
+            s->pending[intc_irq->inpin_idx] = 0;
+            trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
+                                          intc_irq->outpin_idx,
                                           s->regs[addr]);
-            aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
+            aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
         } else {
             /* clear irq */
-            trace_aspeed_intc_clear_irq(name, inpin_idx, outpin_idx, 0);
-            aspeed_intc_update(s, inpin_idx, outpin_idx, 0);
+            trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
+                                        intc_irq->outpin_idx, 0);
+            aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 0);
         }
     }
 }
@@ -416,6 +426,18 @@ static const TypeInfo aspeed_intc_info = {
     .abstract = true,
 };
 
+static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] = {
+    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
+    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
+    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
+    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
+    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
+    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
+    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
+    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
+    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS},
+};
+
 static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -428,6 +450,8 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
     aic->mem_size = 0x4000;
     aic->reg_size = 0x808;
     aic->reg_offset = 0x1000;
+    aic->irq_table = aspeed_2700_intc_irqs;
+    aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
 }
 
 static const TypeInfo aspeed_2700_intc_info = {
-- 
2.34.1

[PATCH v4 13/23] hw/intc/aspeed: Introduce IRQ handler function to reduce code duplication

[Jamin Lin via]

The behavior of the INTC set IRQ is almost identical between INTC and INTCIO.
To reduce duplicated code, introduce the "aspeed_intc_set_irq_handler" function
to handle both INTC and INTCIO IRQ behavior. No functional change.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 hw/intc/aspeed_intc.c | 62 ++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 5730a7604d..99077ec72d 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -86,11 +86,40 @@ static void aspeed_intc_update(AspeedINTCState *s, int inpin_idx,
     qemu_set_irq(s->output_pins[outpin_idx], level);
 }
 
+static void aspeed_intc_set_irq_handler(AspeedINTCState *s,
+                                        const AspeedINTCIRQ *intc_irq,
+                                        uint32_t select)
+{
+    const char *name = object_get_typename(OBJECT(s));
+
+    if (s->mask[intc_irq->inpin_idx] || s->regs[intc_irq->status_addr]) {
+        /*
+         * a. mask is not 0 means in ISR mode
+         * sources interrupt routine are executing.
+         * b. status register value is not 0 means previous
+         * source interrupt does not be executed, yet.
+         *
+         * save source interrupt to pending variable.
+         */
+        s->pending[intc_irq->inpin_idx] |= select;
+        trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
+                                      s->pending[intc_irq->inpin_idx]);
+    } else {
+        /*
+         * notify firmware which source interrupt are coming
+         * by setting status register
+         */
+        s->regs[intc_irq->status_addr] = select;
+        trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
+                                      intc_irq->outpin_idx,
+                                      s->regs[intc_irq->status_addr]);
+        aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
+    }
+}
+
 /*
- * The address of GICINT128 to GICINT136 are from 0x1000 to 0x1804.
- * Utilize "address & 0x0f00" to get the irq and irq output pin index
- * The value of irq should be 0 to num_inpins.
- * The irq 0 indicates GICINT128, irq 1 indicates GICINT129 and so on.
+ * GICINT128 to GICINT136 map 1:1 to input and output IRQs 0 to 8.
+ * The value of input IRQ should be between 0 and the number of inputs.
  */
 static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 {
@@ -129,30 +158,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     }
 
     trace_aspeed_intc_select(name, select);
-
-    if (s->mask[intc_irq->inpin_idx] || s->regs[intc_irq->status_addr]) {
-        /*
-         * a. mask is not 0 means in ISR mode
-         * sources interrupt routine are executing.
-         * b. status register value is not 0 means previous
-         * source interrupt does not be executed, yet.
-         *
-         * save source interrupt to pending variable.
-         */
-        s->pending[intc_irq->inpin_idx] |= select;
-        trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
-                                      s->pending[intc_irq->inpin_idx]);
-    } else {
-        /*
-         * notify firmware which source interrupt are coming
-         * by setting status register
-         */
-        s->regs[intc_irq->status_addr] = select;
-        trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
-                                      intc_irq->outpin_idx,
-                                      s->regs[intc_irq->status_addr]);
-        aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
-    }
+    aspeed_intc_set_irq_handler(s, intc_irq, select);
 }
 
 static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
-- 
2.34.1

[PATCH v4 14/23] hw/intc/aspeed: Add Support for Multi-Output IRQ Handling

[Jamin Lin via]

This update introduces support for handling multi-output IRQs in the AST2700
interrupt controller (INTC), specifically for GICINT192_201. GICINT192_201 maps
1:10 to input IRQ 0 and output IRQs 0 to 9. Each status bit corresponds to a
specific IRQ.

Implemented "aspeed_intc_set_irq_handler_multi_outpins" to handle IRQs with
multiple output pins. Introduced "aspeed_intc_status_handler_multi_outpins"
for managing status registers associated with multi-output IRQs.

Added new IRQ definitions for GICINT192_201 in INTC.
Adjusted the IRQ array to accommodate 10 input pins and 19 output pins,
aligning with the new GICINT192_201 mappings.

                   |------------------------------|
                   |            INTC              |
                   |inpin[0:0]--------->outpin[0] |
                   |inpin[0:1]--------->outpin[1] |
                   |inpin[0:2]--------->outpin[2] |
                   |inpin[0:3]--------->outpin[3] |
orgates[0]-------> |inpin[0:4]--------->outpin[4] |
                   |inpin[0:5]--------->outpin[5] |
                   |inpin[0:6]--------->outpin[6] |
                   |inpin[0:7]--------->outpin[7] |
                   |inpin[0:8]--------->outpin[8] |
                   |inpin[0:9]--------->outpin[9] |
                   |                              |
 orgates[1]------> |inpin[1]----------->outpin[10]|
 orgates[2]------> |inpin[2]----------->outpin[11]|
 orgates[3]------> |inpin[3]----------->outpin[12]|
 orgates[4]------> |inpin[4]----------->outpin[13]|
 orgates[5]------> |inpin[5]----------->outpin[14]|
 orgates[6]------> |inpin[6]----------->outpin[15]|
 orgates[7]------> |inpin[7]----------->outpin[16]|
 orgates[8]------> |inpin[8]----------->outpin[17]|
 orgates[9]------> |inpin[9]----------->outpin[18]|
                   |------------------------------|

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h |   6 +-
 hw/intc/aspeed_intc.c         | 144 ++++++++++++++++++++++++++++++----
 hw/intc/trace-events          |   1 +
 3 files changed, 133 insertions(+), 18 deletions(-)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 112a01f402..21d9398933 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -16,9 +16,9 @@
 #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
 OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 
-#define ASPEED_INTC_NR_REGS (0x808 >> 2)
-#define ASPEED_INTC_MAX_INPINS 9
-#define ASPEED_INTC_MAX_OUTPINS 9
+#define ASPEED_INTC_NR_REGS (0xB08 >> 2)
+#define ASPEED_INTC_MAX_INPINS 10
+#define ASPEED_INTC_MAX_OUTPINS 19
 
 typedef struct AspeedINTCIRQ {
     int inpin_idx;
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 99077ec72d..18521d3eb0 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -39,6 +39,8 @@ REG32(GICINT135_EN,         0x700)
 REG32(GICINT135_STATUS,     0x704)
 REG32(GICINT136_EN,         0x800)
 REG32(GICINT136_STATUS,     0x804)
+REG32(GICINT192_201_EN,         0xB00)
+REG32(GICINT192_201_STATUS,     0xB04)
 
 static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
                                                 uint32_t addr)
@@ -117,9 +119,48 @@ static void aspeed_intc_set_irq_handler(AspeedINTCState *s,
     }
 }
 
+static void aspeed_intc_set_irq_handler_multi_outpins(AspeedINTCState *s,
+                                 const AspeedINTCIRQ *intc_irq, uint32_t select)
+{
+    const char *name = object_get_typename(OBJECT(s));
+    int i;
+
+    for (i = 0; i < intc_irq->num_outpins; i++) {
+        if (select & BIT(i)) {
+            if (s->mask[intc_irq->inpin_idx] & BIT(i) ||
+                s->regs[intc_irq->status_addr] & BIT(i)) {
+                /*
+                 * a. mask bit is not 0 means in ISR mode sources interrupt
+                 * routine are executing.
+                 * b. status bit is not 0 means previous source interrupt
+                 * does not be executed, yet.
+                 *
+                 * save source interrupt to pending bit.
+                 */
+                 s->pending[intc_irq->inpin_idx] |= BIT(i);
+                 trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
+                                               s->pending[intc_irq->inpin_idx]);
+            } else {
+                /*
+                 * notify firmware which source interrupt are coming
+                 * by setting status bit
+                 */
+                s->regs[intc_irq->status_addr] |= BIT(i);
+                trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
+                                              intc_irq->outpin_idx + i,
+                                              s->regs[intc_irq->status_addr]);
+                aspeed_intc_update(s, intc_irq->inpin_idx,
+                                   intc_irq->outpin_idx + i, 1);
+            }
+        }
+    }
+}
+
 /*
- * GICINT128 to GICINT136 map 1:1 to input and output IRQs 0 to 8.
- * The value of input IRQ should be between 0 and the number of inputs.
+ * GICINT192_201 maps 1:10 to input IRQ 0 and output IRQs 0 to 9.
+ * GICINT128 to GICINT136 map 1:1 to input IRQs 1 to 9 and output
+ * IRQs 10 to 18. The value of input IRQ should be between 0 and
+ * the number of input pins.
  */
 static void aspeed_intc_set_irq(void *opaque, int irq, int level)
 {
@@ -158,7 +199,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
     }
 
     trace_aspeed_intc_select(name, select);
-    aspeed_intc_set_irq_handler(s, intc_irq, select);
+    if (intc_irq->num_outpins > 1) {
+        aspeed_intc_set_irq_handler_multi_outpins(s, intc_irq, select);
+    } else {
+        aspeed_intc_set_irq_handler(s, intc_irq, select);
+    }
 }
 
 static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
@@ -274,6 +319,70 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
     }
 }
 
+static void aspeed_intc_status_handler_multi_outpins(AspeedINTCState *s,
+                                                hwaddr offset, uint64_t data)
+{
+    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
+    const char *name = object_get_typename(OBJECT(s));
+    const AspeedINTCIRQ *intc_irq;
+    uint32_t addr = offset >> 2;
+    int i;
+
+    if (!data) {
+        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
+        return;
+    }
+
+    intc_irq = aspeed_intc_get_irq(aic, addr);
+
+    if (intc_irq->inpin_idx >= aic->num_inpins) {
+        qemu_log_mask(LOG_GUEST_ERROR,
+                      "%s: Invalid input pin index: %d\n",
+                      __func__,  intc_irq->inpin_idx);
+        return;
+    }
+
+    /* clear status */
+    s->regs[addr] &= ~data;
+
+    /*
+     * The status registers are used for notify sources ISR are executed.
+     * If one source ISR is executed, it will clear one bit.
+     * If it clear all bits, it means to initialize this register status
+     * rather than sources ISR are executed.
+     */
+    if (data == 0xffffffff) {
+        return;
+    }
+
+    for (i = 0; i < intc_irq->num_outpins; i++) {
+        /* All source ISR executions are done from a specific bit */
+        if (data & BIT(i)) {
+            trace_aspeed_intc_all_isr_done_bit(name, intc_irq->inpin_idx, i);
+            if (s->pending[intc_irq->inpin_idx] & BIT(i)) {
+                /*
+                 * Handle pending source interrupt.
+                 * Notify firmware which source interrupt is pending
+                 * by setting the status bit.
+                 */
+                s->regs[addr] |= BIT(i);
+                s->pending[intc_irq->inpin_idx] &= ~BIT(i);
+                trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
+                                              intc_irq->outpin_idx + i,
+                                              s->regs[addr]);
+                aspeed_intc_update(s, intc_irq->inpin_idx,
+                                   intc_irq->outpin_idx + i, 1);
+            } else {
+                /* clear irq for the specific bit */
+                trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
+                                            intc_irq->outpin_idx + i, 0);
+                aspeed_intc_update(s, intc_irq->inpin_idx,
+                                   intc_irq->outpin_idx + i, 0);
+            }
+        }
+    }
+}
+
 static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
 {
     AspeedINTCState *s = ASPEED_INTC(opaque);
@@ -322,6 +431,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     case R_GICINT134_EN:
     case R_GICINT135_EN:
     case R_GICINT136_EN:
+    case R_GICINT192_201_EN:
         aspeed_intc_enable_handler(s, offset, data);
         break;
     case R_GICINT128_STATUS:
@@ -335,6 +445,9 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     case R_GICINT136_STATUS:
         aspeed_intc_status_handler(s, offset, data);
         break;
+    case R_GICINT192_201_STATUS:
+        aspeed_intc_status_handler_multi_outpins(s, offset, data);
+        break;
     default:
         s->regs[addr] = data;
         break;
@@ -433,15 +546,16 @@ static const TypeInfo aspeed_intc_info = {
 };
 
 static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] = {
-    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
-    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
-    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
-    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
-    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
-    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
-    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
-    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
-    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS},
+    {0, 0, 10, R_GICINT192_201_EN, R_GICINT192_201_STATUS},
+    {1, 10, 1, R_GICINT128_EN, R_GICINT128_STATUS},
+    {2, 11, 1, R_GICINT129_EN, R_GICINT129_STATUS},
+    {3, 12, 1, R_GICINT130_EN, R_GICINT130_STATUS},
+    {4, 13, 1, R_GICINT131_EN, R_GICINT131_STATUS},
+    {5, 14, 1, R_GICINT132_EN, R_GICINT132_STATUS},
+    {6, 15, 1, R_GICINT133_EN, R_GICINT133_STATUS},
+    {7, 16, 1, R_GICINT134_EN, R_GICINT134_STATUS},
+    {8, 17, 1, R_GICINT135_EN, R_GICINT135_STATUS},
+    {9, 18, 1, R_GICINT136_EN, R_GICINT136_STATUS},
 };
 
 static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
@@ -451,10 +565,10 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
 
     dc->desc = "ASPEED 2700 INTC Controller";
     aic->num_lines = 32;
-    aic->num_inpins = 9;
-    aic->num_outpins = 9;
+    aic->num_inpins = 10;
+    aic->num_outpins = 19;
     aic->mem_size = 0x4000;
-    aic->reg_size = 0x808;
+    aic->reg_size = 0xB08;
     aic->reg_offset = 0x1000;
     aic->irq_table = aspeed_2700_intc_irqs;
     aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
diff --git a/hw/intc/trace-events b/hw/intc/trace-events
index e97eea820b..913197a181 100644
--- a/hw/intc/trace-events
+++ b/hw/intc/trace-events
@@ -92,6 +92,7 @@ aspeed_intc_enable(const char *s, uint32_t value) "%s: Enable: 0x%x"
 aspeed_intc_select(const char *s, uint32_t value) "%s: Select: 0x%x"
 aspeed_intc_mask(const char *s, uint32_t change, uint32_t value) "%s: Mask: 0x%x: 0x%x"
 aspeed_intc_unmask(const char *s, uint32_t change, uint32_t value) "%s: UnMask: 0x%x: 0x%x"
+aspeed_intc_all_isr_done_bit(const char *s, int inpin_idx, int bit) "%s: All source ISR execution are done from specific bit: %d-%d"
 
 # arm_gic.c
 gic_enable_irq(int irq) "irq %d enabled"
-- 
2.34.1

[PATCH v4 15/23] hw/intc/aspeed: Add Support for AST2700 INTCIO Controller

[Jamin Lin via]

Introduce a new ast2700 INTCIO class to support AST2700 INTCIO.
Added new register definitions for INTCIO, including enable and status
registers for IRQs GICINT192 through GICINT197.
Created a dedicated IRQ array for INTCIO, supporting six input pins and six
output pins, aligning with the newly defined registers.
Implemented "aspeed_intcio_read" and "aspeed_intcio_write" to handle
INTCIO-specific register access.

 To GICINT196                                                                                |

       ETH1    |-----------|                    |--------------------------|
      -------->|0          |                    |         INTCIO           |
       ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|
      -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|
       ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|
      -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|
       UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|
      -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|
       UART1   |         22|                    |--------------------------|
      -------->|8        23|
       UART2   |         24|
      -------->|9        25|
       UART3   |         26|
      ---------|10       27|
       UART5   |         28|
      -------->|11       29|
       UART6   |           |
      -------->|12       30|
       UART7   |         31|
      -------->|13         |
       UART8   |  OR[0:31] |
      -------->|14         |
       UART9   |           |
      -------->|15         |
       UART10  |           |
      -------->|16         |
       UART11  |           |
      -------->|17         |
       UART12  |           |
      -------->|18         |
               |-----------|

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/intc/aspeed_intc.h |   1 +
 hw/intc/aspeed_intc.c         | 112 ++++++++++++++++++++++++++++++++++
 2 files changed, 113 insertions(+)

diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
index 21d9398933..fd7529137b 100644
--- a/include/hw/intc/aspeed_intc.h
+++ b/include/hw/intc/aspeed_intc.h
@@ -14,6 +14,7 @@
 
 #define TYPE_ASPEED_INTC "aspeed.intc"
 #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
+#define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700"
 OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
 
 #define ASPEED_INTC_NR_REGS (0xB08 >> 2)
diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
index 18521d3eb0..da721a6066 100644
--- a/hw/intc/aspeed_intc.c
+++ b/hw/intc/aspeed_intc.c
@@ -42,6 +42,26 @@ REG32(GICINT136_STATUS,     0x804)
 REG32(GICINT192_201_EN,         0xB00)
 REG32(GICINT192_201_STATUS,     0xB04)
 
+/*
+ * INTCIO Registers
+ *
+ * values below are offset by - 0x100 from datasheet
+ * because its memory region is start at 0x100
+ *
+ */
+REG32(GICINT192_EN,         0x00)
+REG32(GICINT192_STATUS,     0x04)
+REG32(GICINT193_EN,         0x10)
+REG32(GICINT193_STATUS,     0x14)
+REG32(GICINT194_EN,         0x20)
+REG32(GICINT194_STATUS,     0x24)
+REG32(GICINT195_EN,         0x30)
+REG32(GICINT195_STATUS,     0x34)
+REG32(GICINT196_EN,         0x40)
+REG32(GICINT196_STATUS,     0x44)
+REG32(GICINT197_EN,         0x50)
+REG32(GICINT197_STATUS,     0x54)
+
 static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
                                                 uint32_t addr)
 {
@@ -456,6 +476,55 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
     return;
 }
 
+static uint64_t aspeed_intcio_read(void *opaque, hwaddr offset,
+                                   unsigned int size)
+{
+    AspeedINTCState *s = ASPEED_INTC(opaque);
+    const char *name = object_get_typename(OBJECT(s));
+    uint32_t reg = offset >> 2;
+    uint32_t value = 0;
+
+    value = s->regs[reg];
+    trace_aspeed_intc_read(name, offset, size, value);
+
+    return value;
+}
+
+static void aspeed_intcio_write(void *opaque, hwaddr offset, uint64_t data,
+                                unsigned size)
+{
+    AspeedINTCState *s = ASPEED_INTC(opaque);
+    const char *name = object_get_typename(OBJECT(s));
+    uint32_t reg = offset >> 2;
+
+    trace_aspeed_intc_write(name, offset, size, data);
+
+    switch (reg) {
+    case R_GICINT192_EN:
+    case R_GICINT193_EN:
+    case R_GICINT194_EN:
+    case R_GICINT195_EN:
+    case R_GICINT196_EN:
+    case R_GICINT197_EN:
+        aspeed_intc_enable_handler(s, offset, data);
+        break;
+    case R_GICINT192_STATUS:
+    case R_GICINT193_STATUS:
+    case R_GICINT194_STATUS:
+    case R_GICINT195_STATUS:
+    case R_GICINT196_STATUS:
+    case R_GICINT197_STATUS:
+        aspeed_intc_status_handler(s, offset, data);
+        break;
+    default:
+        s->regs[reg] = data;
+        break;
+    }
+
+    return;
+}
+
+
 static const MemoryRegionOps aspeed_intc_ops = {
     .read = aspeed_intc_read,
     .write = aspeed_intc_write,
@@ -466,6 +535,16 @@ static const MemoryRegionOps aspeed_intc_ops = {
     }
 };
 
+static const MemoryRegionOps aspeed_intcio_ops = {
+    .read = aspeed_intcio_read,
+    .write = aspeed_intcio_write,
+    .endianness = DEVICE_LITTLE_ENDIAN,
+    .valid = {
+        .min_access_size = 4,
+        .max_access_size = 4,
+    }
+};
+
 static void aspeed_intc_instance_init(Object *obj)
 {
     AspeedINTCState *s = ASPEED_INTC(obj);
@@ -580,10 +659,43 @@ static const TypeInfo aspeed_2700_intc_info = {
     .class_init = aspeed_2700_intc_class_init,
 };
 
+static AspeedINTCIRQ aspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS] = {
+    {0, 0, 1, R_GICINT192_EN, R_GICINT192_STATUS},
+    {1, 1, 1, R_GICINT193_EN, R_GICINT193_STATUS},
+    {2, 2, 1, R_GICINT194_EN, R_GICINT194_STATUS},
+    {3, 3, 1, R_GICINT195_EN, R_GICINT195_STATUS},
+    {4, 4, 1, R_GICINT196_EN, R_GICINT196_STATUS},
+    {5, 5, 1, R_GICINT197_EN, R_GICINT197_STATUS},
+};
+
+static void aspeed_2700_intcio_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    AspeedINTCClass *aic = ASPEED_INTC_CLASS(klass);
+
+    dc->desc = "ASPEED 2700 INTC IO Controller";
+    aic->num_lines = 32;
+    aic->num_inpins = 6;
+    aic->num_outpins = 6;
+    aic->mem_size = 0x400;
+    aic->reg_size = 0x58;
+    aic->reg_offset = 0x100;
+    aic->reg_ops = &aspeed_intcio_ops;
+    aic->irq_table = aspeed_2700_intcio_irqs;
+    aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intcio_irqs);
+}
+
+static const TypeInfo aspeed_2700_intcio_info = {
+    .name = TYPE_ASPEED_2700_INTCIO,
+    .parent = TYPE_ASPEED_INTC,
+    .class_init = aspeed_2700_intcio_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_intcio_info);
 }
 
 type_init(aspeed_intc_register_types);
-- 
2.34.1

[PATCH v4 16/23] hw/misc/aspeed_scu: Add Support for AST2700/AST2750 A1 Silicon Revisions

[Jamin Lin via]

Added new definitions for AST2700_A1_SILICON_REV and AST2750_A1_SILICON_REV to
identify the A1 silicon revisions.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
---
 include/hw/misc/aspeed_scu.h | 2 ++
 hw/misc/aspeed_scu.c         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/include/hw/misc/aspeed_scu.h b/include/hw/misc/aspeed_scu.h
index 356be95e45..684b48b722 100644
--- a/include/hw/misc/aspeed_scu.h
+++ b/include/hw/misc/aspeed_scu.h
@@ -54,6 +54,8 @@ struct AspeedSCUState {
 #define AST2700_A0_SILICON_REV   0x06000103U
 #define AST2720_A0_SILICON_REV   0x06000203U
 #define AST2750_A0_SILICON_REV   0x06000003U
+#define AST2700_A1_SILICON_REV   0x06010103U
+#define AST2750_A1_SILICON_REV   0x06010003U
 
 #define ASPEED_IS_AST2500(si_rev)     ((((si_rev) >> 24) & 0xff) == 0x04)
 
diff --git a/hw/misc/aspeed_scu.c b/hw/misc/aspeed_scu.c
index 0581c744f1..76cfd91671 100644
--- a/hw/misc/aspeed_scu.c
+++ b/hw/misc/aspeed_scu.c
@@ -560,6 +560,8 @@ static uint32_t aspeed_silicon_revs[] = {
     AST2700_A0_SILICON_REV,
     AST2720_A0_SILICON_REV,
     AST2750_A0_SILICON_REV,
+    AST2700_A1_SILICON_REV,
+    AST2750_A1_SILICON_REV,
 };
 
 bool is_supported_silicon_rev(uint32_t silicon_rev)
-- 
2.34.1

[PATCH v4 17/23] hw/arm/aspeed_ast27x0.c Support AST2700 A1 GIC Interrupt Mapping

[Jamin Lin via]

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>
---
 hw/arm/aspeed_ast27x0.c | 82 ++++++++++++++++++++++++++---------------
 1 file changed, 52 insertions(+), 30 deletions(-)

diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index 09aad69e3c..eab9674b6c 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -120,21 +120,27 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
 };
 
 /* 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_IBT]       = 2,
     [ASPEED_DEV_KCS]       = 4,
 };
 
+/* GICINT 129 */
+/* GICINT 193 */
+
 /* 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_ADC]        = 16,
     [ASPEED_DEV_GPIO]       = 18,
 };
 
 /* 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_WDT]       = 16,
     [ASPEED_DEV_FMC]       = 25,
@@ -142,7 +148,8 @@ static const int aspeed_soc_ast2700_gic131_intcmap[] = {
 };
 
 /* 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_ETH2]      = 1,
     [ASPEED_DEV_ETH3]      = 2,
@@ -161,24 +168,26 @@ static const int aspeed_soc_ast2700_gic132_intcmap[] = {
 };
 
 /* 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_PECI]      = 4,
 };
 
 /* GICINT 128 ~ 136 */
+/* GICINT 192 ~ 201 */
 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},
+static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
+    {128,  ast2700_gic128_gic192_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},
+    {130,  ast2700_gic130_gic194_intcmap},
+    {131,  ast2700_gic131_gic195_intcmap},
+    {132,  ast2700_gic132_gic196_intcmap},
+    {133,  ast2700_gic133_gic197_intcmap},
     {134,  NULL},
     {135,  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);
     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);
+    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
+        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
+            assert(ast2700_gic_intcmap[i].ptr);
             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);
     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);
+    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
+        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
+            assert(ast2700_gic_intcmap[i].ptr);
             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();
 }
@@ -492,7 +502,6 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
     Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev);
     AspeedSoCState *s = ASPEED_SOC(dev);
     AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
-    AspeedINTCClass *ic = ASPEED_INTC_GET_CLASS(&a->intc);
     g_autofree char *sram_name = NULL;
     qemu_irq irq;
 
@@ -530,17 +539,18 @@ 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]);
 
-    /* source orgates -> INTC */
-    for (i = 0; i < ic->num_inpins; i++) {
+    /* irq sources -> orgates -> INTC */
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++) {
         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 */
-    for (i = 0; i < ic->num_outpins; i++) {
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins; i++) {
         sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
                            qdev_get_gpio_in(DEVICE(&a->gic),
-                                aspeed_soc_ast2700_gic_intcmap[i].irq));
+                                            ast2700_gic_intcmap[i].irq));
     }
 
     /* SRAM */
@@ -691,10 +701,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
     for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
         /*
          * The AST2700 I2C controller has one source INTC per bus.
-         * I2C buses interrupt are connected to GICINT130_INTC
-         * from bit 0 to bit 15.
-         * I2C bus 0 is connected to GICINT130_INTC at bit 0.
-         * I2C bus 15 is connected to GICINT130_INTC at bit 15.
+         *
+         * For AST2700 A0:
+         * 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
+         * 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);
         sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq);
-- 
2.34.1

[PATCH v4 18/23] hw/arm/aspeed_ast27x0: Support two levels of INTC controllers for AST2700 A1

[Jamin Lin via]

The design of INTC controllers has significantly changed in AST2700 A1.

There are a total of 480 interrupt sources in AST2700 A1. For interrupt numbers
from 0 to 127, they can route directly to PSP, SSP, and TSP. Due to the
limitation of interrupt numbers of processors, the interrupts are merged every
32 sources for interrupt numbers greater than 127.

There are two levels of interrupt controllers, INTC(CPUD Die) and INTCIO
(IO Die). The interrupt sources of INTC are the interrupt numbers from INTC_0 to
INTC_127 and interrupts from INTCIO. The interrupt sources of INTCIO are the
interrupt numbers greater than INTC_127. INTC_IO controls the interrupts
INTC_128 to INTC_319 only.

Currently, only GIC 192 to 201 are supported, and their source interrupts are
from INTCIO and connected to INTC at input pin 0 and output pins 0 to 9 for
GIC 192-201.

The design of the orgates for GICINT 196 is as follows:
It has interrupt sources ranging from 0 to 31, with its output pin connected to
INTCIO "T0 GICINT_196". The output pin is then connected to INTC "GIC_192_201"
at bit 4, and its bit 4 output should be connected to GIC 196.
The design of INTC GIC_192_201 have 10 output pins, mapped as following:
Bit 0 -> GIC 192
Bit 1 -> GIC 193
Bit 2 -> GIC 194
Bit 3 -> GIC 195
Bit 4 -> GIC 196

To support both AST2700 A1 and A0, INTC input pins 1 to 9 and output pins
10 to 18 remain to support GIC 128-136, which source interrupts from INTC.
These will be removed if we decide not to support AST2700 A0 in the future.

|-------------------------------------------------------------------------------------------------------|
|                                                   AST2700 A1 Design                                   |
|           To GICINT196                                                                                |
|                                                                                                       |
|   ETH1    |-----------|                    |--------------------------|        |--------------|       |
|  -------->|0          |                    |         INTCIO           |        |  orgates[0]  |       |
|   ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|------->| 0            |       |
|  -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|------->| 1            |       |
|   ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|------->| 2            |       |
|  -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|------->| 3  OR[0:9]   |-----| |
|   UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|------->| 4            |     | |
|  -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|------->| 5            |     | |
|   UART1   |         22|   orgates[6]------>|inpin[6]-------->outpin[6]|------->| 6            |     | |
|  -------->|8        23|   orgates[7]------>|inpin[7]-------->outpin[7]|------->| 7            |     | |
|   UART2   |         24|   orgates[8]------>|inpin[8]-------->outpin[8]|------->| 8            |     | |
|  -------->|9        25|   orgates[9]------>|inpin[9]-------->outpin[9]|------->| 9            |     | |
|   UART3   |         26|                    |--------------------------|        |--------------|     | |
|  ---------|10       27|                                                                             | |
|   UART5   |         28|                                                                             | |
|  -------->|11       29|                                                                             | |
|   UART6   |           |                                                                             | |
|  -------->|12       30|     |-----------------------------------------------------------------------| |
|   UART7   |         31|     |                                                                         |
|  -------->|13         |     |                                                                         |
|   UART8   |  OR[0:31] |     |                |------------------------------|           |----------|  |
|  -------->|14         |     |                |            INTC              |           |     GIC  |  |
|   UART9   |           |     |                |inpin[0:0]--------->outpin[0] |---------->|192       |  |
|  -------->|15         |     |                |inpin[0:1]--------->outpin[1] |---------->|193       |  |
|   UART10  |           |     |                |inpin[0:2]--------->outpin[2] |---------->|194       |  |
|  -------->|16         |     |                |inpin[0:3]--------->outpin[3] |---------->|195       |  |
|   UART11  |           |     |--------------> |inpin[0:4]--------->outpin[4] |---------->|196       |  |
|  -------->|17         |                      |inpin[0:5]--------->outpin[5] |---------->|197       |  |
|   UART12  |           |                      |inpin[0:6]--------->outpin[6] |---------->|198       |  |
|  -------->|18         |                      |inpin[0:7]--------->outpin[7] |---------->|199       |  |
|           |-----------|                      |inpin[0:8]--------->outpin[8] |---------->|200       |  |
|                                              |inpin[0:9]--------->outpin[9] |---------->|201       |  |
|-------------------------------------------------------------------------------------------------------|
|-------------------------------------------------------------------------------------------------------|
|  ETH1    |-----------|     orgates[1]------->|inpin[1]----------->outpin[10]|---------->|128       |  |
| -------->|0          |     orgates[2]------->|inpin[2]----------->outpin[11]|---------->|129       |  |
|  ETH2    |          4|     orgates[3]------->|inpin[3]----------->outpin[12]|---------->|130       |  |
| -------->|1         5|     orgates[4]------->|inpin[4]----------->outpin[13]|---------->|131       |  |
|  ETH3    |          6|---->orgates[5]------->|inpin[5]----------->outpin[14]|---------->|132       |  |
| -------->|2        19|     orgates[6]------->|inpin[6]----------->outpin[15]|---------->|133       |  |
|  UART0   |         20|     orgates[7]------->|inpin[7]----------->outpin[16]|---------->|134       |  |
| -------->|7        21|     orgates[8]------->|inpin[8]----------->outpin[17]|---------->|135       |  |
|  UART1   |         22|     orgates[9]------->|inpin[9]----------->outpin[18]|---------->|136       |  |
| -------->|8        23|                       |------------------------------|           |----------|  |
|  UART2   |         24|                                                                                |
| -------->|9        25|                       AST2700 A0 Design                                        |
|  UART3   |         26|                                                                                |
| -------->|10       27|                                                                                |
|  UART5   |         28|                                                                                |
| -------->|11       29| GICINT132                                                                      |
|  UART6   |           |                                                                                |
| -------->|12       30|                                                                                |
|  UART7   |         31|                                                                                |
| -------->|13         |                                                                                |
|  UART8   |  OR[0:31] |                                                                                |
| -------->|14         |                                                                                |
|  UART9   |           |                                                                                |
| -------->|15         |                                                                                |
|  UART10  |           |                                                                                |
| -------->|16         |                                                                                |
|  UART11  |           |                                                                                |
| -------->|17         |                                                                                |
|  UART12  |           |                                                                                |
| -------->|18         |                                                                                |
|          |-----------|                                                                                |
|                                                                                                       |
|-------------------------------------------------------------------------------------------------------|

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 include/hw/arm/aspeed_soc.h |  3 +-
 hw/arm/aspeed_ast27x0.c     | 84 ++++++++++++++++++++++++++++---------
 2 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
index 689f52dae8..62f75c33dc 100644
--- a/include/hw/arm/aspeed_soc.h
+++ b/include/hw/arm/aspeed_soc.h
@@ -128,7 +128,7 @@ struct Aspeed27x0SoCState {
     AspeedSoCState parent;
 
     ARMCPU cpu[ASPEED_CPUS_NUM];
-    AspeedINTCState intc;
+    AspeedINTCState intc[2];
     GICv3State gic;
     MemoryRegion dram_empty;
 };
@@ -195,6 +195,7 @@ enum {
     ASPEED_DEV_EHCI2,
     ASPEED_DEV_VIC,
     ASPEED_DEV_INTC,
+    ASPEED_DEV_INTCIO,
     ASPEED_DEV_SDMC,
     ASPEED_DEV_SCU,
     ASPEED_DEV_ADC,
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index eab9674b6c..028bf08d0e 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -57,6 +57,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
     [ASPEED_DEV_ETH3]      =  0x14070000,
     [ASPEED_DEV_EMMC]      =  0x12090000,
     [ASPEED_DEV_INTC]      =  0x12100000,
+    [ASPEED_DEV_INTCIO]    =  0x14C18000,
     [ASPEED_DEV_SLI]       =  0x12C17000,
     [ASPEED_DEV_SLIIO]     =  0x14C1E000,
     [ASPEED_GIC_DIST]      =  0x12200000,
@@ -178,32 +179,48 @@ static const int ast2700_gic133_gic197_intcmap[] = {
 /* GICINT 192 ~ 201 */
 struct gic_intc_irq_info {
     int irq;
+    int intc_idx;
+    int orgate_idx;
     const int *ptr;
 };
 
 static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
-    {128,  ast2700_gic128_gic192_intcmap},
-    {129,  NULL},
-    {130,  ast2700_gic130_gic194_intcmap},
-    {131,  ast2700_gic131_gic195_intcmap},
-    {132,  ast2700_gic132_gic196_intcmap},
-    {133,  ast2700_gic133_gic197_intcmap},
-    {134,  NULL},
-    {135,  NULL},
-    {136,  NULL},
+    {192, 1, 0, ast2700_gic128_gic192_intcmap},
+    {193, 1, 1, NULL},
+    {194, 1, 2, ast2700_gic130_gic194_intcmap},
+    {195, 1, 3, ast2700_gic131_gic195_intcmap},
+    {196, 1, 4, ast2700_gic132_gic196_intcmap},
+    {197, 1, 5, ast2700_gic133_gic197_intcmap},
+    {198, 1, 6, NULL},
+    {199, 1, 7, NULL},
+    {200, 1, 8, NULL},
+    {201, 1, 9, NULL},
+    {128, 0, 1, ast2700_gic128_gic192_intcmap},
+    {129, 0, 2, NULL},
+    {130, 0, 3, ast2700_gic130_gic194_intcmap},
+    {131, 0, 4, ast2700_gic131_gic195_intcmap},
+    {132, 0, 5, ast2700_gic132_gic196_intcmap},
+    {133, 0, 6, ast2700_gic133_gic197_intcmap},
+    {134, 0, 7, NULL},
+    {135, 0, 8, NULL},
+    {136, 0, 9, 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 or_idx;
+    int idx;
     int i;
 
     for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
         if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
             assert(ast2700_gic_intcmap[i].ptr);
-            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
-                ast2700_gic_intcmap[i].ptr[dev]);
+            or_idx = ast2700_gic_intcmap[i].orgate_idx;
+            idx = ast2700_gic_intcmap[i].intc_idx;
+            return qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
+                                    ast2700_gic_intcmap[i].ptr[dev]);
         }
     }
 
@@ -215,12 +232,16 @@ static qemu_irq aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev,
 {
     Aspeed27x0SoCState *a = ASPEED27X0_SOC(s);
     AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
+    int or_idx;
+    int idx;
     int i;
 
     for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
         if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
             assert(ast2700_gic_intcmap[i].ptr);
-            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
+            or_idx = ast2700_gic_intcmap[i].orgate_idx;
+            idx = ast2700_gic_intcmap[i].intc_idx;
+            return qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
                                     ast2700_gic_intcmap[i].ptr[dev] + index);
         }
     }
@@ -390,7 +411,9 @@ 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[0], TYPE_ASPEED_2700_INTC);
+    object_initialize_child(obj, "intcio", &a->intc[1],
+                            TYPE_ASPEED_2700_INTCIO);
 
     snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname);
     object_initialize_child(obj, "adc", &s->adc, typename);
@@ -532,27 +555,48 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
     }
 
     /* INTC */
-    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) {
+    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[0]), errp)) {
         return;
     }
 
-    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0,
+    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[0]), 0,
                     sc->memmap[ASPEED_DEV_INTC]);
 
+    /* INTCIO */
+    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[1]), errp)) {
+        return;
+    }
+
+    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[1]), 0,
+                    sc->memmap[ASPEED_DEV_INTCIO]);
+
     /* irq sources -> orgates -> INTC */
-    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++) {
-        qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0,
-                              qdev_get_gpio_in(DEVICE(&a->intc), i));
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_inpins; i++) {
+        qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0,
+                              qdev_get_gpio_in(DEVICE(&a->intc[0]), i));
     }
 
     /* INTC -> GIC192 - GIC201 */
     /* INTC -> GIC128 - GIC136 */
-    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins; i++) {
-        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_outpins; i++) {
+        assert(i < ARRAY_SIZE(ast2700_gic_intcmap));
+        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[0]), i,
                            qdev_get_gpio_in(DEVICE(&a->gic),
                                             ast2700_gic_intcmap[i].irq));
     }
 
+    /* irq source -> orgates -> INTCIO */
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_inpins; i++) {
+        qdev_connect_gpio_out(DEVICE(&a->intc[1].orgates[i]), 0,
+                              qdev_get_gpio_in(DEVICE(&a->intc[1]), i));
+    }
+
+    /* INTCIO -> INTC */
+    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_outpins; i++) {
+        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[1]), i,
+                           qdev_get_gpio_in(DEVICE(&a->intc[0].orgates[0]), i));
+    }
+
     /* 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,
-- 
2.34.1

[PATCH v4 19/23] hw/arm/aspeed: Add SoC and Machine Support for AST2700 A1

[Jamin Lin via]

The memory map for AST2700 A1 remains compatible with AST2700 A0. However, the
IRQ mapping has been updated for AST2700 A1, with GIC interrupts now ranging
from 192 to 201. Add a new IRQ map table for AST2700 A1.
Add "aspeed_soc_ast2700a1_class_init" to initialize the AST2700 A1 SoC.
Introduce "aspeed_machine_ast2700a1_evb_class_init" to initialize the
AST2700 A1 EVB.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 hw/arm/aspeed.c         | 24 +++++++++++++
 hw/arm/aspeed_ast27x0.c | 80 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 104 insertions(+)

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 2482f05154..aaf63022ff 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -1693,6 +1693,26 @@ static void aspeed_machine_ast2700a0_evb_class_init(ObjectClass *oc, void *data)
     mc->default_ram_size = 1 * GiB;
     aspeed_machine_class_init_cpus_defaults(mc);
 }
+
+static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc, void *data)
+{
+    MachineClass *mc = MACHINE_CLASS(oc);
+    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+
+    mc->desc = "Aspeed AST2700 A1 EVB (Cortex-A35)";
+    amc->soc_name  = "ast2700-a1";
+    amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
+    amc->hw_strap2 = AST2700_EVB_HW_STRAP2;
+    amc->fmc_model = "w25q01jvq";
+    amc->spi_model = "w25q512jv";
+    amc->num_cs    = 2;
+    amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON;
+    amc->uart_default = ASPEED_DEV_UART12;
+    amc->i2c_init  = ast2700_evb_i2c_init;
+    mc->auto_create_sdcard = true;
+    mc->default_ram_size = 1 * GiB;
+    aspeed_machine_class_init_cpus_defaults(mc);
+}
 #endif
 
 static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc,
@@ -1821,6 +1841,10 @@ static const TypeInfo aspeed_machine_types[] = {
         .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
         .parent        = TYPE_ASPEED_MACHINE,
         .class_init    = aspeed_machine_ast2700a0_evb_class_init,
+        }, {
+        .name          = MACHINE_TYPE_NAME("ast2700a1-evb"),
+        .parent        = TYPE_ASPEED_MACHINE,
+        .class_init    = aspeed_machine_ast2700a1_evb_class_init,
 #endif
     }, {
         .name          = TYPE_ASPEED_MACHINE,
diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
index 028bf08d0e..6d80b54470 100644
--- a/hw/arm/aspeed_ast27x0.c
+++ b/hw/arm/aspeed_ast27x0.c
@@ -120,6 +120,52 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
     [ASPEED_DEV_SDHCI]     = 133,
 };
 
+static const int aspeed_soc_ast2700a1_irqmap[] = {
+    [ASPEED_DEV_SDMC]      = 0,
+    [ASPEED_DEV_HACE]      = 4,
+    [ASPEED_DEV_XDMA]      = 5,
+    [ASPEED_DEV_UART4]     = 8,
+    [ASPEED_DEV_SCU]       = 12,
+    [ASPEED_DEV_RTC]       = 13,
+    [ASPEED_DEV_EMMC]      = 15,
+    [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_DP]        = 28,
+    [ASPEED_DEV_LPC]       = 192,
+    [ASPEED_DEV_IBT]       = 192,
+    [ASPEED_DEV_KCS]       = 192,
+    [ASPEED_DEV_I2C]       = 194,
+    [ASPEED_DEV_ADC]       = 194,
+    [ASPEED_DEV_GPIO]      = 194,
+    [ASPEED_DEV_FMC]       = 195,
+    [ASPEED_DEV_WDT]       = 195,
+    [ASPEED_DEV_PWM]       = 195,
+    [ASPEED_DEV_I3C]       = 195,
+    [ASPEED_DEV_UART0]     = 196,
+    [ASPEED_DEV_UART1]     = 196,
+    [ASPEED_DEV_UART2]     = 196,
+    [ASPEED_DEV_UART3]     = 196,
+    [ASPEED_DEV_UART5]     = 196,
+    [ASPEED_DEV_UART6]     = 196,
+    [ASPEED_DEV_UART7]     = 196,
+    [ASPEED_DEV_UART8]     = 196,
+    [ASPEED_DEV_UART9]     = 196,
+    [ASPEED_DEV_UART10]    = 196,
+    [ASPEED_DEV_UART11]    = 196,
+    [ASPEED_DEV_UART12]    = 196,
+    [ASPEED_DEV_ETH1]      = 196,
+    [ASPEED_DEV_ETH2]      = 196,
+    [ASPEED_DEV_ETH3]      = 196,
+    [ASPEED_DEV_PECI]      = 197,
+    [ASPEED_DEV_SDHCI]     = 197,
+};
+
 /* GICINT 128 */
 /* GICINT 192 */
 static const int ast2700_gic128_gic192_intcmap[] = {
@@ -860,6 +906,34 @@ static void aspeed_soc_ast2700a0_class_init(ObjectClass *oc, void *data)
     sc->get_irq      = aspeed_soc_ast2700_get_irq;
 }
 
+static void aspeed_soc_ast2700a1_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-a1";
+    sc->valid_cpu_types = valid_cpu_types;
+    sc->silicon_rev  = AST2700_A1_SILICON_REV;
+    sc->sram_size    = 0x20000;
+    sc->spis_num     = 3;
+    sc->wdts_num     = 8;
+    sc->macs_num     = 3;
+    sc->uarts_num    = 13;
+    sc->num_cpus     = 4;
+    sc->uarts_base   = ASPEED_DEV_UART0;
+    sc->irqmap       = aspeed_soc_ast2700a1_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,
@@ -872,6 +946,12 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
         .instance_init  = aspeed_soc_ast2700_init,
         .class_init     = aspeed_soc_ast2700a0_class_init,
     },
+    {
+        .name           = "ast2700-a1",
+        .parent         = TYPE_ASPEED27X0_SOC,
+        .instance_init  = aspeed_soc_ast2700_init,
+        .class_init     = aspeed_soc_ast2700a1_class_init,
+    },
 };
 
 DEFINE_TYPES(aspeed_soc_ast27x0_types)
-- 
2.34.1

[PATCH v4 20/23] tests/functional/aspeed: Introduce start_ast2700_test API and update hwmon path

[Jamin Lin via]

Added a new method "start_ast2700_test" to the "AST2x00MachineSDK" class and
this method centralizes the logic for starting the AST2700 test, making it
reusable for different test cases.

Modified the hwmon path to use a wildcard to handle different SDK versions:
"cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input".

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 tests/functional/test_aarch64_aspeed.py | 33 +++++++++++++------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
index 9595498ace..07b0c7c1fd 100755
--- a/tests/functional/test_aarch64_aspeed.py
+++ b/tests/functional/test_aarch64_aspeed.py
@@ -31,33 +31,29 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
             'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
             '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
 
-    def test_aarch64_ast2700_evb_sdk_v09_03(self):
-        self.set_machine('ast2700-evb')
-
-        self.archive_extract(self.ASSET_SDK_V903_AST2700)
-
+    def start_ast2700_test(self, name):
         num_cpu = 4
-        uboot_size = os.path.getsize(self.scratch_file('ast2700-default',
+        uboot_size = os.path.getsize(self.scratch_file(name,
                                                        'u-boot-nodtb.bin'))
         uboot_dtb_load_addr = hex(0x400000000 + uboot_size)
 
         load_images_list = [
             {
                 'addr': '0x400000000',
-                'file': self.scratch_file('ast2700-default',
+                'file': self.scratch_file(name,
                                           'u-boot-nodtb.bin')
             },
             {
                 'addr': str(uboot_dtb_load_addr),
-                'file': self.scratch_file('ast2700-default', 'u-boot.dtb')
+                'file': self.scratch_file(name, 'u-boot.dtb')
             },
             {
                 'addr': '0x430000000',
-                'file': self.scratch_file('ast2700-default', 'bl31.bin')
+                'file': self.scratch_file(name, 'bl31.bin')
             },
             {
                 'addr': '0x430080000',
-                'file': self.scratch_file('ast2700-default', 'optee',
+                'file': self.scratch_file(name, 'optee',
                                           'tee-raw.bin')
             }
         ]
@@ -76,23 +72,28 @@ def test_aarch64_ast2700_evb_sdk_v09_03(self):
         self.vm.add_args('-device',
                          'tmp105,bus=aspeed.i2c.bus.1,address=0x4d,id=tmp-test')
         self.do_test_aarch64_aspeed_sdk_start(
-            self.scratch_file('ast2700-default', 'image-bmc'))
+            self.scratch_file(name, 'image-bmc'))
 
-        wait_for_console_pattern(self, 'ast2700-default login:')
+        wait_for_console_pattern(self, f'{name} login:')
 
         exec_command_and_wait_for_pattern(self, 'root', 'Password:')
-        exec_command_and_wait_for_pattern(self,
-            '0penBmc', 'root@ast2700-default:~#')
+        exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
 
         exec_command_and_wait_for_pattern(self,
             'echo lm75 0x4d > /sys/class/i2c-dev/i2c-1/device/new_device ',
             'i2c i2c-1: new_device: Instantiated device lm75 at 0x4d');
         exec_command_and_wait_for_pattern(self,
-            'cat /sys/class/hwmon/hwmon20/temp1_input', '0')
+            'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0')
         self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
                     property='temperature', value=18000)
         exec_command_and_wait_for_pattern(self,
-            'cat /sys/class/hwmon/hwmon20/temp1_input', '18000')
+            'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
+
+    def test_aarch64_ast2700_evb_sdk_v09_03(self):
+        self.set_machine('ast2700-evb')
+
+        self.archive_extract(self.ASSET_SDK_V903_AST2700)
+        self.start_ast2700_test('ast2700-default')
 
 
 if __name__ == '__main__':
-- 
2.34.1

[PATCH v4 21/23] tests/functional/aspeed: Update test ASPEED SDK v09.05

[Jamin Lin via]

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 tests/functional/test_aarch64_aspeed.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
index 07b0c7c1fd..8df6a97a28 100755
--- a/tests/functional/test_aarch64_aspeed.py
+++ b/tests/functional/test_aarch64_aspeed.py
@@ -27,9 +27,9 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
         wait_for_console_pattern(self, '## Loading kernel from FIT Image')
         wait_for_console_pattern(self, 'Starting kernel ...')
 
-    ASSET_SDK_V903_AST2700 = Asset(
-            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
-            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
+    ASSET_SDK_V905_AST2700 = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-a0-default-obmc.tar.gz',
+            'cfbbd1cce72f2a3b73b9080c41eecdadebb7077fba4f7806d72ac99f3e84b74a')
 
     def start_ast2700_test(self, name):
         num_cpu = 4
@@ -89,11 +89,11 @@ def start_ast2700_test(self, name):
         exec_command_and_wait_for_pattern(self,
             'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
 
-    def test_aarch64_ast2700_evb_sdk_v09_03(self):
+    def test_aarch64_ast2700_evb_sdk_v09_05(self):
         self.set_machine('ast2700-evb')
 
-        self.archive_extract(self.ASSET_SDK_V903_AST2700)
-        self.start_ast2700_test('ast2700-default')
+        self.archive_extract(self.ASSET_SDK_V905_AST2700)
+        self.start_ast2700_test('ast2700-a0-default')
 
 
 if __name__ == '__main__':
-- 
2.34.1

[PATCH v4 22/23] tests/functional/aspeed: Add test case for AST2700 A1

[Jamin Lin via]

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 tests/functional/test_aarch64_aspeed.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
index 8df6a97a28..c25c966278 100755
--- a/tests/functional/test_aarch64_aspeed.py
+++ b/tests/functional/test_aarch64_aspeed.py
@@ -31,6 +31,10 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
             'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-a0-default-obmc.tar.gz',
             'cfbbd1cce72f2a3b73b9080c41eecdadebb7077fba4f7806d72ac99f3e84b74a')
 
+    ASSET_SDK_V905_AST2700A1 = Asset(
+            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-default-obmc.tar.gz',
+            'c1f4496aec06743c812a6e9a1a18d032f34d62f3ddb6956e924fef62aa2046a5')
+
     def start_ast2700_test(self, name):
         num_cpu = 4
         uboot_size = os.path.getsize(self.scratch_file(name,
@@ -95,6 +99,12 @@ def test_aarch64_ast2700_evb_sdk_v09_05(self):
         self.archive_extract(self.ASSET_SDK_V905_AST2700)
         self.start_ast2700_test('ast2700-a0-default')
 
+    def test_aarch64_ast2700a1_evb_sdk_v09_05(self):
+        self.set_machine('ast2700a1-evb')
+
+        self.archive_extract(self.ASSET_SDK_V905_AST2700A1)
+        self.start_ast2700_test('ast2700-default')
+
 
 if __name__ == '__main__':
     QemuSystemTest.main()
-- 
2.34.1

[PATCH v4 23/23] docs/specs: Add aspeed-intc

[Jamin Lin via]

Add AST2700 INTC design guidance and its block diagram.

Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
---
 docs/specs/aspeed-intc.rst | 136 +++++++++++++++++++++++++++++++++++++
 docs/specs/index.rst       |   1 +
 2 files changed, 137 insertions(+)
 create mode 100644 docs/specs/aspeed-intc.rst

diff --git a/docs/specs/aspeed-intc.rst b/docs/specs/aspeed-intc.rst
new file mode 100644
index 0000000000..9cefd7f37f
--- /dev/null
+++ b/docs/specs/aspeed-intc.rst
@@ -0,0 +1,136 @@
+===========================
+ASPEED Interrupt Controller
+===========================
+
+AST2700
+-------
+There are a total of 480 interrupt sources in AST2700. Due to the limitation of
+interrupt numbers of processors, the interrupts are merged every 32 sources for
+interrupt numbers greater than 127.
+
+There are two levels of interrupt controllers, INTC (CPU Die) and INTCIO
+(I/O Die).
+
+Interrupt Mapping
+-----------------
+- INTC: Handles interrupt sources 0 - 127 and integrates signals from INTCIO.
+- INTCIO: Handles interrupt sources 128 - 319 independently.
+
+QEMU Support
+------------
+Currently, only GIC 192 to 201 are supported, and their source interrupts are
+from INTCIO and connected to INTC at input pin 0 and output pins 0 to 9 for
+GIC 192-201.
+
+Design for GICINT 196
+---------------------
+The orgate has interrupt sources ranging from 0 to 31, with its output pin
+connected to INTCIO "T0 GICINT_196". The output pin is then connected to INTC
+"GIC_192_201" at bit 4, and its bit 4 output pin is connected to GIC 196.
+
+INTC GIC_192_201 Output Pin Mapping
+-----------------------------------
+The design of INTC GIC_192_201 have 10 output pins, mapped as following:
+
+====  ====
+Bit   GIC
+====  ====
+0     192
+1     193
+2     194
+3     195
+4     196
+5     197
+6     198
+7     199
+8     200
+9     201
+====  ====
+
+AST2700 A0
+----------
+It has only one INTC controller, and currently, only GIC 128-136 is supported.
+To support both AST2700 A1 and AST2700 A0, there are 10 OR gates in the INTC,
+with gates 1 to 9 supporting GIC 128-136.
+
+Design for GICINT 132
+---------------------
+The orgate has interrupt sources ranging from 0 to 31, with its output pin
+connected to INTC. The output pin is then connected to GIC 132.
+
+Block Diagram of GICINT 196 for AST2700 A1 and GICINT 132 for AST2700 A0
+------------------------------------------------------------------------
+
+.. code-block::
+
+   |-------------------------------------------------------------------------------------------------------|
+   |                                                   AST2700 A1 Design                                   |
+   |           To GICINT196                                                                                |
+   |                                                                                                       |
+   |   ETH1    |-----------|                    |--------------------------|        |--------------|       |
+   |  -------->|0          |                    |         INTCIO           |        |  orgates[0]  |       |
+   |   ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|------->| 0            |       |
+   |  -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|------->| 1            |       |
+   |   ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|------->| 2            |       |
+   |  -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|------->| 3  OR[0:9]   |-----| |
+   |   UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|------->| 4            |     | |
+   |  -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|------->| 5            |     | |
+   |   UART1   |         22|   orgates[6]------>|inpin[6]-------->outpin[6]|------->| 6            |     | |
+   |  -------->|8        23|   orgates[7]------>|inpin[7]-------->outpin[7]|------->| 7            |     | |
+   |   UART2   |         24|   orgates[8]------>|inpin[8]-------->outpin[8]|------->| 8            |     | |
+   |  -------->|9        25|   orgates[9]------>|inpin[9]-------->outpin[9]|------->| 9            |     | |
+   |   UART3   |         26|                    |--------------------------|        |--------------|     | |
+   |  ---------|10       27|                                                                             | |
+   |   UART5   |         28|                                                                             | |
+   |  -------->|11       29|                                                                             | |
+   |   UART6   |           |                                                                             | |
+   |  -------->|12       30|     |-----------------------------------------------------------------------| |
+   |   UART7   |         31|     |                                                                         |
+   |  -------->|13         |     |                                                                         |
+   |   UART8   |  OR[0:31] |     |                |------------------------------|           |----------|  |
+   |  -------->|14         |     |                |            INTC              |           |     GIC  |  |
+   |   UART9   |           |     |                |inpin[0:0]--------->outpin[0] |---------->|192       |  |
+   |  -------->|15         |     |                |inpin[0:1]--------->outpin[1] |---------->|193       |  |
+   |   UART10  |           |     |                |inpin[0:2]--------->outpin[2] |---------->|194       |  |
+   |  -------->|16         |     |                |inpin[0:3]--------->outpin[3] |---------->|195       |  |
+   |   UART11  |           |     |--------------> |inpin[0:4]--------->outpin[4] |---------->|196       |  |
+   |  -------->|17         |                      |inpin[0:5]--------->outpin[5] |---------->|197       |  |
+   |   UART12  |           |                      |inpin[0:6]--------->outpin[6] |---------->|198       |  |
+   |  -------->|18         |                      |inpin[0:7]--------->outpin[7] |---------->|199       |  |
+   |           |-----------|                      |inpin[0:8]--------->outpin[8] |---------->|200       |  |
+   |                                              |inpin[0:9]--------->outpin[9] |---------->|201       |  |
+   |-------------------------------------------------------------------------------------------------------|
+   |-------------------------------------------------------------------------------------------------------|
+   |  ETH1    |-----------|     orgates[1]------->|inpin[1]----------->outpin[10]|---------->|128       |  |
+   | -------->|0          |     orgates[2]------->|inpin[2]----------->outpin[11]|---------->|129       |  |
+   |  ETH2    |          4|     orgates[3]------->|inpin[3]----------->outpin[12]|---------->|130       |  |
+   | -------->|1         5|     orgates[4]------->|inpin[4]----------->outpin[13]|---------->|131       |  |
+   |  ETH3    |          6|---->orgates[5]------->|inpin[5]----------->outpin[14]|---------->|132       |  |
+   | -------->|2        19|     orgates[6]------->|inpin[6]----------->outpin[15]|---------->|133       |  |
+   |  UART0   |         20|     orgates[7]------->|inpin[7]----------->outpin[16]|---------->|134       |  |
+   | -------->|7        21|     orgates[8]------->|inpin[8]----------->outpin[17]|---------->|135       |  |
+   |  UART1   |         22|     orgates[9]------->|inpin[9]----------->outpin[18]|---------->|136       |  |
+   | -------->|8        23|                       |------------------------------|           |----------|  |
+   |  UART2   |         24|                                                                                |
+   | -------->|9        25|                       AST2700 A0 Design                                        |
+   |  UART3   |         26|                                                                                |
+   | -------->|10       27|                                                                                |
+   |  UART5   |         28|                                                                                |
+   | -------->|11       29| GICINT132                                                                      |
+   |  UART6   |           |                                                                                |
+   | -------->|12       30|                                                                                |
+   |  UART7   |         31|                                                                                |
+   | -------->|13         |                                                                                |
+   |  UART8   |  OR[0:31] |                                                                                |
+   | -------->|14         |                                                                                |
+   |  UART9   |           |                                                                                |
+   | -------->|15         |                                                                                |
+   |  UART10  |           |                                                                                |
+   | -------->|16         |                                                                                |
+   |  UART11  |           |                                                                                |
+   | -------->|17         |                                                                                |
+   |  UART12  |           |                                                                                |
+   | -------->|18         |                                                                                |
+   |          |-----------|                                                                                |
+   |                                                                                                       |
+   |-------------------------------------------------------------------------------------------------------|
diff --git a/docs/specs/index.rst b/docs/specs/index.rst
index d7675cebc2..f19d73c9f6 100644
--- a/docs/specs/index.rst
+++ b/docs/specs/index.rst
@@ -38,3 +38,4 @@ guest hardware that is specific to QEMU.
    rocker
    riscv-iommu
    riscv-aia
+   aspeed-intc
-- 
2.34.1

Re: [PATCH v4 02/23] hw/intc/aspeed: Support setting different register sizes

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Currently, the size of the regs array is 0x2000, which is too large. So far,
> it only use GICINT128 - GICINT134, and the offsets from 0 to 0x1000 are unused.
> To save code size, introduce a new class attribute "reg_size" to set the
> different register sizes for the INTC models in AST2700 and add a regs
> sub-region in the memory container.
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   include/hw/intc/aspeed_intc.h | 1 +
>   hw/intc/aspeed_intc.c         | 8 +++++---
>   2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
> index 03324f05ab..ecaeb15aea 100644
> --- a/include/hw/intc/aspeed_intc.h
> +++ b/include/hw/intc/aspeed_intc.h
> @@ -42,6 +42,7 @@ struct AspeedINTCClass {
>       uint32_t num_lines;
>       uint32_t num_ints;
>       uint64_t mem_size;
> +    uint64_t reg_size;
>   };
>   
>   #endif /* ASPEED_INTC_H */
> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
> index 033b574c1e..316885a27a 100644
> --- a/hw/intc/aspeed_intc.c
> +++ b/hw/intc/aspeed_intc.c
> @@ -117,10 +117,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>   static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
>   {
>       AspeedINTCState *s = ASPEED_INTC(opaque);
> +    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
>       uint32_t addr = offset >> 2;

'addr' is a confusing name. As it is used as a register index, I think
'reg' would be more appropriate.

>       uint32_t value = 0;
>   
> -    if (addr >= ASPEED_INTC_NR_REGS) {
> +    if (offset >= aic->reg_size) {

This is a useless test since the memory region 's->iomem' is
initialized below with size 'aic->reg_size'.

>           qemu_log_mask(LOG_GUEST_ERROR,
>                         "%s: Out-of-bounds read at offset 0x%" HWADDR_PRIx "\n",
>                         __func__, offset);
> @@ -143,7 +144,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
>       uint32_t change;
>       uint32_t irq;
>   
> -    if (addr >= ASPEED_INTC_NR_REGS) {
> +    if (offset >= aic->reg_size) {
>           qemu_log_mask(LOG_GUEST_ERROR,
>                         "%s: Out-of-bounds write at offset 0x%" HWADDR_PRIx "\n",
>                         __func__, offset);
> @@ -308,7 +309,7 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
>       sysbus_init_mmio(sbd, &s->iomem_container);
>   
>       memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
> -                          TYPE_ASPEED_INTC ".regs", ASPEED_INTC_NR_REGS << 2);
> +                          TYPE_ASPEED_INTC ".regs", aic->reg_size);>   
>       memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
>   
> @@ -351,6 +352,7 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
>       aic->num_lines = 32;
>       aic->num_ints = 9;
>       aic->mem_size = 0x4000;
> +    aic->reg_size = 0x2000;

the model still uses ASPEED_INTC_NR_REGS in :

     struct AspeedINTCState {
         ...
         uint32_t regs[ASPEED_INTC_NR_REGS];
         ...

which is redundant and error prone IMO.

Thanks,

C.


C.

Re: [PATCH v4 03/23] hw/intc/aspeed: Reduce regs array size by adding a register sub-region

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Currently, the size of the "regs" array is 0x2000, which is too large. So far,
> it only uses "GICINT128 to `GICINT134", and the offsets from 0 to 0x1000 are
> unused. To save code size and avoid mapping large unused gaps, update to only
> map the useful set of registers:
> 
> INTC register [0x1000 – 0x1804]
> 
> Update "reg_size" to 0x808. Introduce a new class attribute "reg_offset" to set
> the start offset of a "INTC" sub-region. Set the "reg_offset" to 0x1000 for INTC
> registers.
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   include/hw/intc/aspeed_intc.h |  3 ++-
>   hw/intc/aspeed_intc.c         | 50 ++++++++++++++++++++---------------
>   2 files changed, 31 insertions(+), 22 deletions(-)
> 
> diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
> index ecaeb15aea..18ca405336 100644
> --- a/include/hw/intc/aspeed_intc.h
> +++ b/include/hw/intc/aspeed_intc.h
> @@ -16,7 +16,7 @@
>   #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
>   OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
>   
> -#define ASPEED_INTC_NR_REGS (0x2000 >> 2)
> +#define ASPEED_INTC_NR_REGS (0x808 >> 2)

We should allocate the regs[] array using aic->reg_size to avoid
redundancy.


Thanks,

C.




>   #define ASPEED_INTC_NR_INTS 9
>   
>   struct AspeedINTCState {
> @@ -43,6 +43,7 @@ struct AspeedINTCClass {
>       uint32_t num_ints;
>       uint64_t mem_size;
>       uint64_t reg_size;
> +    uint64_t reg_offset;
>   };
>   
>   #endif /* ASPEED_INTC_H */
> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
> index 316885a27a..0f630ffab7 100644
> --- a/hw/intc/aspeed_intc.c
> +++ b/hw/intc/aspeed_intc.c
> @@ -14,25 +14,31 @@
>   #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)
> +/*
> + * INTC Registers
> + *
> + * values below are offset by - 0x1000 from datasheet
> + * because its memory region is start at 0x1000
> + *
> + */
> +REG32(GICINT128_EN,         0x000)
> +REG32(GICINT128_STATUS,     0x004)
> +REG32(GICINT129_EN,         0x100)
> +REG32(GICINT129_STATUS,     0x104)
> +REG32(GICINT130_EN,         0x200)
> +REG32(GICINT130_STATUS,     0x204)
> +REG32(GICINT131_EN,         0x300)
> +REG32(GICINT131_STATUS,     0x304)
> +REG32(GICINT132_EN,         0x400)
> +REG32(GICINT132_STATUS,     0x404)
> +REG32(GICINT133_EN,         0x500)
> +REG32(GICINT133_STATUS,     0x504)
> +REG32(GICINT134_EN,         0x600)
> +REG32(GICINT134_STATUS,     0x604)
> +REG32(GICINT135_EN,         0x700)
> +REG32(GICINT135_STATUS,     0x704)
> +REG32(GICINT136_EN,         0x800)
> +REG32(GICINT136_STATUS,     0x804)
>   
>   #define GICINT_STATUS_BASE     R_GICINT128_STATUS
>   
> @@ -311,7 +317,8 @@ static void aspeed_intc_realize(DeviceState *dev, Error **errp)
>       memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
>                             TYPE_ASPEED_INTC ".regs", aic->reg_size);
>   
> -    memory_region_add_subregion(&s->iomem_container, 0x0, &s->iomem);
> +    memory_region_add_subregion(&s->iomem_container, aic->reg_offset,
> +                                &s->iomem);
>   
>       qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_ints);
>   
> @@ -352,7 +359,8 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
>       aic->num_lines = 32;
>       aic->num_ints = 9;
>       aic->mem_size = 0x4000;
> -    aic->reg_size = 0x2000;
> +    aic->reg_size = 0x808;
> +    aic->reg_offset = 0x1000;
>   }
>   
>   static const TypeInfo aspeed_2700_intc_info = {

Re: [PATCH v4 06/23] hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> 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>
> ---
>   hw/arm/aspeed.c         | 9 +++++----
>   hw/arm/aspeed_ast27x0.c | 8 ++++----
>   2 files changed, 9 insertions(+), 8 deletions(-)
> 
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index c6c18596d6..2482f05154 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -1673,12 +1673,13 @@ static void ast2700_evb_i2c_init(AspeedMachineState *bmc)
>                               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);
>       AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
>   
> -    mc->desc = "Aspeed AST2700 EVB (Cortex-A35)";
> +    mc->desc = "Aspeed AST2700 A0 EVB (Cortex-A35)";
> +    mc->alias = "ast2700-evb";

please put the ->alias assignment line first. So that it is
easily identified.

Thanks,

C.



>       amc->soc_name  = "ast2700-a0";
>       amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
>       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,
>   #ifdef TARGET_AARCH64
>       }, {
> -        .name          = MACHINE_TYPE_NAME("ast2700-evb"),
> +        .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
>           .parent        = TYPE_ASPEED_MACHINE,
> -        .class_init    = aspeed_machine_ast2700_evb_class_init,
> +        .class_init    = aspeed_machine_ast2700a0_evb_class_init,
>   #endif
>       }, {
>           .name          = TYPE_ASPEED_MACHINE,
> diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
> index 527a5f8245..f1beea7ece 100644
> --- a/hw/arm/aspeed_ast27x0.c
> +++ b/hw/arm/aspeed_ast27x0.c
> @@ -73,7 +73,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
>   #define AST2700_MAX_IRQ 256
>   
>   /* 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_UART1]     = 132,
>       [ASPEED_DEV_UART2]     = 132,
> @@ -762,7 +762,7 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
>       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[] = {
>           ARM_CPU_TYPE_NAME("cortex-a35"),
> @@ -785,7 +785,7 @@ static void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data)
>       sc->uarts_num    = 13;
>       sc->num_cpus     = 4;
>       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->get_irq      = aspeed_soc_ast2700_get_irq;
>   }
> @@ -800,7 +800,7 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
>           .name           = "ast2700-a0",
>           .parent         = TYPE_ASPEED27X0_SOC,
>           .instance_init  = aspeed_soc_ast2700_init,
> -        .class_init     = aspeed_soc_ast2700_class_init,
> +        .class_init     = aspeed_soc_ast2700a0_class_init,
>       },
>   };
>   

Re: [PATCH v4 20/23] tests/functional/aspeed: Introduce start_ast2700_test API and update hwmon path

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Added a new method "start_ast2700_test" to the "AST2x00MachineSDK" class and
> this method centralizes the logic for starting the AST2700 test, making it
> reusable for different test cases.
> 
> Modified the hwmon path to use a wildcard to handle different SDK versions:
> "cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input".

Please split in two patches.


Thanks,

C.


> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   tests/functional/test_aarch64_aspeed.py | 33 +++++++++++++------------
>   1 file changed, 17 insertions(+), 16 deletions(-)
> 
> diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
> index 9595498ace..07b0c7c1fd 100755
> --- a/tests/functional/test_aarch64_aspeed.py
> +++ b/tests/functional/test_aarch64_aspeed.py
> @@ -31,33 +31,29 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
>               'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
>               '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
>   
> -    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> -        self.set_machine('ast2700-evb')
> -
> -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> -
> +    def start_ast2700_test(self, name):
>           num_cpu = 4
> -        uboot_size = os.path.getsize(self.scratch_file('ast2700-default',
> +        uboot_size = os.path.getsize(self.scratch_file(name,
>                                                          'u-boot-nodtb.bin'))
>           uboot_dtb_load_addr = hex(0x400000000 + uboot_size)
>   
>           load_images_list = [
>               {
>                   'addr': '0x400000000',
> -                'file': self.scratch_file('ast2700-default',
> +                'file': self.scratch_file(name,
>                                             'u-boot-nodtb.bin')
>               },
>               {
>                   'addr': str(uboot_dtb_load_addr),
> -                'file': self.scratch_file('ast2700-default', 'u-boot.dtb')
> +                'file': self.scratch_file(name, 'u-boot.dtb')
>               },
>               {
>                   'addr': '0x430000000',
> -                'file': self.scratch_file('ast2700-default', 'bl31.bin')
> +                'file': self.scratch_file(name, 'bl31.bin')
>               },
>               {
>                   'addr': '0x430080000',
> -                'file': self.scratch_file('ast2700-default', 'optee',
> +                'file': self.scratch_file(name, 'optee',
>                                             'tee-raw.bin')
>               }
>           ]
> @@ -76,23 +72,28 @@ def test_aarch64_ast2700_evb_sdk_v09_03(self):
>           self.vm.add_args('-device',
>                            'tmp105,bus=aspeed.i2c.bus.1,address=0x4d,id=tmp-test')
>           self.do_test_aarch64_aspeed_sdk_start(
> -            self.scratch_file('ast2700-default', 'image-bmc'))
> +            self.scratch_file(name, 'image-bmc'))
>   
> -        wait_for_console_pattern(self, 'ast2700-default login:')
> +        wait_for_console_pattern(self, f'{name} login:')
>   
>           exec_command_and_wait_for_pattern(self, 'root', 'Password:')
> -        exec_command_and_wait_for_pattern(self,
> -            '0penBmc', 'root@ast2700-default:~#')
> +        exec_command_and_wait_for_pattern(self, '0penBmc', f'root@{name}:~#')
>   
>           exec_command_and_wait_for_pattern(self,
>               'echo lm75 0x4d > /sys/class/i2c-dev/i2c-1/device/new_device ',
>               'i2c i2c-1: new_device: Instantiated device lm75 at 0x4d');
>           exec_command_and_wait_for_pattern(self,
> -            'cat /sys/class/hwmon/hwmon20/temp1_input', '0')
> +            'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0')
>           self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
>                       property='temperature', value=18000)
>           exec_command_and_wait_for_pattern(self,
> -            'cat /sys/class/hwmon/hwmon20/temp1_input', '18000')
> +            'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
> +
> +    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> +        self.set_machine('ast2700-evb')
> +
> +        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> +        self.start_ast2700_test('ast2700-default')
>   
>   
>   if __name__ == '__main__':

Re: [PATCH v4 21/23] tests/functional/aspeed: Update test ASPEED SDK v09.05

[Cédric Le Goater]

May be add a little comment about the new ast2700-a0-default OpenBMC
build in v09.05.

On 3/3/25 10:54, Jamin Lin wrote:
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   tests/functional/test_aarch64_aspeed.py | 12 ++++++------
>   1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
> index 07b0c7c1fd..8df6a97a28 100755
> --- a/tests/functional/test_aarch64_aspeed.py
> +++ b/tests/functional/test_aarch64_aspeed.py
> @@ -27,9 +27,9 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
>           wait_for_console_pattern(self, '## Loading kernel from FIT Image')
>           wait_for_console_pattern(self, 'Starting kernel ...')
>   
> -    ASSET_SDK_V903_AST2700 = Asset(
> -            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast2700-default-obmc.tar.gz',
> -            '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77')
> +    ASSET_SDK_V905_AST2700 = Asset(
> +            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-a0-default-obmc.tar.gz',
> +            'cfbbd1cce72f2a3b73b9080c41eecdadebb7077fba4f7806d72ac99f3e84b74a')
>   
>       def start_ast2700_test(self, name):
>           num_cpu = 4
> @@ -89,11 +89,11 @@ def start_ast2700_test(self, name):
>           exec_command_and_wait_for_pattern(self,
>               'cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
>   
> -    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> +    def test_aarch64_ast2700_evb_sdk_v09_05(self):
>           self.set_machine('ast2700-evb')
>   
> -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> -        self.start_ast2700_test('ast2700-default')
> +        self.archive_extract(self.ASSET_SDK_V905_AST2700)
> +        self.start_ast2700_test('ast2700-a0-default')
>   
>   
>   if __name__ == '__main__':

Re: [PATCH v4 22/23] tests/functional/aspeed: Add test case for AST2700 A1

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   tests/functional/test_aarch64_aspeed.py | 10 ++++++++++
>   1 file changed, 10 insertions(+)
> 
> diff --git a/tests/functional/test_aarch64_aspeed.py b/tests/functional/test_aarch64_aspeed.py
> index 8df6a97a28..c25c966278 100755
> --- a/tests/functional/test_aarch64_aspeed.py
> +++ b/tests/functional/test_aarch64_aspeed.py
> @@ -31,6 +31,10 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
>               'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-a0-default-obmc.tar.gz',
>               'cfbbd1cce72f2a3b73b9080c41eecdadebb7077fba4f7806d72ac99f3e84b74a')
>   
> +    ASSET_SDK_V905_AST2700A1 = Asset(
> +            'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast2700-default-obmc.tar.gz',
> +            'c1f4496aec06743c812a6e9a1a18d032f34d62f3ddb6956e924fef62aa2046a5')
> +
>       def start_ast2700_test(self, name):
>           num_cpu = 4
>           uboot_size = os.path.getsize(self.scratch_file(name,
> @@ -95,6 +99,12 @@ def test_aarch64_ast2700_evb_sdk_v09_05(self):
>           self.archive_extract(self.ASSET_SDK_V905_AST2700)
>           self.start_ast2700_test('ast2700-a0-default')
>   
> +    def test_aarch64_ast2700a1_evb_sdk_v09_05(self):
> +        self.set_machine('ast2700a1-evb')
> +
> +        self.archive_extract(self.ASSET_SDK_V905_AST2700A1)
> +        self.start_ast2700_test('ast2700-default')
> +
>   
>   if __name__ == '__main__':
>       QemuSystemTest.main()

Re: [PATCH v4 19/23] hw/arm/aspeed: Add SoC and Machine Support for AST2700 A1

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> The memory map for AST2700 A1 remains compatible with AST2700 A0. However, the
> IRQ mapping has been updated for AST2700 A1, with GIC interrupts now ranging
> from 192 to 201. Add a new IRQ map table for AST2700 A1.
> Add "aspeed_soc_ast2700a1_class_init" to initialize the AST2700 A1 SoC.
> Introduce "aspeed_machine_ast2700a1_evb_class_init" to initialize the
> AST2700 A1 EVB.

This could have been 2 patches.  Minor.
  
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>

Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   hw/arm/aspeed.c         | 24 +++++++++++++
>   hw/arm/aspeed_ast27x0.c | 80 +++++++++++++++++++++++++++++++++++++++++
>   2 files changed, 104 insertions(+)
> 
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 2482f05154..aaf63022ff 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -1693,6 +1693,26 @@ static void aspeed_machine_ast2700a0_evb_class_init(ObjectClass *oc, void *data)
>       mc->default_ram_size = 1 * GiB;
>       aspeed_machine_class_init_cpus_defaults(mc);
>   }
> +
> +static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc, void *data)
> +{
> +    MachineClass *mc = MACHINE_CLASS(oc);
> +    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> +
> +    mc->desc = "Aspeed AST2700 A1 EVB (Cortex-A35)";
> +    amc->soc_name  = "ast2700-a1";
> +    amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
> +    amc->hw_strap2 = AST2700_EVB_HW_STRAP2;
> +    amc->fmc_model = "w25q01jvq";
> +    amc->spi_model = "w25q512jv";
> +    amc->num_cs    = 2;
> +    amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON;
> +    amc->uart_default = ASPEED_DEV_UART12;
> +    amc->i2c_init  = ast2700_evb_i2c_init;
> +    mc->auto_create_sdcard = true;
> +    mc->default_ram_size = 1 * GiB;
> +    aspeed_machine_class_init_cpus_defaults(mc);
> +}
>   #endif
>   
>   static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass *oc,
> @@ -1821,6 +1841,10 @@ static const TypeInfo aspeed_machine_types[] = {
>           .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
>           .parent        = TYPE_ASPEED_MACHINE,
>           .class_init    = aspeed_machine_ast2700a0_evb_class_init,
> +        }, {
> +        .name          = MACHINE_TYPE_NAME("ast2700a1-evb"),
> +        .parent        = TYPE_ASPEED_MACHINE,
> +        .class_init    = aspeed_machine_ast2700a1_evb_class_init,
>   #endif
>       }, {
>           .name          = TYPE_ASPEED_MACHINE,
> diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
> index 028bf08d0e..6d80b54470 100644
> --- a/hw/arm/aspeed_ast27x0.c
> +++ b/hw/arm/aspeed_ast27x0.c
> @@ -120,6 +120,52 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
>       [ASPEED_DEV_SDHCI]     = 133,
>   };
>   
> +static const int aspeed_soc_ast2700a1_irqmap[] = {
> +    [ASPEED_DEV_SDMC]      = 0,
> +    [ASPEED_DEV_HACE]      = 4,
> +    [ASPEED_DEV_XDMA]      = 5,
> +    [ASPEED_DEV_UART4]     = 8,
> +    [ASPEED_DEV_SCU]       = 12,
> +    [ASPEED_DEV_RTC]       = 13,
> +    [ASPEED_DEV_EMMC]      = 15,
> +    [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_DP]        = 28,
> +    [ASPEED_DEV_LPC]       = 192,
> +    [ASPEED_DEV_IBT]       = 192,
> +    [ASPEED_DEV_KCS]       = 192,
> +    [ASPEED_DEV_I2C]       = 194,
> +    [ASPEED_DEV_ADC]       = 194,
> +    [ASPEED_DEV_GPIO]      = 194,
> +    [ASPEED_DEV_FMC]       = 195,
> +    [ASPEED_DEV_WDT]       = 195,
> +    [ASPEED_DEV_PWM]       = 195,
> +    [ASPEED_DEV_I3C]       = 195,
> +    [ASPEED_DEV_UART0]     = 196,
> +    [ASPEED_DEV_UART1]     = 196,
> +    [ASPEED_DEV_UART2]     = 196,
> +    [ASPEED_DEV_UART3]     = 196,
> +    [ASPEED_DEV_UART5]     = 196,
> +    [ASPEED_DEV_UART6]     = 196,
> +    [ASPEED_DEV_UART7]     = 196,
> +    [ASPEED_DEV_UART8]     = 196,
> +    [ASPEED_DEV_UART9]     = 196,
> +    [ASPEED_DEV_UART10]    = 196,
> +    [ASPEED_DEV_UART11]    = 196,
> +    [ASPEED_DEV_UART12]    = 196,
> +    [ASPEED_DEV_ETH1]      = 196,
> +    [ASPEED_DEV_ETH2]      = 196,
> +    [ASPEED_DEV_ETH3]      = 196,
> +    [ASPEED_DEV_PECI]      = 197,
> +    [ASPEED_DEV_SDHCI]     = 197,
> +};
> +
>   /* GICINT 128 */
>   /* GICINT 192 */
>   static const int ast2700_gic128_gic192_intcmap[] = {
> @@ -860,6 +906,34 @@ static void aspeed_soc_ast2700a0_class_init(ObjectClass *oc, void *data)
>       sc->get_irq      = aspeed_soc_ast2700_get_irq;
>   }
>   
> +static void aspeed_soc_ast2700a1_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-a1";
> +    sc->valid_cpu_types = valid_cpu_types;
> +    sc->silicon_rev  = AST2700_A1_SILICON_REV;
> +    sc->sram_size    = 0x20000;
> +    sc->spis_num     = 3;
> +    sc->wdts_num     = 8;
> +    sc->macs_num     = 3;
> +    sc->uarts_num    = 13;
> +    sc->num_cpus     = 4;
> +    sc->uarts_base   = ASPEED_DEV_UART0;
> +    sc->irqmap       = aspeed_soc_ast2700a1_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,
> @@ -872,6 +946,12 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
>           .instance_init  = aspeed_soc_ast2700_init,
>           .class_init     = aspeed_soc_ast2700a0_class_init,
>       },
> +    {
> +        .name           = "ast2700-a1",
> +        .parent         = TYPE_ASPEED27X0_SOC,
> +        .instance_init  = aspeed_soc_ast2700_init,
> +        .class_init     = aspeed_soc_ast2700a1_class_init,
> +    },
>   };
>   
>   DEFINE_TYPES(aspeed_soc_ast27x0_types)

RE: [PATCH v4 06/23] hw/arm/aspeed: Rename IRQ table and machine name for AST2700 A0

[Jamin Lin]

Hi Cedric, 

> Subject: Re: [PATCH v4 06/23] hw/arm/aspeed: Rename IRQ table and machine
> name for AST2700 A0
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > 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>
> > ---
> >   hw/arm/aspeed.c         | 9 +++++----
> >   hw/arm/aspeed_ast27x0.c | 8 ++++----
> >   2 files changed, 9 insertions(+), 8 deletions(-)
> >
> > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index
> > c6c18596d6..2482f05154 100644
> > --- a/hw/arm/aspeed.c
> > +++ b/hw/arm/aspeed.c
> > @@ -1673,12 +1673,13 @@ static void
> ast2700_evb_i2c_init(AspeedMachineState *bmc)
> >                               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);
> >       AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> >
> > -    mc->desc = "Aspeed AST2700 EVB (Cortex-A35)";
> > +    mc->desc = "Aspeed AST2700 A0 EVB (Cortex-A35)";
> > +    mc->alias = "ast2700-evb";
> 
> please put the ->alias assignment line first. So that it is easily identified.
> 
Thanks for your review and suggestion.
Will fix it.
Jamin
> Thanks,
> 
> C.
> 
> 
> 
> >       amc->soc_name  = "ast2700-a0";
> >       amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
> >       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,
> >   #ifdef TARGET_AARCH64
> >       }, {
> > -        .name          = MACHINE_TYPE_NAME("ast2700-evb"),
> > +        .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
> >           .parent        = TYPE_ASPEED_MACHINE,
> > -        .class_init    = aspeed_machine_ast2700_evb_class_init,
> > +        .class_init    = aspeed_machine_ast2700a0_evb_class_init,
> >   #endif
> >       }, {
> >           .name          = TYPE_ASPEED_MACHINE,
> > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index
> > 527a5f8245..f1beea7ece 100644
> > --- a/hw/arm/aspeed_ast27x0.c
> > +++ b/hw/arm/aspeed_ast27x0.c
> > @@ -73,7 +73,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] =
> {
> >   #define AST2700_MAX_IRQ 256
> >
> >   /* 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_UART1]     = 132,
> >       [ASPEED_DEV_UART2]     = 132,
> > @@ -762,7 +762,7 @@ static void aspeed_soc_ast2700_realize(DeviceState
> *dev, Error **errp)
> >       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[] = {
> >           ARM_CPU_TYPE_NAME("cortex-a35"), @@ -785,7 +785,7 @@
> static
> > void aspeed_soc_ast2700_class_init(ObjectClass *oc, void *data)
> >       sc->uarts_num    = 13;
> >       sc->num_cpus     = 4;
> >       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->get_irq      = aspeed_soc_ast2700_get_irq;
> >   }
> > @@ -800,7 +800,7 @@ static const TypeInfo aspeed_soc_ast27x0_types[] = {
> >           .name           = "ast2700-a0",
> >           .parent         = TYPE_ASPEED27X0_SOC,
> >           .instance_init  = aspeed_soc_ast2700_init,
> > -        .class_init     = aspeed_soc_ast2700_class_init,
> > +        .class_init     = aspeed_soc_ast2700a0_class_init,
> >       },
> >   };
> >

RE: [PATCH v4 20/23] tests/functional/aspeed: Introduce start_ast2700_test API and update hwmon path

[Jamin Lin]

Hi Cedric, 
> Subject: Re: [PATCH v4 20/23] tests/functional/aspeed: Introduce
> start_ast2700_test API and update hwmon path
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > Added a new method "start_ast2700_test" to the "AST2x00MachineSDK"
> > class and this method centralizes the logic for starting the AST2700
> > test, making it reusable for different test cases.
> >
> > Modified the hwmon path to use a wildcard to handle different SDK versions:
> > "cat /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input".
> 
> Please split in two patches.
> 
Thanks for suggestion and review.
Will do
Jamin
> 
> Thanks,
> 
> C.
> 
> 
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   tests/functional/test_aarch64_aspeed.py | 33 +++++++++++++------------
> >   1 file changed, 17 insertions(+), 16 deletions(-)
> >
> > diff --git a/tests/functional/test_aarch64_aspeed.py
> > b/tests/functional/test_aarch64_aspeed.py
> > index 9595498ace..07b0c7c1fd 100755
> > --- a/tests/functional/test_aarch64_aspeed.py
> > +++ b/tests/functional/test_aarch64_aspeed.py
> > @@ -31,33 +31,29 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
> >
> 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast
> 2700-default-obmc.tar.gz',
> >
> >
> '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77'
> )
> >
> > -    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> > -        self.set_machine('ast2700-evb')
> > -
> > -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> > -
> > +    def start_ast2700_test(self, name):
> >           num_cpu = 4
> > -        uboot_size = os.path.getsize(self.scratch_file('ast2700-default',
> > +        uboot_size = os.path.getsize(self.scratch_file(name,
> >
> 'u-boot-nodtb.bin'))
> >           uboot_dtb_load_addr = hex(0x400000000 + uboot_size)
> >
> >           load_images_list = [
> >               {
> >                   'addr': '0x400000000',
> > -                'file': self.scratch_file('ast2700-default',
> > +                'file': self.scratch_file(name,
> >                                             'u-boot-nodtb.bin')
> >               },
> >               {
> >                   'addr': str(uboot_dtb_load_addr),
> > -                'file': self.scratch_file('ast2700-default', 'u-boot.dtb')
> > +                'file': self.scratch_file(name, 'u-boot.dtb')
> >               },
> >               {
> >                   'addr': '0x430000000',
> > -                'file': self.scratch_file('ast2700-default', 'bl31.bin')
> > +                'file': self.scratch_file(name, 'bl31.bin')
> >               },
> >               {
> >                   'addr': '0x430080000',
> > -                'file': self.scratch_file('ast2700-default', 'optee',
> > +                'file': self.scratch_file(name, 'optee',
> >                                             'tee-raw.bin')
> >               }
> >           ]
> > @@ -76,23 +72,28 @@ def test_aarch64_ast2700_evb_sdk_v09_03(self):
> >           self.vm.add_args('-device',
> >
> 'tmp105,bus=aspeed.i2c.bus.1,address=0x4d,id=tmp-test')
> >           self.do_test_aarch64_aspeed_sdk_start(
> > -            self.scratch_file('ast2700-default', 'image-bmc'))
> > +            self.scratch_file(name, 'image-bmc'))
> >
> > -        wait_for_console_pattern(self, 'ast2700-default login:')
> > +        wait_for_console_pattern(self, f'{name} login:')
> >
> >           exec_command_and_wait_for_pattern(self, 'root', 'Password:')
> > -        exec_command_and_wait_for_pattern(self,
> > -            '0penBmc', 'root@ast2700-default:~#')
> > +        exec_command_and_wait_for_pattern(self, '0penBmc',
> > + f'root@{name}:~#')
> >
> >           exec_command_and_wait_for_pattern(self,
> >               'echo lm75 0x4d >
> /sys/class/i2c-dev/i2c-1/device/new_device ',
> >               'i2c i2c-1: new_device: Instantiated device lm75 at 0x4d');
> >           exec_command_and_wait_for_pattern(self,
> > -            'cat /sys/class/hwmon/hwmon20/temp1_input', '0')
> > +            'cat
> > + /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '0')
> >           self.vm.cmd('qom-set', path='/machine/peripheral/tmp-test',
> >                       property='temperature', value=18000)
> >           exec_command_and_wait_for_pattern(self,
> > -            'cat /sys/class/hwmon/hwmon20/temp1_input', '18000')
> > +            'cat
> > + /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
> > +
> > +    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> > +        self.set_machine('ast2700-evb')
> > +
> > +        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> > +        self.start_ast2700_test('ast2700-default')
> >
> >
> >   if __name__ == '__main__':

RE: [PATCH v4 21/23] tests/functional/aspeed: Update test ASPEED SDK v09.05

[Jamin Lin]

Hi Cedric,

> Subject: Re: [PATCH v4 21/23] tests/functional/aspeed: Update test ASPEED
> SDK v09.05
> 
> May be add a little comment about the new ast2700-a0-default OpenBMC
> build in v09.05.
> 
Thanks for your suggestion and review.
I will add the following comments in commit log.
Jamin

In ASPEED SDK v09.05, the naming convention for pre-built images has been
updated. The pre-built image for AST2700 A0 has been renamed to
ast2700-a0-default, while ast2700-default is now used for AST2700 A1.

> On 3/3/25 10:54, Jamin Lin wrote:
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> 
> 
> Reviewed-by: Cédric Le Goater <clg@redhat.com>
> 
> Thanks,
> 
> C.
> 
> 
> > ---
> >   tests/functional/test_aarch64_aspeed.py | 12 ++++++------
> >   1 file changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/tests/functional/test_aarch64_aspeed.py
> > b/tests/functional/test_aarch64_aspeed.py
> > index 07b0c7c1fd..8df6a97a28 100755
> > --- a/tests/functional/test_aarch64_aspeed.py
> > +++ b/tests/functional/test_aarch64_aspeed.py
> > @@ -27,9 +27,9 @@ def do_test_aarch64_aspeed_sdk_start(self, image):
> >           wait_for_console_pattern(self, '## Loading kernel from FIT
> Image')
> >           wait_for_console_pattern(self, 'Starting kernel ...')
> >
> > -    ASSET_SDK_V903_AST2700 = Asset(
> > -
> 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.03/ast
> 2700-default-obmc.tar.gz',
> > -
> '91225f50d255e2905ba8d8e0c80b71b9d157c3609770c7a740cd786370d85a77'
> )
> > +    ASSET_SDK_V905_AST2700 = Asset(
> > +
> 'https://github.com/AspeedTech-BMC/openbmc/releases/download/v09.05/ast
> 2700-a0-default-obmc.tar.gz',
> > +
> > +
> 'cfbbd1cce72f2a3b73b9080c41eecdadebb7077fba4f7806d72ac99f3e84b74a')
> >
> >       def start_ast2700_test(self, name):
> >           num_cpu = 4
> > @@ -89,11 +89,11 @@ def start_ast2700_test(self, name):
> >           exec_command_and_wait_for_pattern(self,
> >               'cat
> > /sys/bus/i2c/devices/1-004d/hwmon/hwmon*/temp1_input', '18000')
> >
> > -    def test_aarch64_ast2700_evb_sdk_v09_03(self):
> > +    def test_aarch64_ast2700_evb_sdk_v09_05(self):
> >           self.set_machine('ast2700-evb')
> >
> > -        self.archive_extract(self.ASSET_SDK_V903_AST2700)
> > -        self.start_ast2700_test('ast2700-default')
> > +        self.archive_extract(self.ASSET_SDK_V905_AST2700)
> > +        self.start_ast2700_test('ast2700-a0-default')
> >
> >
> >   if __name__ == '__main__':

RE: [PATCH v4 19/23] hw/arm/aspeed: Add SoC and Machine Support for AST2700 A1

[Jamin Lin]

Hi Cedric, 

> Subject: Re: [PATCH v4 19/23] hw/arm/aspeed: Add SoC and Machine Support
> for AST2700 A1
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > The memory map for AST2700 A1 remains compatible with AST2700 A0.
> > However, the IRQ mapping has been updated for AST2700 A1, with GIC
> > interrupts now ranging from 192 to 201. Add a new IRQ map table for
> AST2700 A1.
> > Add "aspeed_soc_ast2700a1_class_init" to initialize the AST2700 A1 SoC.
> > Introduce "aspeed_machine_ast2700a1_evb_class_init" to initialize the
> > AST2700 A1 EVB.
> 
> This could have been 2 patches.  Minor.
> 
Thanks for review and suggestion.
I will split 2 patches.
Jamin
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> 
> Reviewed-by: Cédric Le Goater <clg@redhat.com>
> 
> Thanks,
> 
> C.
> 
> 
> > ---
> >   hw/arm/aspeed.c         | 24 +++++++++++++
> >   hw/arm/aspeed_ast27x0.c | 80
> +++++++++++++++++++++++++++++++++++++++++
> >   2 files changed, 104 insertions(+)
> >
> > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index
> > 2482f05154..aaf63022ff 100644
> > --- a/hw/arm/aspeed.c
> > +++ b/hw/arm/aspeed.c
> > @@ -1693,6 +1693,26 @@ static void
> aspeed_machine_ast2700a0_evb_class_init(ObjectClass *oc, void *data)
> >       mc->default_ram_size = 1 * GiB;
> >       aspeed_machine_class_init_cpus_defaults(mc);
> >   }
> > +
> > +static void aspeed_machine_ast2700a1_evb_class_init(ObjectClass *oc,
> > +void *data) {
> > +    MachineClass *mc = MACHINE_CLASS(oc);
> > +    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> > +
> > +    mc->desc = "Aspeed AST2700 A1 EVB (Cortex-A35)";
> > +    amc->soc_name  = "ast2700-a1";
> > +    amc->hw_strap1 = AST2700_EVB_HW_STRAP1;
> > +    amc->hw_strap2 = AST2700_EVB_HW_STRAP2;
> > +    amc->fmc_model = "w25q01jvq";
> > +    amc->spi_model = "w25q512jv";
> > +    amc->num_cs    = 2;
> > +    amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON |
> ASPEED_MAC2_ON;
> > +    amc->uart_default = ASPEED_DEV_UART12;
> > +    amc->i2c_init  = ast2700_evb_i2c_init;
> > +    mc->auto_create_sdcard = true;
> > +    mc->default_ram_size = 1 * GiB;
> > +    aspeed_machine_class_init_cpus_defaults(mc);
> > +}
> >   #endif
> >
> >   static void aspeed_machine_qcom_dc_scm_v1_class_init(ObjectClass
> > *oc, @@ -1821,6 +1841,10 @@ static const TypeInfo
> aspeed_machine_types[] = {
> >           .name          = MACHINE_TYPE_NAME("ast2700a0-evb"),
> >           .parent        = TYPE_ASPEED_MACHINE,
> >           .class_init    = aspeed_machine_ast2700a0_evb_class_init,
> > +        }, {
> > +        .name          = MACHINE_TYPE_NAME("ast2700a1-evb"),
> > +        .parent        = TYPE_ASPEED_MACHINE,
> > +        .class_init    = aspeed_machine_ast2700a1_evb_class_init,
> >   #endif
> >       }, {
> >           .name          = TYPE_ASPEED_MACHINE,
> > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index
> > 028bf08d0e..6d80b54470 100644
> > --- a/hw/arm/aspeed_ast27x0.c
> > +++ b/hw/arm/aspeed_ast27x0.c
> > @@ -120,6 +120,52 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
> >       [ASPEED_DEV_SDHCI]     = 133,
> >   };
> >
> > +static const int aspeed_soc_ast2700a1_irqmap[] = {
> > +    [ASPEED_DEV_SDMC]      = 0,
> > +    [ASPEED_DEV_HACE]      = 4,
> > +    [ASPEED_DEV_XDMA]      = 5,
> > +    [ASPEED_DEV_UART4]     = 8,
> > +    [ASPEED_DEV_SCU]       = 12,
> > +    [ASPEED_DEV_RTC]       = 13,
> > +    [ASPEED_DEV_EMMC]      = 15,
> > +    [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_DP]        = 28,
> > +    [ASPEED_DEV_LPC]       = 192,
> > +    [ASPEED_DEV_IBT]       = 192,
> > +    [ASPEED_DEV_KCS]       = 192,
> > +    [ASPEED_DEV_I2C]       = 194,
> > +    [ASPEED_DEV_ADC]       = 194,
> > +    [ASPEED_DEV_GPIO]      = 194,
> > +    [ASPEED_DEV_FMC]       = 195,
> > +    [ASPEED_DEV_WDT]       = 195,
> > +    [ASPEED_DEV_PWM]       = 195,
> > +    [ASPEED_DEV_I3C]       = 195,
> > +    [ASPEED_DEV_UART0]     = 196,
> > +    [ASPEED_DEV_UART1]     = 196,
> > +    [ASPEED_DEV_UART2]     = 196,
> > +    [ASPEED_DEV_UART3]     = 196,
> > +    [ASPEED_DEV_UART5]     = 196,
> > +    [ASPEED_DEV_UART6]     = 196,
> > +    [ASPEED_DEV_UART7]     = 196,
> > +    [ASPEED_DEV_UART8]     = 196,
> > +    [ASPEED_DEV_UART9]     = 196,
> > +    [ASPEED_DEV_UART10]    = 196,
> > +    [ASPEED_DEV_UART11]    = 196,
> > +    [ASPEED_DEV_UART12]    = 196,
> > +    [ASPEED_DEV_ETH1]      = 196,
> > +    [ASPEED_DEV_ETH2]      = 196,
> > +    [ASPEED_DEV_ETH3]      = 196,
> > +    [ASPEED_DEV_PECI]      = 197,
> > +    [ASPEED_DEV_SDHCI]     = 197,
> > +};
> > +
> >   /* GICINT 128 */
> >   /* GICINT 192 */
> >   static const int ast2700_gic128_gic192_intcmap[] = { @@ -860,6
> > +906,34 @@ static void aspeed_soc_ast2700a0_class_init(ObjectClass *oc,
> void *data)
> >       sc->get_irq      = aspeed_soc_ast2700_get_irq;
> >   }
> >
> > +static void aspeed_soc_ast2700a1_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-a1";
> > +    sc->valid_cpu_types = valid_cpu_types;
> > +    sc->silicon_rev  = AST2700_A1_SILICON_REV;
> > +    sc->sram_size    = 0x20000;
> > +    sc->spis_num     = 3;
> > +    sc->wdts_num     = 8;
> > +    sc->macs_num     = 3;
> > +    sc->uarts_num    = 13;
> > +    sc->num_cpus     = 4;
> > +    sc->uarts_base   = ASPEED_DEV_UART0;
> > +    sc->irqmap       = aspeed_soc_ast2700a1_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,
> > @@ -872,6 +946,12 @@ static const TypeInfo aspeed_soc_ast27x0_types[] =
> {
> >           .instance_init  = aspeed_soc_ast2700_init,
> >           .class_init     = aspeed_soc_ast2700a0_class_init,
> >       },
> > +    {
> > +        .name           = "ast2700-a1",
> > +        .parent         = TYPE_ASPEED27X0_SOC,
> > +        .instance_init  = aspeed_soc_ast2700_init,
> > +        .class_init     = aspeed_soc_ast2700a1_class_init,
> > +    },
> >   };
> >
> >   DEFINE_TYPES(aspeed_soc_ast27x0_types)

Re: [PATCH v4 12/23] hw/intc/aspeed: Introduce AspeedINTCIRQ structure to save the irq index and register address

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> The INTC controller supports GICINT128 to GICINT136, mapping 1:1 to input and
> output IRQs 0 to 8. Previously, the formula "address & 0x0f00" was used to
> derive the IRQ index numbers.
> 
> However, the INTC controller also supports GICINT192_201, mapping 1 input IRQ
> pin to 10 output IRQ pins. The pin numbers for input and output are different.
> It is difficult to use a formula to determine the index number of INTC model
> supported input and output IRQs.
> 
> To simplify and improve readability, introduces the AspeedINTCIRQ structure to
> save the input/output IRQ index and its enable/status register address.
> 
> Introduce the "aspeed_2700_intc_irqs" table to store IRQ information for INTC.
> Introduce the "aspeed_intc_get_irq" function to retrieve the input/output IRQ
> pin index from the provided status/enable register address.
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   include/hw/intc/aspeed_intc.h |  10 +++
>   hw/intc/aspeed_intc.c         | 120 ++++++++++++++++++++--------------
>   2 files changed, 82 insertions(+), 48 deletions(-)
> 
> diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
> index f9a0273f78..112a01f402 100644
> --- a/include/hw/intc/aspeed_intc.h
> +++ b/include/hw/intc/aspeed_intc.h
> @@ -20,6 +20,14 @@ OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
>   #define ASPEED_INTC_MAX_INPINS 9
>   #define ASPEED_INTC_MAX_OUTPINS 9
>   
> +typedef struct AspeedINTCIRQ {
> +    int inpin_idx;
> +    int outpin_idx;
> +    int num_outpins;
> +    uint32_t enable_addr;
> +    uint32_t status_addr;

The _addr suffix is confusing. Doesn't it refer to a register index ?

> +} AspeedINTCIRQ;
> +
>   struct AspeedINTCState {
>       /*< private >*/
>       SysBusDevice parent_obj;
> @@ -47,6 +55,8 @@ struct AspeedINTCClass {
>       uint64_t reg_size;
>       uint64_t reg_offset;
>       const MemoryRegionOps *reg_ops;
> +    const AspeedINTCIRQ *irq_table;
> +    int irq_table_count;
>   };
>   
>   #endif /* ASPEED_INTC_H */
> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
> index 9bc3e089d8..5730a7604d 100644
> --- a/hw/intc/aspeed_intc.c
> +++ b/hw/intc/aspeed_intc.c
> @@ -40,7 +40,23 @@ REG32(GICINT135_STATUS,     0x704)
>   REG32(GICINT136_EN,         0x800)
>   REG32(GICINT136_STATUS,     0x804)
>   
> -#define GICINT_STATUS_BASE     R_GICINT128_STATUS
> +static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
> +                                                uint32_t addr)
> +{
> +    int i;
> +
> +    for (i = 0; i < aic->irq_table_count; i++) {
> +        if (aic->irq_table[i].enable_addr == addr ||
> +            aic->irq_table[i].status_addr == addr) {
> +            return &aic->irq_table[i];
> +        }
> +    }
> +
> +    /*
> +     * Invalid addr.
> +     */
> +    g_assert_not_reached();
> +}
>   
>   /*
>    * Update the state of an interrupt controller pin by setting
> @@ -81,15 +97,10 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>       AspeedINTCState *s = (AspeedINTCState *)opaque;
>       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
>       const char *name = object_get_typename(OBJECT(s));
> -    uint32_t status_addr = GICINT_STATUS_BASE + ((0x100 * irq) >> 2);
> +    const AspeedINTCIRQ *intc_irq;
>       uint32_t select = 0;
>       uint32_t enable;
>       int i;
> -    int inpin_idx;
> -    int outpin_idx;
> -
> -    inpin_idx = irq;
> -    outpin_idx = irq;
>   
>       if (irq >= aic->num_inpins) {
>           qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin index: %d\n",
> @@ -97,15 +108,16 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>           return;
>       }
>   
> -    trace_aspeed_intc_set_irq(name, inpin_idx, level);
> -    enable = s->enable[inpin_idx];
> +    intc_irq = &aic->irq_table[irq];
> +    trace_aspeed_intc_set_irq(name, intc_irq->inpin_idx, level);
> +    enable = s->enable[intc_irq->inpin_idx];
>   
>       if (!level) {
>           return;
>       }
>   
>       for (i = 0; i < aic->num_lines; i++) {
> -        if (s->orgates[inpin_idx].levels[i]) {
> +        if (s->orgates[intc_irq->inpin_idx].levels[i]) {
>               if (enable & BIT(i)) {
>                   select |= BIT(i);
>               }
> @@ -118,7 +130,7 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>   
>       trace_aspeed_intc_select(name, select);
>   
> -    if (s->mask[inpin_idx] || s->regs[status_addr]) {
> +    if (s->mask[intc_irq->inpin_idx] || s->regs[intc_irq->status_addr]) {
>           /*
>            * a. mask is not 0 means in ISR mode
>            * sources interrupt routine are executing.
> @@ -127,17 +139,19 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>            *
>            * save source interrupt to pending variable.
>            */
> -        s->pending[inpin_idx] |= select;
> -        trace_aspeed_intc_pending_irq(name, inpin_idx, s->pending[inpin_idx]);
> +        s->pending[intc_irq->inpin_idx] |= select;
> +        trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
> +                                      s->pending[intc_irq->inpin_idx]);
>       } else {
>           /*
>            * notify firmware which source interrupt are coming
>            * by setting status register
>            */
> -        s->regs[status_addr] = select;
> -        trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
> -                                      s->regs[status_addr]);
> -        aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
> +        s->regs[intc_irq->status_addr] = select;
> +        trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> +                                      intc_irq->outpin_idx,
> +                                      s->regs[intc_irq->status_addr]);
> +        aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
>       }
>   }
>   
> @@ -146,19 +160,17 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
>   {
>       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
>       const char *name = object_get_typename(OBJECT(s));
> +    const AspeedINTCIRQ *intc_irq;
>       uint32_t addr = offset >> 2;
>       uint32_t old_enable;
>       uint32_t change;
> -    uint32_t irq;
> -    int inpin_idx;
>   
> -    irq = (offset & 0x0f00) >> 8;
> -    inpin_idx = irq;
> +    intc_irq = aspeed_intc_get_irq(aic, addr);

I would keep the 'inpin_idx' variable and assign it to 'intc_irq->inpin_idx'.
This would reduce the number of change.


> -    if (inpin_idx >= aic->num_inpins) {
> +    if (intc_irq->inpin_idx >= aic->num_inpins) {

Since both values are defined at compile time, shouldn't that be an assert ?

>           qemu_log_mask(LOG_GUEST_ERROR,
>                         "%s: Invalid input pin index: %d\n",
> -                      __func__, inpin_idx);
> +                      __func__, intc_irq->inpin_idx);
>           return;
>       }
>   
> @@ -169,17 +181,17 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
>        */
>   
>       /* disable all source interrupt */
> -    if (!data && !s->enable[inpin_idx]) {
> +    if (!data && !s->enable[intc_irq->inpin_idx]) {
>           s->regs[addr] = data;
>           return;
>       }
>   
> -    old_enable = s->enable[inpin_idx];
> -    s->enable[inpin_idx] |= data;
> +    old_enable = s->enable[intc_irq->inpin_idx];
> +    s->enable[intc_irq->inpin_idx] |= data;
>   
>       /* enable new source interrupt */
> -    if (old_enable != s->enable[inpin_idx]) {
> -        trace_aspeed_intc_enable(name, s->enable[inpin_idx]);
> +    if (old_enable != s->enable[intc_irq->inpin_idx]) {
> +        trace_aspeed_intc_enable(name, s->enable[intc_irq->inpin_idx]);
>           s->regs[addr] = data;
>           return;
>       }
> @@ -187,11 +199,11 @@ static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
>       /* mask and unmask source interrupt */
>       change = s->regs[addr] ^ data;
>       if (change & data) {
> -        s->mask[inpin_idx] &= ~change;
> -        trace_aspeed_intc_unmask(name, change, s->mask[inpin_idx]);
> +        s->mask[intc_irq->inpin_idx] &= ~change;
> +        trace_aspeed_intc_unmask(name, change, s->mask[intc_irq->inpin_idx]);
>       } else {
> -        s->mask[inpin_idx] |= change;
> -        trace_aspeed_intc_mask(name, change, s->mask[inpin_idx]);
> +        s->mask[intc_irq->inpin_idx] |= change;
> +        trace_aspeed_intc_mask(name, change, s->mask[intc_irq->inpin_idx]);
>       }
>   
>       s->regs[addr] = data;
> @@ -202,24 +214,20 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
>   {
>       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
>       const char *name = object_get_typename(OBJECT(s));
> +    const AspeedINTCIRQ *intc_irq;
>       uint32_t addr = offset >> 2;
> -    uint32_t irq;
> -    int inpin_idx;
> -    int outpin_idx;


I would keep both these variables to reduce the number of changes.


Thanks,

C.


>       if (!data) {
>           qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
>           return;
>       }
>   
> -    irq = (offset & 0x0f00) >> 8;
> -    inpin_idx = irq;
> -    outpin_idx = irq;
> +    intc_irq = aspeed_intc_get_irq(aic, addr);
>   
> -    if (inpin_idx >= aic->num_inpins) {
> +    if (intc_irq->inpin_idx >= aic->num_inpins) {
>           qemu_log_mask(LOG_GUEST_ERROR,
>                         "%s: Invalid input pin index: %d\n",
> -                      __func__, inpin_idx);
> +                      __func__, intc_irq->inpin_idx);
>           return;
>       }
>   
> @@ -238,22 +246,24 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
>   
>       /* All source ISR execution are done */
>       if (!s->regs[addr]) {
> -        trace_aspeed_intc_all_isr_done(name, inpin_idx);
> -        if (s->pending[inpin_idx]) {
> +        trace_aspeed_intc_all_isr_done(name, intc_irq->inpin_idx);
> +        if (s->pending[intc_irq->inpin_idx]) {
>               /*
>                * handle pending source interrupt
>                * notify firmware which source interrupt are pending
>                * by setting status register
>                */
> -            s->regs[addr] = s->pending[inpin_idx];
> -            s->pending[inpin_idx] = 0;
> -            trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
> +            s->regs[addr] = s->pending[intc_irq->inpin_idx];
> +            s->pending[intc_irq->inpin_idx] = 0;
> +            trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> +                                          intc_irq->outpin_idx,
>                                             s->regs[addr]);
> -            aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
> +            aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 1);
>           } else {
>               /* clear irq */
> -            trace_aspeed_intc_clear_irq(name, inpin_idx, outpin_idx, 0);
> -            aspeed_intc_update(s, inpin_idx, outpin_idx, 0);
> +            trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
> +                                        intc_irq->outpin_idx, 0);
> +            aspeed_intc_update(s, intc_irq->inpin_idx, intc_irq->outpin_idx, 0);
>           }
>       }
>   }
> @@ -416,6 +426,18 @@ static const TypeInfo aspeed_intc_info = {
>       .abstract = true,
>   };
>   
> +static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] = {
> +    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> +    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> +    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> +    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> +    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> +    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> +    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> +    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> +    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS},
> +};
> +
>   static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
>   {
>       DeviceClass *dc = DEVICE_CLASS(klass);
> @@ -428,6 +450,8 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
>       aic->mem_size = 0x4000;
>       aic->reg_size = 0x808;
>       aic->reg_offset = 0x1000;
> +    aic->irq_table = aspeed_2700_intc_irqs;
> +    aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
>   }
>   
>   static const TypeInfo aspeed_2700_intc_info = {

Re: [PATCH v4 15/23] hw/intc/aspeed: Add Support for AST2700 INTCIO Controller

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Introduce a new ast2700 INTCIO class to support AST2700 INTCIO.
> Added new register definitions for INTCIO, including enable and status
> registers for IRQs GICINT192 through GICINT197.
> Created a dedicated IRQ array for INTCIO, supporting six input pins and six
> output pins, aligning with the newly defined registers.
> Implemented "aspeed_intcio_read" and "aspeed_intcio_write" to handle
> INTCIO-specific register access.
> 
>   To GICINT196                                                                                |
> 
>         ETH1    |-----------|                    |--------------------------|
>        -------->|0          |                    |         INTCIO           |
>         ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|
>        -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|
>         ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|
>        -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|
>         UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|
>        -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|
>         UART1   |         22|                    |--------------------------|
>        -------->|8        23|
>         UART2   |         24|
>        -------->|9        25|
>         UART3   |         26|
>        ---------|10       27|
>         UART5   |         28|
>        -------->|11       29|
>         UART6   |           |
>        -------->|12       30|
>         UART7   |         31|
>        -------->|13         |
>         UART8   |  OR[0:31] |
>        -------->|14         |
>         UART9   |           |
>        -------->|15         |
>         UART10  |           |
>        -------->|16         |
>         UART11  |           |
>        -------->|17         |
>         UART12  |           |
>        -------->|18         |
>                 |-----------|
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   include/hw/intc/aspeed_intc.h |   1 +
>   hw/intc/aspeed_intc.c         | 112 ++++++++++++++++++++++++++++++++++
>   2 files changed, 113 insertions(+)
> 
> diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
> index 21d9398933..fd7529137b 100644
> --- a/include/hw/intc/aspeed_intc.h
> +++ b/include/hw/intc/aspeed_intc.h
> @@ -14,6 +14,7 @@
>   
>   #define TYPE_ASPEED_INTC "aspeed.intc"
>   #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
> +#define TYPE_ASPEED_2700_INTCIO TYPE_ASPEED_INTC "io-ast2700"
>   OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
>   
>   #define ASPEED_INTC_NR_REGS (0xB08 >> 2)
> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
> index 18521d3eb0..da721a6066 100644
> --- a/hw/intc/aspeed_intc.c
> +++ b/hw/intc/aspeed_intc.c
> @@ -42,6 +42,26 @@ REG32(GICINT136_STATUS,     0x804)
>   REG32(GICINT192_201_EN,         0xB00)
>   REG32(GICINT192_201_STATUS,     0xB04)
>   
> +/*
> + * INTCIO Registers
> + *
> + * values below are offset by - 0x100 from datasheet
> + * because its memory region is start at 0x100
> + *
> + */
> +REG32(GICINT192_EN,         0x00)
> +REG32(GICINT192_STATUS,     0x04)
> +REG32(GICINT193_EN,         0x10)
> +REG32(GICINT193_STATUS,     0x14)
> +REG32(GICINT194_EN,         0x20)
> +REG32(GICINT194_STATUS,     0x24)
> +REG32(GICINT195_EN,         0x30)
> +REG32(GICINT195_STATUS,     0x34)
> +REG32(GICINT196_EN,         0x40)
> +REG32(GICINT196_STATUS,     0x44)
> +REG32(GICINT197_EN,         0x50)
> +REG32(GICINT197_STATUS,     0x54)
> +
>   static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
>                                                   uint32_t addr)
>   {
> @@ -456,6 +476,55 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
>       return;
>   }
>   
> +static uint64_t aspeed_intcio_read(void *opaque, hwaddr offset,
> +                                   unsigned int size)
> +{
> +    AspeedINTCState *s = ASPEED_INTC(opaque);
> +    const char *name = object_get_typename(OBJECT(s));
> +    uint32_t reg = offset >> 2;
> +    uint32_t value = 0;> +
> +    value = s->regs[reg];
> +    trace_aspeed_intc_read(name, offset, size, value);
> +
> +    return value;
> +}
> +
> +static void aspeed_intcio_write(void *opaque, hwaddr offset, uint64_t data,
> +                                unsigned size)
> +{
> +    AspeedINTCState *s = ASPEED_INTC(opaque);
> +    const char *name = object_get_typename(OBJECT(s));
> +    uint32_t reg = offset >> 2;
> +
> +    trace_aspeed_intc_write(name, offset, size, data);
> +
> +    switch (reg) {
> +    case R_GICINT192_EN:
> +    case R_GICINT193_EN:
> +    case R_GICINT194_EN:
> +    case R_GICINT195_EN:
> +    case R_GICINT196_EN:
> +    case R_GICINT197_EN:
> +        aspeed_intc_enable_handler(s, offset, data);
> +        break;
> +    case R_GICINT192_STATUS:
> +    case R_GICINT193_STATUS:
> +    case R_GICINT194_STATUS:
> +    case R_GICINT195_STATUS:
> +    case R_GICINT196_STATUS:
> +    case R_GICINT197_STATUS:
> +        aspeed_intc_status_handler(s, offset, data);
> +        break;
> +    default:
> +        s->regs[reg] = data;
> +        break;
> +    }
> +
> +    return;
> +}
> +
> +
>   static const MemoryRegionOps aspeed_intc_ops = {
>       .read = aspeed_intc_read,
>       .write = aspeed_intc_write,
> @@ -466,6 +535,16 @@ static const MemoryRegionOps aspeed_intc_ops = {
>       }
>   };
>   
> +static const MemoryRegionOps aspeed_intcio_ops = {
> +    .read = aspeed_intcio_read,
> +    .write = aspeed_intcio_write,
> +    .endianness = DEVICE_LITTLE_ENDIAN,
> +    .valid = {
> +        .min_access_size = 4,
> +        .max_access_size = 4,
> +    }
> +};
> +
>   static void aspeed_intc_instance_init(Object *obj)
>   {
>       AspeedINTCState *s = ASPEED_INTC(obj);
> @@ -580,10 +659,43 @@ static const TypeInfo aspeed_2700_intc_info = {
>       .class_init = aspeed_2700_intc_class_init,
>   };
>   
> +static AspeedINTCIRQ aspeed_2700_intcio_irqs[ASPEED_INTC_MAX_INPINS] = {
> +    {0, 0, 1, R_GICINT192_EN, R_GICINT192_STATUS},
> +    {1, 1, 1, R_GICINT193_EN, R_GICINT193_STATUS},
> +    {2, 2, 1, R_GICINT194_EN, R_GICINT194_STATUS},
> +    {3, 3, 1, R_GICINT195_EN, R_GICINT195_STATUS},
> +    {4, 4, 1, R_GICINT196_EN, R_GICINT196_STATUS},
> +    {5, 5, 1, R_GICINT197_EN, R_GICINT197_STATUS},
> +};
> +
> +static void aspeed_2700_intcio_class_init(ObjectClass *klass, void *data)
> +{
> +    DeviceClass *dc = DEVICE_CLASS(klass);
> +    AspeedINTCClass *aic = ASPEED_INTC_CLASS(klass);
> +
> +    dc->desc = "ASPEED 2700 INTC IO Controller";
> +    aic->num_lines = 32;
> +    aic->num_inpins = 6;
> +    aic->num_outpins = 6;
> +    aic->mem_size = 0x400;
> +    aic->reg_size = 0x58;
> +    aic->reg_offset = 0x100;
> +    aic->reg_ops = &aspeed_intcio_ops;
> +    aic->irq_table = aspeed_2700_intcio_irqs;
> +    aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intcio_irqs);
> +}
> +
> +static const TypeInfo aspeed_2700_intcio_info = {
> +    .name = TYPE_ASPEED_2700_INTCIO,
> +    .parent = TYPE_ASPEED_INTC,
> +    .class_init = aspeed_2700_intcio_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_intcio_info);
>   }
>   
>   type_init(aspeed_intc_register_types);

Re: [PATCH v4 17/23] hw/arm/aspeed_ast27x0.c Support AST2700 A1 GIC Interrupt Mapping

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> 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>
> ---
>   hw/arm/aspeed_ast27x0.c | 82 ++++++++++++++++++++++++++---------------
>   1 file changed, 52 insertions(+), 30 deletions(-)
> 
> diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
> index 09aad69e3c..eab9674b6c 100644
> --- a/hw/arm/aspeed_ast27x0.c
> +++ b/hw/arm/aspeed_ast27x0.c
> @@ -120,21 +120,27 @@ static const int aspeed_soc_ast2700a0_irqmap[] = {
>   };
>   
>   /* 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_IBT]       = 2,
>       [ASPEED_DEV_KCS]       = 4,
>   };
>   
> +/* GICINT 129 */
> +/* GICINT 193 */
> +
>   /* 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_ADC]        = 16,
>       [ASPEED_DEV_GPIO]       = 18,
>   };
>   
>   /* 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_WDT]       = 16,
>       [ASPEED_DEV_FMC]       = 25,
> @@ -142,7 +148,8 @@ static const int aspeed_soc_ast2700_gic131_intcmap[] = {
>   };
>   
>   /* 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_ETH2]      = 1,
>       [ASPEED_DEV_ETH3]      = 2,
> @@ -161,24 +168,26 @@ static const int aspeed_soc_ast2700_gic132_intcmap[] = {
>   };
>   
>   /* 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_PECI]      = 4,
>   };
>   
>   /* GICINT 128 ~ 136 */
> +/* GICINT 192 ~ 201 */
>   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},
> +static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
> +    {128,  ast2700_gic128_gic192_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},
> +    {130,  ast2700_gic130_gic194_intcmap},
> +    {131,  ast2700_gic131_gic195_intcmap},
> +    {132,  ast2700_gic132_gic196_intcmap},
> +    {133,  ast2700_gic133_gic197_intcmap},
>       {134,  NULL},
>       {135,  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);
>       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);
> +    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> +        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> +            assert(ast2700_gic_intcmap[i].ptr);
>               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);
>       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);
> +    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> +        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> +            assert(ast2700_gic_intcmap[i].ptr);
>               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();
>   }
> @@ -492,7 +502,6 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
>       Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev);
>       AspeedSoCState *s = ASPEED_SOC(dev);
>       AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
> -    AspeedINTCClass *ic = ASPEED_INTC_GET_CLASS(&a->intc);

I would keep this intermediate variable. Minor.


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.



>       g_autofree char *sram_name = NULL;
>       qemu_irq irq;
>   
> @@ -530,17 +539,18 @@ 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]);
>   
> -    /* source orgates -> INTC */
> -    for (i = 0; i < ic->num_inpins; i++) {
> +    /* irq sources -> orgates -> INTC */
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++) {
>           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 */
> -    for (i = 0; i < ic->num_outpins; i++) {
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins; i++) {
>           sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
>                              qdev_get_gpio_in(DEVICE(&a->gic),
> -                                aspeed_soc_ast2700_gic_intcmap[i].irq));
> +                                            ast2700_gic_intcmap[i].irq));
>       }
>   
>       /* SRAM */
> @@ -691,10 +701,22 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
>       for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
>           /*
>            * The AST2700 I2C controller has one source INTC per bus.
> -         * I2C buses interrupt are connected to GICINT130_INTC
> -         * from bit 0 to bit 15.
> -         * I2C bus 0 is connected to GICINT130_INTC at bit 0.
> -         * I2C bus 15 is connected to GICINT130_INTC at bit 15.
> +         *
> +         * For AST2700 A0:
> +         * 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
> +         * 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);
>           sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0, irq);

Re: [PATCH v4 18/23] hw/arm/aspeed_ast27x0: Support two levels of INTC controllers for AST2700 A1

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> The design of INTC controllers has significantly changed in AST2700 A1.
> 
> There are a total of 480 interrupt sources in AST2700 A1. For interrupt numbers
> from 0 to 127, they can route directly to PSP, SSP, and TSP. Due to the
> limitation of interrupt numbers of processors, the interrupts are merged every
> 32 sources for interrupt numbers greater than 127.
> 
> There are two levels of interrupt controllers, INTC(CPUD Die) and INTCIO
> (IO Die). The interrupt sources of INTC are the interrupt numbers from INTC_0 to
> INTC_127 and interrupts from INTCIO. The interrupt sources of INTCIO are the
> interrupt numbers greater than INTC_127. INTC_IO controls the interrupts
> INTC_128 to INTC_319 only.
> 
> Currently, only GIC 192 to 201 are supported, and their source interrupts are
> from INTCIO and connected to INTC at input pin 0 and output pins 0 to 9 for
> GIC 192-201.
> 
> The design of the orgates for GICINT 196 is as follows:
> It has interrupt sources ranging from 0 to 31, with its output pin connected to
> INTCIO "T0 GICINT_196". The output pin is then connected to INTC "GIC_192_201"
> at bit 4, and its bit 4 output should be connected to GIC 196.
> The design of INTC GIC_192_201 have 10 output pins, mapped as following:
> Bit 0 -> GIC 192
> Bit 1 -> GIC 193
> Bit 2 -> GIC 194
> Bit 3 -> GIC 195
> Bit 4 -> GIC 196
> 
> To support both AST2700 A1 and A0, INTC input pins 1 to 9 and output pins
> 10 to 18 remain to support GIC 128-136, which source interrupts from INTC.
> These will be removed if we decide not to support AST2700 A0 in the future.
> 
> |-------------------------------------------------------------------------------------------------------|
> |                                                   AST2700 A1 Design                                   |
> |           To GICINT196                                                                                |
> |                                                                                                       |
> |   ETH1    |-----------|                    |--------------------------|        |--------------|       |
> |  -------->|0          |                    |         INTCIO           |        |  orgates[0]  |       |
> |   ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|------->| 0            |       |
> |  -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|------->| 1            |       |
> |   ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|------->| 2            |       |
> |  -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|------->| 3  OR[0:9]   |-----| |
> |   UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|------->| 4            |     | |
> |  -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|------->| 5            |     | |
> |   UART1   |         22|   orgates[6]------>|inpin[6]-------->outpin[6]|------->| 6            |     | |
> |  -------->|8        23|   orgates[7]------>|inpin[7]-------->outpin[7]|------->| 7            |     | |
> |   UART2   |         24|   orgates[8]------>|inpin[8]-------->outpin[8]|------->| 8            |     | |
> |  -------->|9        25|   orgates[9]------>|inpin[9]-------->outpin[9]|------->| 9            |     | |
> |   UART3   |         26|                    |--------------------------|        |--------------|     | |
> |  ---------|10       27|                                                                             | |
> |   UART5   |         28|                                                                             | |
> |  -------->|11       29|                                                                             | |
> |   UART6   |           |                                                                             | |
> |  -------->|12       30|     |-----------------------------------------------------------------------| |
> |   UART7   |         31|     |                                                                         |
> |  -------->|13         |     |                                                                         |
> |   UART8   |  OR[0:31] |     |                |------------------------------|           |----------|  |
> |  -------->|14         |     |                |            INTC              |           |     GIC  |  |
> |   UART9   |           |     |                |inpin[0:0]--------->outpin[0] |---------->|192       |  |
> |  -------->|15         |     |                |inpin[0:1]--------->outpin[1] |---------->|193       |  |
> |   UART10  |           |     |                |inpin[0:2]--------->outpin[2] |---------->|194       |  |
> |  -------->|16         |     |                |inpin[0:3]--------->outpin[3] |---------->|195       |  |
> |   UART11  |           |     |--------------> |inpin[0:4]--------->outpin[4] |---------->|196       |  |
> |  -------->|17         |                      |inpin[0:5]--------->outpin[5] |---------->|197       |  |
> |   UART12  |           |                      |inpin[0:6]--------->outpin[6] |---------->|198       |  |
> |  -------->|18         |                      |inpin[0:7]--------->outpin[7] |---------->|199       |  |
> |           |-----------|                      |inpin[0:8]--------->outpin[8] |---------->|200       |  |
> |                                              |inpin[0:9]--------->outpin[9] |---------->|201       |  |
> |-------------------------------------------------------------------------------------------------------|
> |-------------------------------------------------------------------------------------------------------|
> |  ETH1    |-----------|     orgates[1]------->|inpin[1]----------->outpin[10]|---------->|128       |  |
> | -------->|0          |     orgates[2]------->|inpin[2]----------->outpin[11]|---------->|129       |  |
> |  ETH2    |          4|     orgates[3]------->|inpin[3]----------->outpin[12]|---------->|130       |  |
> | -------->|1         5|     orgates[4]------->|inpin[4]----------->outpin[13]|---------->|131       |  |
> |  ETH3    |          6|---->orgates[5]------->|inpin[5]----------->outpin[14]|---------->|132       |  |
> | -------->|2        19|     orgates[6]------->|inpin[6]----------->outpin[15]|---------->|133       |  |
> |  UART0   |         20|     orgates[7]------->|inpin[7]----------->outpin[16]|---------->|134       |  |
> | -------->|7        21|     orgates[8]------->|inpin[8]----------->outpin[17]|---------->|135       |  |
> |  UART1   |         22|     orgates[9]------->|inpin[9]----------->outpin[18]|---------->|136       |  |
> | -------->|8        23|                       |------------------------------|           |----------|  |
> |  UART2   |         24|                                                                                |
> | -------->|9        25|                       AST2700 A0 Design                                        |
> |  UART3   |         26|                                                                                |
> | -------->|10       27|                                                                                |
> |  UART5   |         28|                                                                                |
> | -------->|11       29| GICINT132                                                                      |
> |  UART6   |           |                                                                                |
> | -------->|12       30|                                                                                |
> |  UART7   |         31|                                                                                |
> | -------->|13         |                                                                                |
> |  UART8   |  OR[0:31] |                                                                                |
> | -------->|14         |                                                                                |
> |  UART9   |           |                                                                                |
> | -------->|15         |                                                                                |
> |  UART10  |           |                                                                                |
> | -------->|16         |                                                                                |
> |  UART11  |           |                                                                                |
> | -------->|17         |                                                                                |
> |  UART12  |           |                                                                                |
> | -------->|18         |                                                                                |
> |          |-----------|                                                                                |
> |                                                                                                       |
> |-------------------------------------------------------------------------------------------------------|
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   include/hw/arm/aspeed_soc.h |  3 +-
>   hw/arm/aspeed_ast27x0.c     | 84 ++++++++++++++++++++++++++++---------
>   2 files changed, 66 insertions(+), 21 deletions(-)
> 
> diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> index 689f52dae8..62f75c33dc 100644
> --- a/include/hw/arm/aspeed_soc.h
> +++ b/include/hw/arm/aspeed_soc.h
> @@ -128,7 +128,7 @@ struct Aspeed27x0SoCState {
>       AspeedSoCState parent;
>   
>       ARMCPU cpu[ASPEED_CPUS_NUM];
> -    AspeedINTCState intc;
> +    AspeedINTCState intc[2];

I would separate the ast2700_gic_intcmap changes from the introduction of the
extra AspeedINTCState.

>       GICv3State gic;
>       MemoryRegion dram_empty;
>   };
> @@ -195,6 +195,7 @@ enum {
>       ASPEED_DEV_EHCI2,
>       ASPEED_DEV_VIC,
>       ASPEED_DEV_INTC,
> +    ASPEED_DEV_INTCIO,
>       ASPEED_DEV_SDMC,
>       ASPEED_DEV_SCU,
>       ASPEED_DEV_ADC,
> diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c
> index eab9674b6c..028bf08d0e 100644
> --- a/hw/arm/aspeed_ast27x0.c
> +++ b/hw/arm/aspeed_ast27x0.c
> @@ -57,6 +57,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] = {
>       [ASPEED_DEV_ETH3]      =  0x14070000,
>       [ASPEED_DEV_EMMC]      =  0x12090000,
>       [ASPEED_DEV_INTC]      =  0x12100000,
> +    [ASPEED_DEV_INTCIO]    =  0x14C18000,
>       [ASPEED_DEV_SLI]       =  0x12C17000,
>       [ASPEED_DEV_SLIIO]     =  0x14C1E000,
>       [ASPEED_GIC_DIST]      =  0x12200000,

one day, we should reorder the memmap arrays by mapping address.


Thanks,

C.



> @@ -178,32 +179,48 @@ static const int ast2700_gic133_gic197_intcmap[] = {
>   /* GICINT 192 ~ 201 */
>   struct gic_intc_irq_info {
>       int irq;
> +    int intc_idx;
> +    int orgate_idx;
>       const int *ptr;
>   };
>   
>   static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
> -    {128,  ast2700_gic128_gic192_intcmap},
> -    {129,  NULL},
> -    {130,  ast2700_gic130_gic194_intcmap},
> -    {131,  ast2700_gic131_gic195_intcmap},
> -    {132,  ast2700_gic132_gic196_intcmap},
> -    {133,  ast2700_gic133_gic197_intcmap},
> -    {134,  NULL},
> -    {135,  NULL},
> -    {136,  NULL},
> +    {192, 1, 0, ast2700_gic128_gic192_intcmap},
> +    {193, 1, 1, NULL},
> +    {194, 1, 2, ast2700_gic130_gic194_intcmap},
> +    {195, 1, 3, ast2700_gic131_gic195_intcmap},
> +    {196, 1, 4, ast2700_gic132_gic196_intcmap},
> +    {197, 1, 5, ast2700_gic133_gic197_intcmap},
> +    {198, 1, 6, NULL},
> +    {199, 1, 7, NULL},
> +    {200, 1, 8, NULL},
> +    {201, 1, 9, NULL},
> +    {128, 0, 1, ast2700_gic128_gic192_intcmap},
> +    {129, 0, 2, NULL},
> +    {130, 0, 3, ast2700_gic130_gic194_intcmap},
> +    {131, 0, 4, ast2700_gic131_gic195_intcmap},
> +    {132, 0, 5, ast2700_gic132_gic196_intcmap},
> +    {133, 0, 6, ast2700_gic133_gic197_intcmap},
> +    {134, 0, 7, NULL},
> +    {135, 0, 8, NULL},
> +    {136, 0, 9, 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 or_idx;
> +    int idx;
>       int i;
>   
>       for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
>           if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
>               assert(ast2700_gic_intcmap[i].ptr);
> -            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
> -                ast2700_gic_intcmap[i].ptr[dev]);
> +            or_idx = ast2700_gic_intcmap[i].orgate_idx;
> +            idx = ast2700_gic_intcmap[i].intc_idx;
> +            return qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
> +                                    ast2700_gic_intcmap[i].ptr[dev]);
>           }
>       }
>   
> @@ -215,12 +232,16 @@ static qemu_irq aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev,
>   {
>       Aspeed27x0SoCState *a = ASPEED27X0_SOC(s);
>       AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
> +    int or_idx;
> +    int idx;
>       int i;
>   
>       for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
>           if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
>               assert(ast2700_gic_intcmap[i].ptr);
> -            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
> +            or_idx = ast2700_gic_intcmap[i].orgate_idx;
> +            idx = ast2700_gic_intcmap[i].intc_idx;
> +            return qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
>                                       ast2700_gic_intcmap[i].ptr[dev] + index);
>           }
>       }
> @@ -390,7 +411,9 @@ 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[0], TYPE_ASPEED_2700_INTC);
> +    object_initialize_child(obj, "intcio", &a->intc[1],
> +                            TYPE_ASPEED_2700_INTCIO);
>   
>       snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname);
>       object_initialize_child(obj, "adc", &s->adc, typename);
> @@ -532,27 +555,48 @@ static void aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
>       }
>   
>       /* INTC */
> -    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) {
> +    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[0]), errp)) {
>           return;
>       }
>   
> -    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0,
> +    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[0]), 0,
>                       sc->memmap[ASPEED_DEV_INTC]);
>   
> +    /* INTCIO */
> +    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[1]), errp)) {
> +        return;
> +    }
> +
> +    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[1]), 0,
> +                    sc->memmap[ASPEED_DEV_INTCIO]);
> +
>       /* irq sources -> orgates -> INTC */
> -    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++) {
> -        qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0,
> -                              qdev_get_gpio_in(DEVICE(&a->intc), i));
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_inpins; i++) {
> +        qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0,
> +                              qdev_get_gpio_in(DEVICE(&a->intc[0]), i));
>       }
>   
>       /* INTC -> GIC192 - GIC201 */
>       /* INTC -> GIC128 - GIC136 */
> -    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins; i++) {
> -        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_outpins; i++) {
> +        assert(i < ARRAY_SIZE(ast2700_gic_intcmap));
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[0]), i,
>                              qdev_get_gpio_in(DEVICE(&a->gic),
>                                               ast2700_gic_intcmap[i].irq));
>       }
>   
> +    /* irq source -> orgates -> INTCIO */
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_inpins; i++) {
> +        qdev_connect_gpio_out(DEVICE(&a->intc[1].orgates[i]), 0,
> +                              qdev_get_gpio_in(DEVICE(&a->intc[1]), i));
> +    }
> +
> +    /* INTCIO -> INTC */
> +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_outpins; i++) {
> +        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[1]), i,
> +                           qdev_get_gpio_in(DEVICE(&a->intc[0].orgates[0]), i));
> +    }
> +
>       /* 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,

Re: [PATCH v4 14/23] hw/intc/aspeed: Add Support for Multi-Output IRQ Handling

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> This update introduces support for handling multi-output IRQs in the AST2700
> interrupt controller (INTC), specifically for GICINT192_201. GICINT192_201 maps
> 1:10 to input IRQ 0 and output IRQs 0 to 9. Each status bit corresponds to a
> specific IRQ.
> 
> Implemented "aspeed_intc_set_irq_handler_multi_outpins" to handle IRQs with
> multiple output pins. Introduced "aspeed_intc_status_handler_multi_outpins"
> for managing status registers associated with multi-output IRQs.
> 
> Added new IRQ definitions for GICINT192_201 in INTC.
> Adjusted the IRQ array to accommodate 10 input pins and 19 output pins,
> aligning with the new GICINT192_201 mappings.
> 
>                     |------------------------------|
>                     |            INTC              |
>                     |inpin[0:0]--------->outpin[0] |
>                     |inpin[0:1]--------->outpin[1] |
>                     |inpin[0:2]--------->outpin[2] |
>                     |inpin[0:3]--------->outpin[3] |
> orgates[0]-------> |inpin[0:4]--------->outpin[4] |
>                     |inpin[0:5]--------->outpin[5] |
>                     |inpin[0:6]--------->outpin[6] |
>                     |inpin[0:7]--------->outpin[7] |
>                     |inpin[0:8]--------->outpin[8] |
>                     |inpin[0:9]--------->outpin[9] |
>                     |                              |
>   orgates[1]------> |inpin[1]----------->outpin[10]|
>   orgates[2]------> |inpin[2]----------->outpin[11]|
>   orgates[3]------> |inpin[3]----------->outpin[12]|
>   orgates[4]------> |inpin[4]----------->outpin[13]|
>   orgates[5]------> |inpin[5]----------->outpin[14]|
>   orgates[6]------> |inpin[6]----------->outpin[15]|
>   orgates[7]------> |inpin[7]----------->outpin[16]|
>   orgates[8]------> |inpin[8]----------->outpin[17]|
>   orgates[9]------> |inpin[9]----------->outpin[18]|
>                     |------------------------------|
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> ---
>   include/hw/intc/aspeed_intc.h |   6 +-
>   hw/intc/aspeed_intc.c         | 144 ++++++++++++++++++++++++++++++----
>   hw/intc/trace-events          |   1 +
>   3 files changed, 133 insertions(+), 18 deletions(-)
> 
> diff --git a/include/hw/intc/aspeed_intc.h b/include/hw/intc/aspeed_intc.h
> index 112a01f402..21d9398933 100644
> --- a/include/hw/intc/aspeed_intc.h
> +++ b/include/hw/intc/aspeed_intc.h
> @@ -16,9 +16,9 @@
>   #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
>   OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass, ASPEED_INTC)
>   
> -#define ASPEED_INTC_NR_REGS (0x808 >> 2)
> -#define ASPEED_INTC_MAX_INPINS 9
> -#define ASPEED_INTC_MAX_OUTPINS 9
> +#define ASPEED_INTC_NR_REGS (0xB08 >> 2)
> +#define ASPEED_INTC_MAX_INPINS 10
> +#define ASPEED_INTC_MAX_OUTPINS 19
>   
>   typedef struct AspeedINTCIRQ {
>       int inpin_idx;
> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c
> index 99077ec72d..18521d3eb0 100644
> --- a/hw/intc/aspeed_intc.c
> +++ b/hw/intc/aspeed_intc.c
> @@ -39,6 +39,8 @@ REG32(GICINT135_EN,         0x700)
>   REG32(GICINT135_STATUS,     0x704)
>   REG32(GICINT136_EN,         0x800)
>   REG32(GICINT136_STATUS,     0x804)
> +REG32(GICINT192_201_EN,         0xB00)
> +REG32(GICINT192_201_STATUS,     0xB04)
>   
>   static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
>                                                   uint32_t addr)
> @@ -117,9 +119,48 @@ static void aspeed_intc_set_irq_handler(AspeedINTCState *s,
>       }
>   }
>   
> +static void aspeed_intc_set_irq_handler_multi_outpins(AspeedINTCState *s,
> +                                 const AspeedINTCIRQ *intc_irq, uint32_t select)
> +{
> +    const char *name = object_get_typename(OBJECT(s));
> +    int i;
> +
> +    for (i = 0; i < intc_irq->num_outpins; i++) {
> +        if (select & BIT(i)) {
> +            if (s->mask[intc_irq->inpin_idx] & BIT(i) ||
> +                s->regs[intc_irq->status_addr] & BIT(i)) {
> +                /*
> +                 * a. mask bit is not 0 means in ISR mode sources interrupt
> +                 * routine are executing.
> +                 * b. status bit is not 0 means previous source interrupt
> +                 * does not be executed, yet.
> +                 *
> +                 * save source interrupt to pending bit.
> +                 */
> +                 s->pending[intc_irq->inpin_idx] |= BIT(i);
> +                 trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
> +                                               s->pending[intc_irq->inpin_idx]);
> +            } else {
> +                /*
> +                 * notify firmware which source interrupt are coming
> +                 * by setting status bit
> +                 */
> +                s->regs[intc_irq->status_addr] |= BIT(i);
> +                trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> +                                              intc_irq->outpin_idx + i,
> +                                              s->regs[intc_irq->status_addr]);
> +                aspeed_intc_update(s, intc_irq->inpin_idx,
> +                                   intc_irq->outpin_idx + i, 1);> +            }
> +        }
> +    }
> +}
> +
>   /*
> - * GICINT128 to GICINT136 map 1:1 to input and output IRQs 0 to 8.
> - * The value of input IRQ should be between 0 and the number of inputs.
> + * GICINT192_201 maps 1:10 to input IRQ 0 and output IRQs 0 to 9.
> + * GICINT128 to GICINT136 map 1:1 to input IRQs 1 to 9 and output
> + * IRQs 10 to 18. The value of input IRQ should be between 0 and
> + * the number of input pins.
>    */
>   static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>   {
> @@ -158,7 +199,11 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int level)
>       }
>   
>       trace_aspeed_intc_select(name, select);
> -    aspeed_intc_set_irq_handler(s, intc_irq, select);
> +    if (intc_irq->num_outpins > 1) {
> +        aspeed_intc_set_irq_handler_multi_outpins(s, intc_irq, select);
> +    } else {
> +        aspeed_intc_set_irq_handler(s, intc_irq, select);
> +    }
>   }
>   
>   static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
> @@ -274,6 +319,70 @@ static void aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
>       }
>   }
>   
> +static void aspeed_intc_status_handler_multi_outpins(AspeedINTCState *s,
> +                                                hwaddr offset, uint64_t data)
> +{
> +    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> +    const char *name = object_get_typename(OBJECT(s));
> +    const AspeedINTCIRQ *intc_irq;
> +    uint32_t addr = offset >> 2;

variable 'addr' here is a register index. I think 'reg' would be a better
name.

> +    int i;
> +
> +    if (!data) {
> +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n", __func__);
> +        return;
> +    }
> +
> +    intc_irq = aspeed_intc_get_irq(aic, addr);
> +
> +    if (intc_irq->inpin_idx >= aic->num_inpins) {

Since both values are defined at compile time, shouldn't that be an assert ?


Thanks,

C.



> +        qemu_log_mask(LOG_GUEST_ERROR,
> +                      "%s: Invalid input pin index: %d\n",
> +                      __func__,  intc_irq->inpin_idx);
> +        return;
> +    }
> +
> +    /* clear status */
> +    s->regs[addr] &= ~data;> +> +    /*
> +     * The status registers are used for notify sources ISR are executed.
> +     * If one source ISR is executed, it will clear one bit.
> +     * If it clear all bits, it means to initialize this register status
> +     * rather than sources ISR are executed.
> +     */
> +    if (data == 0xffffffff) {
> +        return;
> +    }
> +
> +    for (i = 0; i < intc_irq->num_outpins; i++) {
> +        /* All source ISR executions are done from a specific bit */
> +        if (data & BIT(i)) {
> +            trace_aspeed_intc_all_isr_done_bit(name, intc_irq->inpin_idx, i);
> +            if (s->pending[intc_irq->inpin_idx] & BIT(i)) {
> +                /*
> +                 * Handle pending source interrupt.
> +                 * Notify firmware which source interrupt is pending
> +                 * by setting the status bit.
> +                 */
> +                s->regs[addr] |= BIT(i);
> +                s->pending[intc_irq->inpin_idx] &= ~BIT(i);
> +                trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> +                                              intc_irq->outpin_idx + i,
> +                                              s->regs[addr]);
> +                aspeed_intc_update(s, intc_irq->inpin_idx,
> +                                   intc_irq->outpin_idx + i, 1);
> +            } else {
> +                /* clear irq for the specific bit */
> +                trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
> +                                            intc_irq->outpin_idx + i, 0);
> +                aspeed_intc_update(s, intc_irq->inpin_idx,
> +                                   intc_irq->outpin_idx + i, 0);
> +            }
> +        }
> +    }
> +}
> +
>   static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned int size)
>   {
>       AspeedINTCState *s = ASPEED_INTC(opaque);
> @@ -322,6 +431,7 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
>       case R_GICINT134_EN:
>       case R_GICINT135_EN:
>       case R_GICINT136_EN:
> +    case R_GICINT192_201_EN:
>           aspeed_intc_enable_handler(s, offset, data);
>           break;
>       case R_GICINT128_STATUS:
> @@ -335,6 +445,9 @@ static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
>       case R_GICINT136_STATUS:
>           aspeed_intc_status_handler(s, offset, data);
>           break;
> +    case R_GICINT192_201_STATUS:
> +        aspeed_intc_status_handler_multi_outpins(s, offset, data);
> +        break;
>       default:
>           s->regs[addr] = data;
>           break;
> @@ -433,15 +546,16 @@ static const TypeInfo aspeed_intc_info = {
>   };
>   
>   static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] = {
> -    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> -    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> -    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> -    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> -    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> -    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> -    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> -    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> -    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS},
> +    {0, 0, 10, R_GICINT192_201_EN, R_GICINT192_201_STATUS},
> +    {1, 10, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> +    {2, 11, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> +    {3, 12, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> +    {4, 13, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> +    {5, 14, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> +    {6, 15, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> +    {7, 16, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> +    {8, 17, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> +    {9, 18, 1, R_GICINT136_EN, R_GICINT136_STATUS},
>   };
>   
>   static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
> @@ -451,10 +565,10 @@ static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
>   
>       dc->desc = "ASPEED 2700 INTC Controller";
>       aic->num_lines = 32;
> -    aic->num_inpins = 9;
> -    aic->num_outpins = 9;
> +    aic->num_inpins = 10;
> +    aic->num_outpins = 19;
>       aic->mem_size = 0x4000;
> -    aic->reg_size = 0x808;
> +    aic->reg_size = 0xB08;
>       aic->reg_offset = 0x1000;
>       aic->irq_table = aspeed_2700_intc_irqs;
>       aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
> diff --git a/hw/intc/trace-events b/hw/intc/trace-events
> index e97eea820b..913197a181 100644
> --- a/hw/intc/trace-events
> +++ b/hw/intc/trace-events
> @@ -92,6 +92,7 @@ aspeed_intc_enable(const char *s, uint32_t value) "%s: Enable: 0x%x"
>   aspeed_intc_select(const char *s, uint32_t value) "%s: Select: 0x%x"
>   aspeed_intc_mask(const char *s, uint32_t change, uint32_t value) "%s: Mask: 0x%x: 0x%x"
>   aspeed_intc_unmask(const char *s, uint32_t change, uint32_t value) "%s: UnMask: 0x%x: 0x%x"
> +aspeed_intc_all_isr_done_bit(const char *s, int inpin_idx, int bit) "%s: All source ISR execution are done from specific bit: %d-%d"
>   
>   # arm_gic.c
>   gic_enable_irq(int irq) "irq %d enabled"

Re: [PATCH v4 23/23] docs/specs: Add aspeed-intc

[Cédric Le Goater]

On 3/3/25 10:54, Jamin Lin wrote:
> Add AST2700 INTC design guidance and its block diagram.
> 
> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>


Reviewed-by: Cédric Le Goater <clg@redhat.com>

Thanks,

C.


> ---
>   docs/specs/aspeed-intc.rst | 136 +++++++++++++++++++++++++++++++++++++
>   docs/specs/index.rst       |   1 +
>   2 files changed, 137 insertions(+)
>   create mode 100644 docs/specs/aspeed-intc.rst
> 
> diff --git a/docs/specs/aspeed-intc.rst b/docs/specs/aspeed-intc.rst
> new file mode 100644
> index 0000000000..9cefd7f37f
> --- /dev/null
> +++ b/docs/specs/aspeed-intc.rst
> @@ -0,0 +1,136 @@
> +===========================
> +ASPEED Interrupt Controller
> +===========================
> +
> +AST2700
> +-------
> +There are a total of 480 interrupt sources in AST2700. Due to the limitation of
> +interrupt numbers of processors, the interrupts are merged every 32 sources for
> +interrupt numbers greater than 127.
> +
> +There are two levels of interrupt controllers, INTC (CPU Die) and INTCIO
> +(I/O Die).
> +
> +Interrupt Mapping
> +-----------------
> +- INTC: Handles interrupt sources 0 - 127 and integrates signals from INTCIO.
> +- INTCIO: Handles interrupt sources 128 - 319 independently.
> +
> +QEMU Support
> +------------
> +Currently, only GIC 192 to 201 are supported, and their source interrupts are
> +from INTCIO and connected to INTC at input pin 0 and output pins 0 to 9 for
> +GIC 192-201.
> +
> +Design for GICINT 196
> +---------------------
> +The orgate has interrupt sources ranging from 0 to 31, with its output pin
> +connected to INTCIO "T0 GICINT_196". The output pin is then connected to INTC
> +"GIC_192_201" at bit 4, and its bit 4 output pin is connected to GIC 196.
> +
> +INTC GIC_192_201 Output Pin Mapping
> +-----------------------------------
> +The design of INTC GIC_192_201 have 10 output pins, mapped as following:
> +
> +====  ====
> +Bit   GIC
> +====  ====
> +0     192
> +1     193
> +2     194
> +3     195
> +4     196
> +5     197
> +6     198
> +7     199
> +8     200
> +9     201
> +====  ====
> +
> +AST2700 A0
> +----------
> +It has only one INTC controller, and currently, only GIC 128-136 is supported.
> +To support both AST2700 A1 and AST2700 A0, there are 10 OR gates in the INTC,
> +with gates 1 to 9 supporting GIC 128-136.
> +
> +Design for GICINT 132
> +---------------------
> +The orgate has interrupt sources ranging from 0 to 31, with its output pin
> +connected to INTC. The output pin is then connected to GIC 132.
> +
> +Block Diagram of GICINT 196 for AST2700 A1 and GICINT 132 for AST2700 A0
> +------------------------------------------------------------------------
> +
> +.. code-block::
> +
> +   |-------------------------------------------------------------------------------------------------------|
> +   |                                                   AST2700 A1 Design                                   |
> +   |           To GICINT196                                                                                |
> +   |                                                                                                       |
> +   |   ETH1    |-----------|                    |--------------------------|        |--------------|       |
> +   |  -------->|0          |                    |         INTCIO           |        |  orgates[0]  |       |
> +   |   ETH2    |          4|   orgates[0]------>|inpin[0]-------->outpin[0]|------->| 0            |       |
> +   |  -------->|1         5|   orgates[1]------>|inpin[1]-------->outpin[1]|------->| 1            |       |
> +   |   ETH3    |          6|   orgates[2]------>|inpin[2]-------->outpin[2]|------->| 2            |       |
> +   |  -------->|2        19|   orgates[3]------>|inpin[3]-------->outpin[3]|------->| 3  OR[0:9]   |-----| |
> +   |   UART0   |         20|-->orgates[4]------>|inpin[4]-------->outpin[4]|------->| 4            |     | |
> +   |  -------->|7        21|   orgates[5]------>|inpin[5]-------->outpin[5]|------->| 5            |     | |
> +   |   UART1   |         22|   orgates[6]------>|inpin[6]-------->outpin[6]|------->| 6            |     | |
> +   |  -------->|8        23|   orgates[7]------>|inpin[7]-------->outpin[7]|------->| 7            |     | |
> +   |   UART2   |         24|   orgates[8]------>|inpin[8]-------->outpin[8]|------->| 8            |     | |
> +   |  -------->|9        25|   orgates[9]------>|inpin[9]-------->outpin[9]|------->| 9            |     | |
> +   |   UART3   |         26|                    |--------------------------|        |--------------|     | |
> +   |  ---------|10       27|                                                                             | |
> +   |   UART5   |         28|                                                                             | |
> +   |  -------->|11       29|                                                                             | |
> +   |   UART6   |           |                                                                             | |
> +   |  -------->|12       30|     |-----------------------------------------------------------------------| |
> +   |   UART7   |         31|     |                                                                         |
> +   |  -------->|13         |     |                                                                         |
> +   |   UART8   |  OR[0:31] |     |                |------------------------------|           |----------|  |
> +   |  -------->|14         |     |                |            INTC              |           |     GIC  |  |
> +   |   UART9   |           |     |                |inpin[0:0]--------->outpin[0] |---------->|192       |  |
> +   |  -------->|15         |     |                |inpin[0:1]--------->outpin[1] |---------->|193       |  |
> +   |   UART10  |           |     |                |inpin[0:2]--------->outpin[2] |---------->|194       |  |
> +   |  -------->|16         |     |                |inpin[0:3]--------->outpin[3] |---------->|195       |  |
> +   |   UART11  |           |     |--------------> |inpin[0:4]--------->outpin[4] |---------->|196       |  |
> +   |  -------->|17         |                      |inpin[0:5]--------->outpin[5] |---------->|197       |  |
> +   |   UART12  |           |                      |inpin[0:6]--------->outpin[6] |---------->|198       |  |
> +   |  -------->|18         |                      |inpin[0:7]--------->outpin[7] |---------->|199       |  |
> +   |           |-----------|                      |inpin[0:8]--------->outpin[8] |---------->|200       |  |
> +   |                                              |inpin[0:9]--------->outpin[9] |---------->|201       |  |
> +   |-------------------------------------------------------------------------------------------------------|
> +   |-------------------------------------------------------------------------------------------------------|
> +   |  ETH1    |-----------|     orgates[1]------->|inpin[1]----------->outpin[10]|---------->|128       |  |
> +   | -------->|0          |     orgates[2]------->|inpin[2]----------->outpin[11]|---------->|129       |  |
> +   |  ETH2    |          4|     orgates[3]------->|inpin[3]----------->outpin[12]|---------->|130       |  |
> +   | -------->|1         5|     orgates[4]------->|inpin[4]----------->outpin[13]|---------->|131       |  |
> +   |  ETH3    |          6|---->orgates[5]------->|inpin[5]----------->outpin[14]|---------->|132       |  |
> +   | -------->|2        19|     orgates[6]------->|inpin[6]----------->outpin[15]|---------->|133       |  |
> +   |  UART0   |         20|     orgates[7]------->|inpin[7]----------->outpin[16]|---------->|134       |  |
> +   | -------->|7        21|     orgates[8]------->|inpin[8]----------->outpin[17]|---------->|135       |  |
> +   |  UART1   |         22|     orgates[9]------->|inpin[9]----------->outpin[18]|---------->|136       |  |
> +   | -------->|8        23|                       |------------------------------|           |----------|  |
> +   |  UART2   |         24|                                                                                |
> +   | -------->|9        25|                       AST2700 A0 Design                                        |
> +   |  UART3   |         26|                                                                                |
> +   | -------->|10       27|                                                                                |
> +   |  UART5   |         28|                                                                                |
> +   | -------->|11       29| GICINT132                                                                      |
> +   |  UART6   |           |                                                                                |
> +   | -------->|12       30|                                                                                |
> +   |  UART7   |         31|                                                                                |
> +   | -------->|13         |                                                                                |
> +   |  UART8   |  OR[0:31] |                                                                                |
> +   | -------->|14         |                                                                                |
> +   |  UART9   |           |                                                                                |
> +   | -------->|15         |                                                                                |
> +   |  UART10  |           |                                                                                |
> +   | -------->|16         |                                                                                |
> +   |  UART11  |           |                                                                                |
> +   | -------->|17         |                                                                                |
> +   |  UART12  |           |                                                                                |
> +   | -------->|18         |                                                                                |
> +   |          |-----------|                                                                                |
> +   |                                                                                                       |
> +   |-------------------------------------------------------------------------------------------------------|
> diff --git a/docs/specs/index.rst b/docs/specs/index.rst
> index d7675cebc2..f19d73c9f6 100644
> --- a/docs/specs/index.rst
> +++ b/docs/specs/index.rst
> @@ -38,3 +38,4 @@ guest hardware that is specific to QEMU.
>      rocker
>      riscv-iommu
>      riscv-aia
> +   aspeed-intc

RE: [PATCH v4 02/23] hw/intc/aspeed: Support setting different register sizes

[Jamin Lin]

Hi Cedric,

> Subject: Re: [PATCH v4 02/23] hw/intc/aspeed: Support setting different
> register sizes
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > Currently, the size of the regs array is 0x2000, which is too large.
> > So far, it only use GICINT128 - GICINT134, and the offsets from 0 to 0x1000
> are unused.
> > To save code size, introduce a new class attribute "reg_size" to set
> > the different register sizes for the INTC models in AST2700 and add a
> > regs sub-region in the memory container.
> >
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   include/hw/intc/aspeed_intc.h | 1 +
> >   hw/intc/aspeed_intc.c         | 8 +++++---
> >   2 files changed, 6 insertions(+), 3 deletions(-)
> >
> > diff --git a/include/hw/intc/aspeed_intc.h
> > b/include/hw/intc/aspeed_intc.h index 03324f05ab..ecaeb15aea 100644
> > --- a/include/hw/intc/aspeed_intc.h
> > +++ b/include/hw/intc/aspeed_intc.h
> > @@ -42,6 +42,7 @@ struct AspeedINTCClass {
> >       uint32_t num_lines;
> >       uint32_t num_ints;
> >       uint64_t mem_size;
> > +    uint64_t reg_size;
> >   };
> >
> >   #endif /* ASPEED_INTC_H */
> > diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index
> > 033b574c1e..316885a27a 100644
> > --- a/hw/intc/aspeed_intc.c
> > +++ b/hw/intc/aspeed_intc.c
> > @@ -117,10 +117,11 @@ static void aspeed_intc_set_irq(void *opaque, int
> irq, int level)
> >   static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned
> int size)
> >   {
> >       AspeedINTCState *s = ASPEED_INTC(opaque);
> > +    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> >       uint32_t addr = offset >> 2;
> 
> 'addr' is a confusing name. As it is used as a register index, I think 'reg' would
> be more appropriate.

Will fix it.
> 
> >       uint32_t value = 0;
> >
> > -    if (addr >= ASPEED_INTC_NR_REGS) {
> > +    if (offset >= aic->reg_size) {
> 
> This is a useless test since the memory region 's->iomem' is initialized below
> with size 'aic->reg_size'.
> 
Sorry, I lost to remove it.

> >           qemu_log_mask(LOG_GUEST_ERROR,
> >                         "%s: Out-of-bounds read at offset 0x%"
> HWADDR_PRIx "\n",
> >                         __func__, offset); @@ -143,7 +144,7 @@
> static
> > void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
> >       uint32_t change;
> >       uint32_t irq;
> >
> > -    if (addr >= ASPEED_INTC_NR_REGS) {
> > +    if (offset >= aic->reg_size) {
> >           qemu_log_mask(LOG_GUEST_ERROR,
> >                         "%s: Out-of-bounds write at offset 0x%"
> HWADDR_PRIx "\n",
> >                         __func__, offset); @@ -308,7 +309,7 @@
> static
> > void aspeed_intc_realize(DeviceState *dev, Error **errp)
> >       sysbus_init_mmio(sbd, &s->iomem_container);
> >
> >       memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops,
> s,
> > -                          TYPE_ASPEED_INTC ".regs",
> ASPEED_INTC_NR_REGS << 2);
> > +                          TYPE_ASPEED_INTC ".regs", aic->reg_size);>
> >       memory_region_add_subregion(&s->iomem_container, 0x0,
> > &s->iomem);
> >
> > @@ -351,6 +352,7 @@ static void aspeed_2700_intc_class_init(ObjectClass
> *klass, void *data)
> >       aic->num_lines = 32;
> >       aic->num_ints = 9;
> >       aic->mem_size = 0x4000;
> > +    aic->reg_size = 0x2000;
> 
> the model still uses ASPEED_INTC_NR_REGS in :
> 
>      struct AspeedINTCState {
>          ...
>          uint32_t regs[ASPEED_INTC_NR_REGS];
>          ...
> 
> which is redundant and error prone IMO.
> 

Do you mean using "g_malloc" instead of the static regs array?
If I understand your question correctly, I will make the following changes.

1. uint32_t regs[ASPEED_INTC_NR_REGS]; --> uint32_t *regs;
2. aspeed_2700_intc_class_init() {
      regs = g_malloc(aic->reg_size);
  }
3. static void aspeed_intc_realize(DeviceState *dev, Error **errp) {
   memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
                          TYPE_ASPEED_INTC ".regs", aic->reg_size);
 }

I have a question: where should I free the dynamically allocated memory for regs?

Could you please give me any suggestion?

Thanks-Jamin

> Thanks,
> 
> C.
> 
> 
> C.

Re: [PATCH v4 02/23] hw/intc/aspeed: Support setting different register sizes

[Cédric Le Goater]

On 3/4/25 11:03, Jamin Lin wrote:
> Hi Cedric,
> 
>> Subject: Re: [PATCH v4 02/23] hw/intc/aspeed: Support setting different
>> register sizes
>>
>> On 3/3/25 10:54, Jamin Lin wrote:
>>> Currently, the size of the regs array is 0x2000, which is too large.
>>> So far, it only use GICINT128 - GICINT134, and the offsets from 0 to 0x1000
>> are unused.
>>> To save code size, introduce a new class attribute "reg_size" to set
>>> the different register sizes for the INTC models in AST2700 and add a
>>> regs sub-region in the memory container.
>>>
>>> Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
>>> ---
>>>    include/hw/intc/aspeed_intc.h | 1 +
>>>    hw/intc/aspeed_intc.c         | 8 +++++---
>>>    2 files changed, 6 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/include/hw/intc/aspeed_intc.h
>>> b/include/hw/intc/aspeed_intc.h index 03324f05ab..ecaeb15aea 100644
>>> --- a/include/hw/intc/aspeed_intc.h
>>> +++ b/include/hw/intc/aspeed_intc.h
>>> @@ -42,6 +42,7 @@ struct AspeedINTCClass {
>>>        uint32_t num_lines;
>>>        uint32_t num_ints;
>>>        uint64_t mem_size;
>>> +    uint64_t reg_size;
>>>    };
>>>
>>>    #endif /* ASPEED_INTC_H */
>>> diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index
>>> 033b574c1e..316885a27a 100644
>>> --- a/hw/intc/aspeed_intc.c
>>> +++ b/hw/intc/aspeed_intc.c
>>> @@ -117,10 +117,11 @@ static void aspeed_intc_set_irq(void *opaque, int
>> irq, int level)
>>>    static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned
>> int size)
>>>    {
>>>        AspeedINTCState *s = ASPEED_INTC(opaque);
>>> +    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
>>>        uint32_t addr = offset >> 2;
>>
>> 'addr' is a confusing name. As it is used as a register index, I think 'reg' would
>> be more appropriate.
> 
> Will fix it.
>>
>>>        uint32_t value = 0;
>>>
>>> -    if (addr >= ASPEED_INTC_NR_REGS) {
>>> +    if (offset >= aic->reg_size) {
>>
>> This is a useless test since the memory region 's->iomem' is initialized below
>> with size 'aic->reg_size'.
>>
> Sorry, I lost to remove it.
> 
>>>            qemu_log_mask(LOG_GUEST_ERROR,
>>>                          "%s: Out-of-bounds read at offset 0x%"
>> HWADDR_PRIx "\n",
>>>                          __func__, offset); @@ -143,7 +144,7 @@
>> static
>>> void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
>>>        uint32_t change;
>>>        uint32_t irq;
>>>
>>> -    if (addr >= ASPEED_INTC_NR_REGS) {
>>> +    if (offset >= aic->reg_size) {
>>>            qemu_log_mask(LOG_GUEST_ERROR,
>>>                          "%s: Out-of-bounds write at offset 0x%"
>> HWADDR_PRIx "\n",
>>>                          __func__, offset); @@ -308,7 +309,7 @@
>> static
>>> void aspeed_intc_realize(DeviceState *dev, Error **errp)
>>>        sysbus_init_mmio(sbd, &s->iomem_container);
>>>
>>>        memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops,
>> s,
>>> -                          TYPE_ASPEED_INTC ".regs",
>> ASPEED_INTC_NR_REGS << 2);
>>> +                          TYPE_ASPEED_INTC ".regs", aic->reg_size);>
>>>        memory_region_add_subregion(&s->iomem_container, 0x0,
>>> &s->iomem);
>>>
>>> @@ -351,6 +352,7 @@ static void aspeed_2700_intc_class_init(ObjectClass
>> *klass, void *data)
>>>        aic->num_lines = 32;
>>>        aic->num_ints = 9;
>>>        aic->mem_size = 0x4000;
>>> +    aic->reg_size = 0x2000;
>>
>> the model still uses ASPEED_INTC_NR_REGS in :
>>
>>       struct AspeedINTCState {
>>           ...
>>           uint32_t regs[ASPEED_INTC_NR_REGS];
>>           ...
>>
>> which is redundant and error prone IMO.
>>
> 
> Do you mean using "g_malloc" instead of the static regs array?
> If I understand your question correctly, I will make the following changes.
> 
> 1. uint32_t regs[ASPEED_INTC_NR_REGS]; --> uint32_t *regs;
> 2. aspeed_2700_intc_class_init() {
>        regs = g_malloc(aic->reg_size);
>    }
> 3. static void aspeed_intc_realize(DeviceState *dev, Error **errp) {>     memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops, s,
>                            TYPE_ASPEED_INTC ".regs", aic->reg_size);
>   }

yes.

> I have a question: where should I free the dynamically allocated memory for regs?
> 
> Could you please give me any suggestion?

It would be in an unrealize() handler.


Thanks,

C.

RE: [PATCH v4 03/23] hw/intc/aspeed: Reduce regs array size by adding a register sub-region

[Jamin Lin]

Hi Cedric,

> Subject: Re: [PATCH v4 03/23] hw/intc/aspeed: Reduce regs array size by
> adding a register sub-region
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > Currently, the size of the "regs" array is 0x2000, which is too large.
> > So far, it only uses "GICINT128 to `GICINT134", and the offsets from 0
> > to 0x1000 are unused. To save code size and avoid mapping large unused
> > gaps, update to only map the useful set of registers:
> >
> > INTC register [0x1000 – 0x1804]
> >
> > Update "reg_size" to 0x808. Introduce a new class attribute
> > "reg_offset" to set the start offset of a "INTC" sub-region. Set the
> > "reg_offset" to 0x1000 for INTC registers.
> >
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   include/hw/intc/aspeed_intc.h |  3 ++-
> >   hw/intc/aspeed_intc.c         | 50
> ++++++++++++++++++++---------------
> >   2 files changed, 31 insertions(+), 22 deletions(-)
> >
> > diff --git a/include/hw/intc/aspeed_intc.h
> > b/include/hw/intc/aspeed_intc.h index ecaeb15aea..18ca405336 100644
> > --- a/include/hw/intc/aspeed_intc.h
> > +++ b/include/hw/intc/aspeed_intc.h
> > @@ -16,7 +16,7 @@
> >   #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
> >   OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass,
> ASPEED_INTC)
> >
> > -#define ASPEED_INTC_NR_REGS (0x2000 >> 2)
> > +#define ASPEED_INTC_NR_REGS (0x808 >> 2)
> 
> We should allocate the regs[] array using aic->reg_size to avoid redundancy.
> 
Thanks for suggestion.
Will fix it.
Jamin
> 
> Thanks,
> 
> C.
> 
> 
> 
> 
> >   #define ASPEED_INTC_NR_INTS 9
> >
> >   struct AspeedINTCState {
> > @@ -43,6 +43,7 @@ struct AspeedINTCClass {
> >       uint32_t num_ints;
> >       uint64_t mem_size;
> >       uint64_t reg_size;
> > +    uint64_t reg_offset;
> >   };
> >
> >   #endif /* ASPEED_INTC_H */
> > diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index
> > 316885a27a..0f630ffab7 100644
> > --- a/hw/intc/aspeed_intc.c
> > +++ b/hw/intc/aspeed_intc.c
> > @@ -14,25 +14,31 @@
> >   #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)
> > +/*
> > + * INTC Registers
> > + *
> > + * values below are offset by - 0x1000 from datasheet
> > + * because its memory region is start at 0x1000
> > + *
> > + */
> > +REG32(GICINT128_EN,         0x000)
> > +REG32(GICINT128_STATUS,     0x004)
> > +REG32(GICINT129_EN,         0x100)
> > +REG32(GICINT129_STATUS,     0x104)
> > +REG32(GICINT130_EN,         0x200)
> > +REG32(GICINT130_STATUS,     0x204)
> > +REG32(GICINT131_EN,         0x300)
> > +REG32(GICINT131_STATUS,     0x304)
> > +REG32(GICINT132_EN,         0x400)
> > +REG32(GICINT132_STATUS,     0x404)
> > +REG32(GICINT133_EN,         0x500)
> > +REG32(GICINT133_STATUS,     0x504)
> > +REG32(GICINT134_EN,         0x600)
> > +REG32(GICINT134_STATUS,     0x604)
> > +REG32(GICINT135_EN,         0x700)
> > +REG32(GICINT135_STATUS,     0x704)
> > +REG32(GICINT136_EN,         0x800)
> > +REG32(GICINT136_STATUS,     0x804)
> >
> >   #define GICINT_STATUS_BASE     R_GICINT128_STATUS
> >
> > @@ -311,7 +317,8 @@ static void aspeed_intc_realize(DeviceState *dev,
> Error **errp)
> >       memory_region_init_io(&s->iomem, OBJECT(s), &aspeed_intc_ops,
> s,
> >                             TYPE_ASPEED_INTC ".regs",
> aic->reg_size);
> >
> > -    memory_region_add_subregion(&s->iomem_container, 0x0,
> &s->iomem);
> > +    memory_region_add_subregion(&s->iomem_container,
> aic->reg_offset,
> > +                                &s->iomem);
> >
> >       qdev_init_gpio_in(dev, aspeed_intc_set_irq, aic->num_ints);
> >
> > @@ -352,7 +359,8 @@ static void aspeed_2700_intc_class_init(ObjectClass
> *klass, void *data)
> >       aic->num_lines = 32;
> >       aic->num_ints = 9;
> >       aic->mem_size = 0x4000;
> > -    aic->reg_size = 0x2000;
> > +    aic->reg_size = 0x808;
> > +    aic->reg_offset = 0x1000;
> >   }
> >
> >   static const TypeInfo aspeed_2700_intc_info = {

RE: [PATCH v4 12/23] hw/intc/aspeed: Introduce AspeedINTCIRQ structure to save the irq index and register address

[Jamin Lin]

Hi Cedric,


> Subject: Re: [PATCH v4 12/23] hw/intc/aspeed: Introduce AspeedINTCIRQ
> structure to save the irq index and register address
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > The INTC controller supports GICINT128 to GICINT136, mapping 1:1 to
> > input and output IRQs 0 to 8. Previously, the formula "address &
> > 0x0f00" was used to derive the IRQ index numbers.
> >
> > However, the INTC controller also supports GICINT192_201, mapping 1
> > input IRQ pin to 10 output IRQ pins. The pin numbers for input and output are
> different.
> > It is difficult to use a formula to determine the index number of INTC
> > model supported input and output IRQs.
> >
> > To simplify and improve readability, introduces the AspeedINTCIRQ
> > structure to save the input/output IRQ index and its enable/status register
> address.
> >
> > Introduce the "aspeed_2700_intc_irqs" table to store IRQ information for
> INTC.
> > Introduce the "aspeed_intc_get_irq" function to retrieve the
> > input/output IRQ pin index from the provided status/enable register address.
> >
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   include/hw/intc/aspeed_intc.h |  10 +++
> >   hw/intc/aspeed_intc.c         | 120
> ++++++++++++++++++++--------------
> >   2 files changed, 82 insertions(+), 48 deletions(-)
> >
> > diff --git a/include/hw/intc/aspeed_intc.h
> > b/include/hw/intc/aspeed_intc.h index f9a0273f78..112a01f402 100644
> > --- a/include/hw/intc/aspeed_intc.h
> > +++ b/include/hw/intc/aspeed_intc.h
> > @@ -20,6 +20,14 @@ OBJECT_DECLARE_TYPE(AspeedINTCState,
> AspeedINTCClass, ASPEED_INTC)
> >   #define ASPEED_INTC_MAX_INPINS 9
> >   #define ASPEED_INTC_MAX_OUTPINS 9
> >
> > +typedef struct AspeedINTCIRQ {
> > +    int inpin_idx;
> > +    int outpin_idx;
> > +    int num_outpins;
> > +    uint32_t enable_addr;
> > +    uint32_t status_addr;
> 
> The _addr suffix is confusing. Doesn't it refer to a register index ?
> 

I will change to enable_reg and status_reg.

> > +} AspeedINTCIRQ;
> > +
> >   struct AspeedINTCState {
> >       /*< private >*/
> >       SysBusDevice parent_obj;
> > @@ -47,6 +55,8 @@ struct AspeedINTCClass {
> >       uint64_t reg_size;
> >       uint64_t reg_offset;
> >       const MemoryRegionOps *reg_ops;
> > +    const AspeedINTCIRQ *irq_table;
> > +    int irq_table_count;
> >   };
> >
> >   #endif /* ASPEED_INTC_H */
> > diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index
> > 9bc3e089d8..5730a7604d 100644
> > --- a/hw/intc/aspeed_intc.c
> > +++ b/hw/intc/aspeed_intc.c
> > @@ -40,7 +40,23 @@ REG32(GICINT135_STATUS,     0x704)
> >   REG32(GICINT136_EN,         0x800)
> >   REG32(GICINT136_STATUS,     0x804)
> >
> > -#define GICINT_STATUS_BASE     R_GICINT128_STATUS
> > +static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
> > +                                                uint32_t addr) {
> > +    int i;
> > +
> > +    for (i = 0; i < aic->irq_table_count; i++) {
> > +        if (aic->irq_table[i].enable_addr == addr ||
> > +            aic->irq_table[i].status_addr == addr) {
> > +            return &aic->irq_table[i];
> > +        }
> > +    }
> > +
> > +    /*
> > +     * Invalid addr.
> > +     */
> > +    g_assert_not_reached();
> > +}
> >
> >   /*
> >    * Update the state of an interrupt controller pin by setting @@
> > -81,15 +97,10 @@ static void aspeed_intc_set_irq(void *opaque, int irq, int
> level)
> >       AspeedINTCState *s = (AspeedINTCState *)opaque;
> >       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> >       const char *name = object_get_typename(OBJECT(s));
> > -    uint32_t status_addr = GICINT_STATUS_BASE + ((0x100 * irq) >> 2);
> > +    const AspeedINTCIRQ *intc_irq;
> >       uint32_t select = 0;
> >       uint32_t enable;
> >       int i;
> > -    int inpin_idx;
> > -    int outpin_idx;
> > -
> > -    inpin_idx = irq;
> > -    outpin_idx = irq;
> >
> >       if (irq >= aic->num_inpins) {
> >           qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid input pin
> index:
> > %d\n", @@ -97,15 +108,16 @@ static void aspeed_intc_set_irq(void
> *opaque, int irq, int level)
> >           return;
> >       }
> >
> > -    trace_aspeed_intc_set_irq(name, inpin_idx, level);
> > -    enable = s->enable[inpin_idx];
> > +    intc_irq = &aic->irq_table[irq];
> > +    trace_aspeed_intc_set_irq(name, intc_irq->inpin_idx, level);
> > +    enable = s->enable[intc_irq->inpin_idx];
> >
> >       if (!level) {
> >           return;
> >       }
> >
> >       for (i = 0; i < aic->num_lines; i++) {
> > -        if (s->orgates[inpin_idx].levels[i]) {
> > +        if (s->orgates[intc_irq->inpin_idx].levels[i]) {
> >               if (enable & BIT(i)) {
> >                   select |= BIT(i);
> >               }
> > @@ -118,7 +130,7 @@ static void aspeed_intc_set_irq(void *opaque, int
> > irq, int level)
> >
> >       trace_aspeed_intc_select(name, select);
> >
> > -    if (s->mask[inpin_idx] || s->regs[status_addr]) {
> > +    if (s->mask[intc_irq->inpin_idx] ||
> > + s->regs[intc_irq->status_addr]) {
> >           /*
> >            * a. mask is not 0 means in ISR mode
> >            * sources interrupt routine are executing.
> > @@ -127,17 +139,19 @@ static void aspeed_intc_set_irq(void *opaque, int
> irq, int level)
> >            *
> >            * save source interrupt to pending variable.
> >            */
> > -        s->pending[inpin_idx] |= select;
> > -        trace_aspeed_intc_pending_irq(name, inpin_idx,
> s->pending[inpin_idx]);
> > +        s->pending[intc_irq->inpin_idx] |= select;
> > +        trace_aspeed_intc_pending_irq(name, intc_irq->inpin_idx,
> > +
> > + s->pending[intc_irq->inpin_idx]);
> >       } else {
> >           /*
> >            * notify firmware which source interrupt are coming
> >            * by setting status register
> >            */
> > -        s->regs[status_addr] = select;
> > -        trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
> > -                                      s->regs[status_addr]);
> > -        aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
> > +        s->regs[intc_irq->status_addr] = select;
> > +        trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> > +                                      intc_irq->outpin_idx,
> > +
> s->regs[intc_irq->status_addr]);
> > +        aspeed_intc_update(s, intc_irq->inpin_idx,
> > + intc_irq->outpin_idx, 1);
> >       }
> >   }
> >
> > @@ -146,19 +160,17 @@ static void
> aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
> >   {
> >       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> >       const char *name = object_get_typename(OBJECT(s));
> > +    const AspeedINTCIRQ *intc_irq;
> >       uint32_t addr = offset >> 2;
> >       uint32_t old_enable;
> >       uint32_t change;
> > -    uint32_t irq;
> > -    int inpin_idx;
> >
> > -    irq = (offset & 0x0f00) >> 8;
> > -    inpin_idx = irq;
> > +    intc_irq = aspeed_intc_get_irq(aic, addr);
> 
> I would keep the 'inpin_idx' variable and assign it to 'intc_irq->inpin_idx'.
> This would reduce the number of change.
> 
Will do
> 
> > -    if (inpin_idx >= aic->num_inpins) {
> > +    if (intc_irq->inpin_idx >= aic->num_inpins) {
> 
> Since both values are defined at compile time, shouldn't that be an assert ?
Will do

> 
> >           qemu_log_mask(LOG_GUEST_ERROR,
> >                         "%s: Invalid input pin index: %d\n",
> > -                      __func__, inpin_idx);
> > +                      __func__, intc_irq->inpin_idx);
> >           return;
> >       }
> >
> > @@ -169,17 +181,17 @@ static void
> aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
> >        */
> >
> >       /* disable all source interrupt */
> > -    if (!data && !s->enable[inpin_idx]) {
> > +    if (!data && !s->enable[intc_irq->inpin_idx]) {
> >           s->regs[addr] = data;
> >           return;
> >       }
> >
> > -    old_enable = s->enable[inpin_idx];
> > -    s->enable[inpin_idx] |= data;
> > +    old_enable = s->enable[intc_irq->inpin_idx];
> > +    s->enable[intc_irq->inpin_idx] |= data;
> >
> >       /* enable new source interrupt */
> > -    if (old_enable != s->enable[inpin_idx]) {
> > -        trace_aspeed_intc_enable(name, s->enable[inpin_idx]);
> > +    if (old_enable != s->enable[intc_irq->inpin_idx]) {
> > +        trace_aspeed_intc_enable(name,
> > + s->enable[intc_irq->inpin_idx]);
> >           s->regs[addr] = data;
> >           return;
> >       }
> > @@ -187,11 +199,11 @@ static void
> aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr offset,
> >       /* mask and unmask source interrupt */
> >       change = s->regs[addr] ^ data;
> >       if (change & data) {
> > -        s->mask[inpin_idx] &= ~change;
> > -        trace_aspeed_intc_unmask(name, change, s->mask[inpin_idx]);
> > +        s->mask[intc_irq->inpin_idx] &= ~change;
> > +        trace_aspeed_intc_unmask(name, change,
> > + s->mask[intc_irq->inpin_idx]);
> >       } else {
> > -        s->mask[inpin_idx] |= change;
> > -        trace_aspeed_intc_mask(name, change, s->mask[inpin_idx]);
> > +        s->mask[intc_irq->inpin_idx] |= change;
> > +        trace_aspeed_intc_mask(name, change,
> > + s->mask[intc_irq->inpin_idx]);
> >       }
> >
> >       s->regs[addr] = data;
> > @@ -202,24 +214,20 @@ static void
> aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
> >   {
> >       AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> >       const char *name = object_get_typename(OBJECT(s));
> > +    const AspeedINTCIRQ *intc_irq;
> >       uint32_t addr = offset >> 2;
> > -    uint32_t irq;
> > -    int inpin_idx;
> > -    int outpin_idx;
> 
> 
> I would keep both these variables to reduce the number of changes.
Will do

Thanks for your review and suggestions.
Jamin

> 
> 
> Thanks,
> 
> C.
> 
> 
> >       if (!data) {
> >           qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n",
> __func__);
> >           return;
> >       }
> >
> > -    irq = (offset & 0x0f00) >> 8;
> > -    inpin_idx = irq;
> > -    outpin_idx = irq;
> > +    intc_irq = aspeed_intc_get_irq(aic, addr);
> >
> > -    if (inpin_idx >= aic->num_inpins) {
> > +    if (intc_irq->inpin_idx >= aic->num_inpins) {
> >           qemu_log_mask(LOG_GUEST_ERROR,
> >                         "%s: Invalid input pin index: %d\n",
> > -                      __func__, inpin_idx);
> > +                      __func__, intc_irq->inpin_idx);
> >           return;
> >       }
> >
> > @@ -238,22 +246,24 @@ static void
> > aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
> >
> >       /* All source ISR execution are done */
> >       if (!s->regs[addr]) {
> > -        trace_aspeed_intc_all_isr_done(name, inpin_idx);
> > -        if (s->pending[inpin_idx]) {
> > +        trace_aspeed_intc_all_isr_done(name, intc_irq->inpin_idx);
> > +        if (s->pending[intc_irq->inpin_idx]) {
> >               /*
> >                * handle pending source interrupt
> >                * notify firmware which source interrupt are pending
> >                * by setting status register
> >                */
> > -            s->regs[addr] = s->pending[inpin_idx];
> > -            s->pending[inpin_idx] = 0;
> > -            trace_aspeed_intc_trigger_irq(name, inpin_idx, outpin_idx,
> > +            s->regs[addr] = s->pending[intc_irq->inpin_idx];
> > +            s->pending[intc_irq->inpin_idx] = 0;
> > +            trace_aspeed_intc_trigger_irq(name, intc_irq->inpin_idx,
> > +                                          intc_irq->outpin_idx,
> >                                             s->regs[addr]);
> > -            aspeed_intc_update(s, inpin_idx, outpin_idx, 1);
> > +            aspeed_intc_update(s, intc_irq->inpin_idx,
> > + intc_irq->outpin_idx, 1);
> >           } else {
> >               /* clear irq */
> > -            trace_aspeed_intc_clear_irq(name, inpin_idx, outpin_idx, 0);
> > -            aspeed_intc_update(s, inpin_idx, outpin_idx, 0);
> > +            trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
> > +                                        intc_irq->outpin_idx, 0);
> > +            aspeed_intc_update(s, intc_irq->inpin_idx,
> > + intc_irq->outpin_idx, 0);
> >           }
> >       }
> >   }
> > @@ -416,6 +426,18 @@ static const TypeInfo aspeed_intc_info = {
> >       .abstract = true,
> >   };
> >
> > +static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS] =
> {
> > +    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> > +    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> > +    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> > +    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> > +    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> > +    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> > +    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> > +    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> > +    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS}, };
> > +
> >   static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
> >   {
> >       DeviceClass *dc = DEVICE_CLASS(klass); @@ -428,6 +450,8 @@
> > static void aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
> >       aic->mem_size = 0x4000;
> >       aic->reg_size = 0x808;
> >       aic->reg_offset = 0x1000;
> > +    aic->irq_table = aspeed_2700_intc_irqs;
> > +    aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
> >   }
> >
> >   static const TypeInfo aspeed_2700_intc_info = {

RE: [PATCH v4 14/23] hw/intc/aspeed: Add Support for Multi-Output IRQ Handling

[Jamin Lin]

Hi Cedric, 

> Subject: Re: [PATCH v4 14/23] hw/intc/aspeed: Add Support for Multi-Output
> IRQ Handling
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > This update introduces support for handling multi-output IRQs in the
> > AST2700 interrupt controller (INTC), specifically for GICINT192_201.
> > GICINT192_201 maps
> > 1:10 to input IRQ 0 and output IRQs 0 to 9. Each status bit
> > corresponds to a specific IRQ.
> >
> > Implemented "aspeed_intc_set_irq_handler_multi_outpins" to handle IRQs
> > with multiple output pins. Introduced
> "aspeed_intc_status_handler_multi_outpins"
> > for managing status registers associated with multi-output IRQs.
> >
> > Added new IRQ definitions for GICINT192_201 in INTC.
> > Adjusted the IRQ array to accommodate 10 input pins and 19 output
> > pins, aligning with the new GICINT192_201 mappings.
> >
> >                     |------------------------------|
> >                     |            INTC              |
> >                     |inpin[0:0]--------->outpin[0] |
> >                     |inpin[0:1]--------->outpin[1] |
> >                     |inpin[0:2]--------->outpin[2] |
> >                     |inpin[0:3]--------->outpin[3] |
> > orgates[0]-------> |inpin[0:4]--------->outpin[4] |
> >                     |inpin[0:5]--------->outpin[5] |
> >                     |inpin[0:6]--------->outpin[6] |
> >                     |inpin[0:7]--------->outpin[7] |
> >                     |inpin[0:8]--------->outpin[8] |
> >                     |inpin[0:9]--------->outpin[9] |
> >                     |                              |
> >   orgates[1]------> |inpin[1]----------->outpin[10]|
> >   orgates[2]------> |inpin[2]----------->outpin[11]|
> >   orgates[3]------> |inpin[3]----------->outpin[12]|
> >   orgates[4]------> |inpin[4]----------->outpin[13]|
> >   orgates[5]------> |inpin[5]----------->outpin[14]|
> >   orgates[6]------> |inpin[6]----------->outpin[15]|
> >   orgates[7]------> |inpin[7]----------->outpin[16]|
> >   orgates[8]------> |inpin[8]----------->outpin[17]|
> >   orgates[9]------> |inpin[9]----------->outpin[18]|
> >                     |------------------------------|
> >
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   include/hw/intc/aspeed_intc.h |   6 +-
> >   hw/intc/aspeed_intc.c         | 144
> ++++++++++++++++++++++++++++++----
> >   hw/intc/trace-events          |   1 +
> >   3 files changed, 133 insertions(+), 18 deletions(-)
> >
> > diff --git a/include/hw/intc/aspeed_intc.h
> > b/include/hw/intc/aspeed_intc.h index 112a01f402..21d9398933 100644
> > --- a/include/hw/intc/aspeed_intc.h
> > +++ b/include/hw/intc/aspeed_intc.h
> > @@ -16,9 +16,9 @@
> >   #define TYPE_ASPEED_2700_INTC TYPE_ASPEED_INTC "-ast2700"
> >   OBJECT_DECLARE_TYPE(AspeedINTCState, AspeedINTCClass,
> ASPEED_INTC)
> >
> > -#define ASPEED_INTC_NR_REGS (0x808 >> 2) -#define
> > ASPEED_INTC_MAX_INPINS 9 -#define ASPEED_INTC_MAX_OUTPINS 9
> > +#define ASPEED_INTC_NR_REGS (0xB08 >> 2) #define
> > +ASPEED_INTC_MAX_INPINS 10 #define ASPEED_INTC_MAX_OUTPINS 19
> >
> >   typedef struct AspeedINTCIRQ {
> >       int inpin_idx;
> > diff --git a/hw/intc/aspeed_intc.c b/hw/intc/aspeed_intc.c index
> > 99077ec72d..18521d3eb0 100644
> > --- a/hw/intc/aspeed_intc.c
> > +++ b/hw/intc/aspeed_intc.c
> > @@ -39,6 +39,8 @@ REG32(GICINT135_EN,         0x700)
> >   REG32(GICINT135_STATUS,     0x704)
> >   REG32(GICINT136_EN,         0x800)
> >   REG32(GICINT136_STATUS,     0x804)
> > +REG32(GICINT192_201_EN,         0xB00)
> > +REG32(GICINT192_201_STATUS,     0xB04)
> >
> >   static const AspeedINTCIRQ *aspeed_intc_get_irq(AspeedINTCClass *aic,
> >                                                   uint32_t addr)
> @@
> > -117,9 +119,48 @@ static void
> aspeed_intc_set_irq_handler(AspeedINTCState *s,
> >       }
> >   }
> >
> > +static void aspeed_intc_set_irq_handler_multi_outpins(AspeedINTCState *s,
> > +                                 const AspeedINTCIRQ *intc_irq,
> > +uint32_t select) {
> > +    const char *name = object_get_typename(OBJECT(s));
> > +    int i;
> > +
> > +    for (i = 0; i < intc_irq->num_outpins; i++) {
> > +        if (select & BIT(i)) {
> > +            if (s->mask[intc_irq->inpin_idx] & BIT(i) ||
> > +                s->regs[intc_irq->status_addr] & BIT(i)) {
> > +                /*
> > +                 * a. mask bit is not 0 means in ISR mode sources
> interrupt
> > +                 * routine are executing.
> > +                 * b. status bit is not 0 means previous source interrupt
> > +                 * does not be executed, yet.
> > +                 *
> > +                 * save source interrupt to pending bit.
> > +                 */
> > +                 s->pending[intc_irq->inpin_idx] |= BIT(i);
> > +                 trace_aspeed_intc_pending_irq(name,
> intc_irq->inpin_idx,
> > +
> s->pending[intc_irq->inpin_idx]);
> > +            } else {
> > +                /*
> > +                 * notify firmware which source interrupt are coming
> > +                 * by setting status bit
> > +                 */
> > +                s->regs[intc_irq->status_addr] |= BIT(i);
> > +                trace_aspeed_intc_trigger_irq(name,
> intc_irq->inpin_idx,
> > +
> intc_irq->outpin_idx + i,
> > +
> s->regs[intc_irq->status_addr]);
> > +                aspeed_intc_update(s, intc_irq->inpin_idx,
> > +                                   intc_irq->outpin_idx + i, 1);>
> +            }
> > +        }
> > +    }
> > +}
> > +
> >   /*
> > - * GICINT128 to GICINT136 map 1:1 to input and output IRQs 0 to 8.
> > - * The value of input IRQ should be between 0 and the number of inputs.
> > + * GICINT192_201 maps 1:10 to input IRQ 0 and output IRQs 0 to 9.
> > + * GICINT128 to GICINT136 map 1:1 to input IRQs 1 to 9 and output
> > + * IRQs 10 to 18. The value of input IRQ should be between 0 and
> > + * the number of input pins.
> >    */
> >   static void aspeed_intc_set_irq(void *opaque, int irq, int level)
> >   {
> > @@ -158,7 +199,11 @@ static void aspeed_intc_set_irq(void *opaque, int
> irq, int level)
> >       }
> >
> >       trace_aspeed_intc_select(name, select);
> > -    aspeed_intc_set_irq_handler(s, intc_irq, select);
> > +    if (intc_irq->num_outpins > 1) {
> > +        aspeed_intc_set_irq_handler_multi_outpins(s, intc_irq, select);
> > +    } else {
> > +        aspeed_intc_set_irq_handler(s, intc_irq, select);
> > +    }
> >   }
> >
> >   static void aspeed_intc_enable_handler(AspeedINTCState *s, hwaddr
> > offset, @@ -274,6 +319,70 @@ static void
> aspeed_intc_status_handler(AspeedINTCState *s, hwaddr offset,
> >       }
> >   }
> >
> > +static void aspeed_intc_status_handler_multi_outpins(AspeedINTCState *s,
> > +                                                hwaddr offset,
> > +uint64_t data) {
> > +    AspeedINTCClass *aic = ASPEED_INTC_GET_CLASS(s);
> > +    const char *name = object_get_typename(OBJECT(s));
> > +    const AspeedINTCIRQ *intc_irq;
> > +    uint32_t addr = offset >> 2;
> 
> variable 'addr' here is a register index. I think 'reg' would be a better name.
Will fix it.
> 
> > +    int i;
> > +
> > +    if (!data) {
> > +        qemu_log_mask(LOG_GUEST_ERROR, "%s: Invalid data 0\n",
> __func__);
> > +        return;
> > +    }
> > +
> > +    intc_irq = aspeed_intc_get_irq(aic, addr);
> > +
> > +    if (intc_irq->inpin_idx >= aic->num_inpins) {
> 
> Since both values are defined at compile time, shouldn't that be an assert ?
> 
Will do.

Thanks for your suggestion and review.
Jamin
> 
> Thanks,
> 
> C.
> 
> 
> 
> > +        qemu_log_mask(LOG_GUEST_ERROR,
> > +                      "%s: Invalid input pin index: %d\n",
> > +                      __func__,  intc_irq->inpin_idx);
> > +        return;
> > +    }
> > +
> > +    /* clear status */
> > +    s->regs[addr] &= ~data;> +> +    /*
> > +     * The status registers are used for notify sources ISR are executed.
> > +     * If one source ISR is executed, it will clear one bit.
> > +     * If it clear all bits, it means to initialize this register status
> > +     * rather than sources ISR are executed.
> > +     */
> > +    if (data == 0xffffffff) {
> > +        return;
> > +    }
> > +
> > +    for (i = 0; i < intc_irq->num_outpins; i++) {
> > +        /* All source ISR executions are done from a specific bit */
> > +        if (data & BIT(i)) {
> > +            trace_aspeed_intc_all_isr_done_bit(name,
> intc_irq->inpin_idx, i);
> > +            if (s->pending[intc_irq->inpin_idx] & BIT(i)) {
> > +                /*
> > +                 * Handle pending source interrupt.
> > +                 * Notify firmware which source interrupt is pending
> > +                 * by setting the status bit.
> > +                 */
> > +                s->regs[addr] |= BIT(i);
> > +                s->pending[intc_irq->inpin_idx] &= ~BIT(i);
> > +                trace_aspeed_intc_trigger_irq(name,
> intc_irq->inpin_idx,
> > +
> intc_irq->outpin_idx + i,
> > +                                              s->regs[addr]);
> > +                aspeed_intc_update(s, intc_irq->inpin_idx,
> > +                                   intc_irq->outpin_idx + i, 1);
> > +            } else {
> > +                /* clear irq for the specific bit */
> > +                trace_aspeed_intc_clear_irq(name, intc_irq->inpin_idx,
> > +                                            intc_irq->outpin_idx
> + i, 0);
> > +                aspeed_intc_update(s, intc_irq->inpin_idx,
> > +                                   intc_irq->outpin_idx + i, 0);
> > +            }
> > +        }
> > +    }
> > +}
> > +
> >   static uint64_t aspeed_intc_read(void *opaque, hwaddr offset, unsigned
> int size)
> >   {
> >       AspeedINTCState *s = ASPEED_INTC(opaque); @@ -322,6 +431,7
> @@
> > static void aspeed_intc_write(void *opaque, hwaddr offset, uint64_t data,
> >       case R_GICINT134_EN:
> >       case R_GICINT135_EN:
> >       case R_GICINT136_EN:
> > +    case R_GICINT192_201_EN:
> >           aspeed_intc_enable_handler(s, offset, data);
> >           break;
> >       case R_GICINT128_STATUS:
> > @@ -335,6 +445,9 @@ static void aspeed_intc_write(void *opaque, hwaddr
> offset, uint64_t data,
> >       case R_GICINT136_STATUS:
> >           aspeed_intc_status_handler(s, offset, data);
> >           break;
> > +    case R_GICINT192_201_STATUS:
> > +        aspeed_intc_status_handler_multi_outpins(s, offset, data);
> > +        break;
> >       default:
> >           s->regs[addr] = data;
> >           break;
> > @@ -433,15 +546,16 @@ static const TypeInfo aspeed_intc_info = {
> >   };
> >
> >   static AspeedINTCIRQ aspeed_2700_intc_irqs[ASPEED_INTC_MAX_INPINS]
> = {
> > -    {0, 0, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> > -    {1, 1, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> > -    {2, 2, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> > -    {3, 3, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> > -    {4, 4, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> > -    {5, 5, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> > -    {6, 6, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> > -    {7, 7, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> > -    {8, 8, 1, R_GICINT136_EN, R_GICINT136_STATUS},
> > +    {0, 0, 10, R_GICINT192_201_EN, R_GICINT192_201_STATUS},
> > +    {1, 10, 1, R_GICINT128_EN, R_GICINT128_STATUS},
> > +    {2, 11, 1, R_GICINT129_EN, R_GICINT129_STATUS},
> > +    {3, 12, 1, R_GICINT130_EN, R_GICINT130_STATUS},
> > +    {4, 13, 1, R_GICINT131_EN, R_GICINT131_STATUS},
> > +    {5, 14, 1, R_GICINT132_EN, R_GICINT132_STATUS},
> > +    {6, 15, 1, R_GICINT133_EN, R_GICINT133_STATUS},
> > +    {7, 16, 1, R_GICINT134_EN, R_GICINT134_STATUS},
> > +    {8, 17, 1, R_GICINT135_EN, R_GICINT135_STATUS},
> > +    {9, 18, 1, R_GICINT136_EN, R_GICINT136_STATUS},
> >   };
> >
> >   static void aspeed_2700_intc_class_init(ObjectClass *klass, void
> > *data) @@ -451,10 +565,10 @@ static void
> > aspeed_2700_intc_class_init(ObjectClass *klass, void *data)
> >
> >       dc->desc = "ASPEED 2700 INTC Controller";
> >       aic->num_lines = 32;
> > -    aic->num_inpins = 9;
> > -    aic->num_outpins = 9;
> > +    aic->num_inpins = 10;
> > +    aic->num_outpins = 19;
> >       aic->mem_size = 0x4000;
> > -    aic->reg_size = 0x808;
> > +    aic->reg_size = 0xB08;
> >       aic->reg_offset = 0x1000;
> >       aic->irq_table = aspeed_2700_intc_irqs;
> >       aic->irq_table_count = ARRAY_SIZE(aspeed_2700_intc_irqs);
> > diff --git a/hw/intc/trace-events b/hw/intc/trace-events index
> > e97eea820b..913197a181 100644
> > --- a/hw/intc/trace-events
> > +++ b/hw/intc/trace-events
> > @@ -92,6 +92,7 @@ aspeed_intc_enable(const char *s, uint32_t value) "%s:
> Enable: 0x%x"
> >   aspeed_intc_select(const char *s, uint32_t value) "%s: Select: 0x%x"
> >   aspeed_intc_mask(const char *s, uint32_t change, uint32_t value) "%s:
> Mask: 0x%x: 0x%x"
> >   aspeed_intc_unmask(const char *s, uint32_t change, uint32_t value) "%s:
> UnMask: 0x%x: 0x%x"
> > +aspeed_intc_all_isr_done_bit(const char *s, int inpin_idx, int bit) "%s: All
> source ISR execution are done from specific bit: %d-%d"
> >
> >   # arm_gic.c
> >   gic_enable_irq(int irq) "irq %d enabled"

RE: [PATCH v4 17/23] hw/arm/aspeed_ast27x0.c Support AST2700 A1 GIC Interrupt Mapping

[Jamin Lin]

Hi Cedric,

> Subject: Re: [PATCH v4 17/23] hw/arm/aspeed_ast27x0.c Support AST2700 A1
> GIC Interrupt Mapping
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > 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>
> > ---
> >   hw/arm/aspeed_ast27x0.c | 82
> ++++++++++++++++++++++++++---------------
> >   1 file changed, 52 insertions(+), 30 deletions(-)
> >
> > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index
> > 09aad69e3c..eab9674b6c 100644
> > --- a/hw/arm/aspeed_ast27x0.c
> > +++ b/hw/arm/aspeed_ast27x0.c
> > @@ -120,21 +120,27 @@ static const int aspeed_soc_ast2700a0_irqmap[] =
> {
> >   };
> >
> >   /* 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_IBT]       = 2,
> >       [ASPEED_DEV_KCS]       = 4,
> >   };
> >
> > +/* GICINT 129 */
> > +/* GICINT 193 */
> > +
> >   /* 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_ADC]        = 16,
> >       [ASPEED_DEV_GPIO]       = 18,
> >   };
> >
> >   /* 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_WDT]       = 16,
> >       [ASPEED_DEV_FMC]       = 25,
> > @@ -142,7 +148,8 @@ static const int
> aspeed_soc_ast2700_gic131_intcmap[] = {
> >   };
> >
> >   /* 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_ETH2]      = 1,
> >       [ASPEED_DEV_ETH3]      = 2,
> > @@ -161,24 +168,26 @@ static const int
> aspeed_soc_ast2700_gic132_intcmap[] = {
> >   };
> >
> >   /* 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_PECI]      = 4,
> >   };
> >
> >   /* GICINT 128 ~ 136 */
> > +/* GICINT 192 ~ 201 */
> >   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},
> > +static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
> > +    {128,  ast2700_gic128_gic192_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},
> > +    {130,  ast2700_gic130_gic194_intcmap},
> > +    {131,  ast2700_gic131_gic195_intcmap},
> > +    {132,  ast2700_gic132_gic196_intcmap},
> > +    {133,  ast2700_gic133_gic197_intcmap},
> >       {134,  NULL},
> >       {135,  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);
> >       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);
> > +    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> > +        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> > +            assert(ast2700_gic_intcmap[i].ptr);
> >               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);
> >       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);
> > +    for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> > +        if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> > +            assert(ast2700_gic_intcmap[i].ptr);
> >               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();
> >   }
> > @@ -492,7 +502,6 @@ static void aspeed_soc_ast2700_realize(DeviceState
> *dev, Error **errp)
> >       Aspeed27x0SoCState *a = ASPEED27X0_SOC(dev);
> >       AspeedSoCState *s = ASPEED_SOC(dev);
> >       AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
> > -    AspeedINTCClass *ic = ASPEED_INTC_GET_CLASS(&a->intc);
> 
> I would keep this intermediate variable. Minor.
> 
Thanks for suggestion and review.
Will keep this variable.
Jamin
> 
> Reviewed-by: Cédric Le Goater <clg@redhat.com>
> 
> Thanks,
> 
> C.
> 
> 
> 
> >       g_autofree char *sram_name = NULL;
> >       qemu_irq irq;
> >
> > @@ -530,17 +539,18 @@ 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]);
> >
> > -    /* source orgates -> INTC */
> > -    for (i = 0; i < ic->num_inpins; i++) {
> > +    /* irq sources -> orgates -> INTC */
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++)
> > + {
> >           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 */
> > -    for (i = 0; i < ic->num_outpins; i++) {
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins;
> > + i++) {
> >           sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
> >                              qdev_get_gpio_in(DEVICE(&a->gic),
> > -
> aspeed_soc_ast2700_gic_intcmap[i].irq));
> > +
> > + ast2700_gic_intcmap[i].irq));
> >       }
> >
> >       /* SRAM */
> > @@ -691,10 +701,22 @@ static void
> aspeed_soc_ast2700_realize(DeviceState *dev, Error **errp)
> >       for (i = 0; i < ASPEED_I2C_GET_CLASS(&s->i2c)->num_busses; i++) {
> >           /*
> >            * The AST2700 I2C controller has one source INTC per bus.
> > -         * I2C buses interrupt are connected to GICINT130_INTC
> > -         * from bit 0 to bit 15.
> > -         * I2C bus 0 is connected to GICINT130_INTC at bit 0.
> > -         * I2C bus 15 is connected to GICINT130_INTC at bit 15.
> > +         *
> > +         * For AST2700 A0:
> > +         * 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
> > +         * 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);
> >           sysbus_connect_irq(SYS_BUS_DEVICE(&s->i2c.busses[i]), 0,
> > irq);

RE: [PATCH v4 18/23] hw/arm/aspeed_ast27x0: Support two levels of INTC controllers for AST2700 A1

[Jamin Lin]

Hi Cedric,

> Cc: Troy Lee <troy_lee@aspeedtech.com>
> Subject: Re: [PATCH v4 18/23] hw/arm/aspeed_ast27x0: Support two levels of
> INTC controllers for AST2700 A1
> 
> On 3/3/25 10:54, Jamin Lin wrote:
> > The design of INTC controllers has significantly changed in AST2700 A1.
> >
> > There are a total of 480 interrupt sources in AST2700 A1. For
> > interrupt numbers from 0 to 127, they can route directly to PSP, SSP,
> > and TSP. Due to the limitation of interrupt numbers of processors, the
> > interrupts are merged every
> > 32 sources for interrupt numbers greater than 127.
> >
> > There are two levels of interrupt controllers, INTC(CPUD Die) and
> > INTCIO (IO Die). The interrupt sources of INTC are the interrupt
> > numbers from INTC_0 to
> > INTC_127 and interrupts from INTCIO. The interrupt sources of INTCIO
> > are the interrupt numbers greater than INTC_127. INTC_IO controls the
> > interrupts
> > INTC_128 to INTC_319 only.
> >
> > Currently, only GIC 192 to 201 are supported, and their source
> > interrupts are from INTCIO and connected to INTC at input pin 0 and
> > output pins 0 to 9 for GIC 192-201.
> >
> > The design of the orgates for GICINT 196 is as follows:
> > It has interrupt sources ranging from 0 to 31, with its output pin
> > connected to INTCIO "T0 GICINT_196". The output pin is then connected to
> INTC "GIC_192_201"
> > at bit 4, and its bit 4 output should be connected to GIC 196.
> > The design of INTC GIC_192_201 have 10 output pins, mapped as following:
> > Bit 0 -> GIC 192
> > Bit 1 -> GIC 193
> > Bit 2 -> GIC 194
> > Bit 3 -> GIC 195
> > Bit 4 -> GIC 196
> >
> > To support both AST2700 A1 and A0, INTC input pins 1 to 9 and output
> > pins
> > 10 to 18 remain to support GIC 128-136, which source interrupts from INTC.
> > These will be removed if we decide not to support AST2700 A0 in the future.
> >
> >
> |-----------------------------------------------------------------------------------------------------
> --|
> > |                                                   AST2700 A1
> Design                                   |
> > |           To GICINT196
> |
> > |
> |
> > |   ETH1    |-----------|                    |--------------------------|
> |--------------|       |
> > |  -------->|0          |                    |         INTCIO
> |        |  orgates[0]  |       |
> > |   ETH2    |          4|
> orgates[0]------>|inpin[0]-------->outpin[0]|------->| 0            |       |
> > |  -------->|1         5|
> orgates[1]------>|inpin[1]-------->outpin[1]|------->| 1            |       |
> > |   ETH3    |          6|
> orgates[2]------>|inpin[2]-------->outpin[2]|------->| 2            |       |
> > |  -------->|2        19|
> orgates[3]------>|inpin[3]-------->outpin[3]|------->| 3  OR[0:9]   |-----| |
> > |   UART0   |
> 20|-->orgates[4]------>|inpin[4]-------->outpin[4]|------->| 4            |
> | |
> > |  -------->|7        21|
> orgates[5]------>|inpin[5]-------->outpin[5]|------->| 5            |     | |
> > |   UART1   |         22|
> orgates[6]------>|inpin[6]-------->outpin[6]|------->| 6            |     | |
> > |  -------->|8        23|
> orgates[7]------>|inpin[7]-------->outpin[7]|------->| 7            |     | |
> > |   UART2   |         24|
> orgates[8]------>|inpin[8]-------->outpin[8]|------->| 8            |     | |
> > |  -------->|9        25|
> orgates[9]------>|inpin[9]-------->outpin[9]|------->| 9            |     | |
> > |   UART3   |         26|
> |--------------------------|        |--------------|     | |
> > |  ---------|10       27|
> | |
> > |   UART5   |         28|
> | |
> > |  -------->|11       29|
> | |
> > |   UART6   |           |
> | |
> > |  -------->|12       30|
> |-----------------------------------------------------------------------| |
> > |   UART7   |         31|     |
> |
> > |  -------->|13         |     |
> |
> > |   UART8   |  OR[0:31] |     |
> |------------------------------|           |----------|  |
> > |  -------->|14         |     |                |            INTC
> |           |     GIC  |  |
> > |   UART9   |           |     |
> |inpin[0:0]--------->outpin[0] |---------->|192       |  |
> > |  -------->|15         |     |
> |inpin[0:1]--------->outpin[1] |---------->|193       |  |
> > |   UART10  |           |     |
> |inpin[0:2]--------->outpin[2] |---------->|194       |  |
> > |  -------->|16         |     |
> |inpin[0:3]--------->outpin[3] |---------->|195       |  |
> > |   UART11  |           |     |-------------->
> |inpin[0:4]--------->outpin[4] |---------->|196       |  |
> > |  -------->|17         |
> |inpin[0:5]--------->outpin[5] |---------->|197       |  |
> > |   UART12  |           |
> |inpin[0:6]--------->outpin[6] |---------->|198       |  |
> > |  -------->|18         |
> |inpin[0:7]--------->outpin[7] |---------->|199       |  |
> > |           |-----------|
> |inpin[0:8]--------->outpin[8] |---------->|200       |  |
> > |
> |inpin[0:9]--------->outpin[9] |---------->|201       |  |
> >
> |-----------------------------------------------------------------------------------------------------
> --|
> >
> |-----------------------------------------------------------------------------------------------------
> --|
> > |  ETH1    |-----------|
> orgates[1]------->|inpin[1]----------->outpin[10]|---------->|128       |  |
> > | -------->|0          |
> orgates[2]------->|inpin[2]----------->outpin[11]|---------->|129       |  |
> > |  ETH2    |          4|
> orgates[3]------->|inpin[3]----------->outpin[12]|---------->|130       |  |
> > | -------->|1         5|
> orgates[4]------->|inpin[4]----------->outpin[13]|---------->|131       |  |
> > |  ETH3    |
> 6|---->orgates[5]------->|inpin[5]----------->outpin[14]|---------->|132       |
> |
> > | -------->|2        19|
> orgates[6]------->|inpin[6]----------->outpin[15]|---------->|133       |  |
> > |  UART0   |         20|
> orgates[7]------->|inpin[7]----------->outpin[16]|---------->|134       |  |
> > | -------->|7        21|
> orgates[8]------->|inpin[8]----------->outpin[17]|---------->|135       |  |
> > |  UART1   |         22|
> orgates[9]------->|inpin[9]----------->outpin[18]|---------->|136       |  |
> > | -------->|8        23|
> |------------------------------|           |----------|  |
> > |  UART2   |         24|
> |
> > | -------->|9        25|                       AST2700 A0 Design
> |
> > |  UART3   |         26|
> |
> > | -------->|10       27|
> |
> > |  UART5   |         28|
> |
> > | -------->|11       29| GICINT132
> |
> > |  UART6   |           |
> |
> > | -------->|12       30|
> |
> > |  UART7   |         31|
> |
> > | -------->|13         |
> |
> > |  UART8   |  OR[0:31] |
> |
> > | -------->|14         |
> |
> > |  UART9   |           |
> |
> > | -------->|15         |
> |
> > |  UART10  |           |
> |
> > | -------->|16         |
> |
> > |  UART11  |           |
> |
> > | -------->|17         |
> |
> > |  UART12  |           |
> |
> > | -------->|18         |
> |
> > |          |-----------|
> |
> > |
> > | |
> >
> |-----------------------------------------------------------------------------------------------------
> --|
> >
> > Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com>
> > ---
> >   include/hw/arm/aspeed_soc.h |  3 +-
> >   hw/arm/aspeed_ast27x0.c     | 84
> ++++++++++++++++++++++++++++---------
> >   2 files changed, 66 insertions(+), 21 deletions(-)
> >
> > diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h
> > index 689f52dae8..62f75c33dc 100644
> > --- a/include/hw/arm/aspeed_soc.h
> > +++ b/include/hw/arm/aspeed_soc.h
> > @@ -128,7 +128,7 @@ struct Aspeed27x0SoCState {
> >       AspeedSoCState parent;
> >
> >       ARMCPU cpu[ASPEED_CPUS_NUM];
> > -    AspeedINTCState intc;
> > +    AspeedINTCState intc[2];
> 
> I would separate the ast2700_gic_intcmap changes from the introduction of
> the extra AspeedINTCState.
> 
Will do
> >       GICv3State gic;
> >       MemoryRegion dram_empty;
> >   };
> > @@ -195,6 +195,7 @@ enum {
> >       ASPEED_DEV_EHCI2,
> >       ASPEED_DEV_VIC,
> >       ASPEED_DEV_INTC,
> > +    ASPEED_DEV_INTCIO,
> >       ASPEED_DEV_SDMC,
> >       ASPEED_DEV_SCU,
> >       ASPEED_DEV_ADC,
> > diff --git a/hw/arm/aspeed_ast27x0.c b/hw/arm/aspeed_ast27x0.c index
> > eab9674b6c..028bf08d0e 100644
> > --- a/hw/arm/aspeed_ast27x0.c
> > +++ b/hw/arm/aspeed_ast27x0.c
> > @@ -57,6 +57,7 @@ static const hwaddr aspeed_soc_ast2700_memmap[] =
> {
> >       [ASPEED_DEV_ETH3]      =  0x14070000,
> >       [ASPEED_DEV_EMMC]      =  0x12090000,
> >       [ASPEED_DEV_INTC]      =  0x12100000,
> > +    [ASPEED_DEV_INTCIO]    =  0x14C18000,
> >       [ASPEED_DEV_SLI]       =  0x12C17000,
> >       [ASPEED_DEV_SLIIO]     =  0x14C1E000,
> >       [ASPEED_GIC_DIST]      =  0x12200000,
> 
> one day, we should reorder the memmap arrays by mapping address.
> 
Will do

Thanks for your review and suggestion.
Jamin
> 
> Thanks,
> 
> C.
> 
> 
> 
> > @@ -178,32 +179,48 @@ static const int ast2700_gic133_gic197_intcmap[]
> = {
> >   /* GICINT 192 ~ 201 */
> >   struct gic_intc_irq_info {
> >       int irq;
> > +    int intc_idx;
> > +    int orgate_idx;
> >       const int *ptr;
> >   };
> >
> >   static const struct gic_intc_irq_info ast2700_gic_intcmap[] = {
> > -    {128,  ast2700_gic128_gic192_intcmap},
> > -    {129,  NULL},
> > -    {130,  ast2700_gic130_gic194_intcmap},
> > -    {131,  ast2700_gic131_gic195_intcmap},
> > -    {132,  ast2700_gic132_gic196_intcmap},
> > -    {133,  ast2700_gic133_gic197_intcmap},
> > -    {134,  NULL},
> > -    {135,  NULL},
> > -    {136,  NULL},
> > +    {192, 1, 0, ast2700_gic128_gic192_intcmap},
> > +    {193, 1, 1, NULL},
> > +    {194, 1, 2, ast2700_gic130_gic194_intcmap},
> > +    {195, 1, 3, ast2700_gic131_gic195_intcmap},
> > +    {196, 1, 4, ast2700_gic132_gic196_intcmap},
> > +    {197, 1, 5, ast2700_gic133_gic197_intcmap},
> > +    {198, 1, 6, NULL},
> > +    {199, 1, 7, NULL},
> > +    {200, 1, 8, NULL},
> > +    {201, 1, 9, NULL},
> > +    {128, 0, 1, ast2700_gic128_gic192_intcmap},
> > +    {129, 0, 2, NULL},
> > +    {130, 0, 3, ast2700_gic130_gic194_intcmap},
> > +    {131, 0, 4, ast2700_gic131_gic195_intcmap},
> > +    {132, 0, 5, ast2700_gic132_gic196_intcmap},
> > +    {133, 0, 6, ast2700_gic133_gic197_intcmap},
> > +    {134, 0, 7, NULL},
> > +    {135, 0, 8, NULL},
> > +    {136, 0, 9, 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 or_idx;
> > +    int idx;
> >       int i;
> >
> >       for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> >           if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> >               assert(ast2700_gic_intcmap[i].ptr);
> > -            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
> > -                ast2700_gic_intcmap[i].ptr[dev]);
> > +            or_idx = ast2700_gic_intcmap[i].orgate_idx;
> > +            idx = ast2700_gic_intcmap[i].intc_idx;
> > +            return
> qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
> > +
> ast2700_gic_intcmap[i].ptr[dev]);
> >           }
> >       }
> >
> > @@ -215,12 +232,16 @@ static qemu_irq
> aspeed_soc_ast2700_get_irq_index(AspeedSoCState *s, int dev,
> >   {
> >       Aspeed27x0SoCState *a = ASPEED27X0_SOC(s);
> >       AspeedSoCClass *sc = ASPEED_SOC_GET_CLASS(s);
> > +    int or_idx;
> > +    int idx;
> >       int i;
> >
> >       for (i = 0; i < ARRAY_SIZE(ast2700_gic_intcmap); i++) {
> >           if (sc->irqmap[dev] == ast2700_gic_intcmap[i].irq) {
> >               assert(ast2700_gic_intcmap[i].ptr);
> > -            return qdev_get_gpio_in(DEVICE(&a->intc.orgates[i]),
> > +            or_idx = ast2700_gic_intcmap[i].orgate_idx;
> > +            idx = ast2700_gic_intcmap[i].intc_idx;
> > +            return
> > + qdev_get_gpio_in(DEVICE(&a->intc[idx].orgates[or_idx]),
> >
> ast2700_gic_intcmap[i].ptr[dev] + index);
> >           }
> >       }
> > @@ -390,7 +411,9 @@ 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[0],
> TYPE_ASPEED_2700_INTC);
> > +    object_initialize_child(obj, "intcio", &a->intc[1],
> > +                            TYPE_ASPEED_2700_INTCIO);
> >
> >       snprintf(typename, sizeof(typename), "aspeed.adc-%s", socname);
> >       object_initialize_child(obj, "adc", &s->adc, typename); @@
> > -532,27 +555,48 @@ static void aspeed_soc_ast2700_realize(DeviceState
> *dev, Error **errp)
> >       }
> >
> >       /* INTC */
> > -    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc), errp)) {
> > +    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[0]), errp)) {
> >           return;
> >       }
> >
> > -    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc), 0,
> > +    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[0]), 0,
> >                       sc->memmap[ASPEED_DEV_INTC]);
> >
> > +    /* INTCIO */
> > +    if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[1]), errp)) {
> > +        return;
> > +    }
> > +
> > +    aspeed_mmio_map(s, SYS_BUS_DEVICE(&a->intc[1]), 0,
> > +                    sc->memmap[ASPEED_DEV_INTCIO]);
> > +
> >       /* irq sources -> orgates -> INTC */
> > -    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_inpins; i++) {
> > -        qdev_connect_gpio_out(DEVICE(&a->intc.orgates[i]), 0,
> > -                              qdev_get_gpio_in(DEVICE(&a->intc),
> i));
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_inpins; i++)
> {
> > +        qdev_connect_gpio_out(DEVICE(&a->intc[0].orgates[i]), 0,
> > +
> qdev_get_gpio_in(DEVICE(&a->intc[0]),
> > + i));
> >       }
> >
> >       /* INTC -> GIC192 - GIC201 */
> >       /* INTC -> GIC128 - GIC136 */
> > -    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc)->num_outpins; i++) {
> > -        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc), i,
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[0])->num_outpins;
> i++) {
> > +        assert(i < ARRAY_SIZE(ast2700_gic_intcmap));
> > +        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[0]), i,
> >                              qdev_get_gpio_in(DEVICE(&a->gic),
> >
> ast2700_gic_intcmap[i].irq));
> >       }
> >
> > +    /* irq source -> orgates -> INTCIO */
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_inpins; i++)
> {
> > +        qdev_connect_gpio_out(DEVICE(&a->intc[1].orgates[i]), 0,
> > +                              qdev_get_gpio_in(DEVICE(&a->intc[1]),
> i));
> > +    }
> > +
> > +    /* INTCIO -> INTC */
> > +    for (i = 0; i < ASPEED_INTC_GET_CLASS(&a->intc[1])->num_outpins;
> i++) {
> > +        sysbus_connect_irq(SYS_BUS_DEVICE(&a->intc[1]), i,
> > +
> qdev_get_gpio_in(DEVICE(&a->intc[0].orgates[0]), i));
> > +    }
> > +
> >       /* 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,