aspeed_ast27x0: Move SCU link into AST27x0 coprocessors

Cédric Le Goater Wed, 15 Jul 2026 23:37:57 -0700

On 7/7/26 08:09, Jamin Lin wrote:

The SCU link is only needed by the AST27x0 SSP/TSP coprocessors for their
AST2700-specific SCU alias window.


Move the link property from the common AspeedCoprocessorState into
Aspeed27x0CoprocessorState, so the generic coprocessor model no longer
contains an AST2700-specific dependency.

Also validate that the SCU link has been provided during device realize
before accessing it.

No functional change.

Signed-off-by: Jamin Lin <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
  include/hw/arm/aspeed_coprocessor.h |  5 +++--
  hw/arm/aspeed_ast27x0-ssp.c         | 20 ++++++++++++++++----
  hw/arm/aspeed_ast27x0-tsp.c         | 20 ++++++++++++++++----
  hw/arm/aspeed_coprocessor_common.c  |  2 --
  4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/include/hw/arm/aspeed_coprocessor.h 
b/include/hw/arm/aspeed_coprocessor.h
index ac58a5f424..adfc3c4512 100644
--- a/include/hw/arm/aspeed_coprocessor.h
+++ b/include/hw/arm/aspeed_coprocessor.h
@@ -20,10 +20,8 @@ struct AspeedCoprocessorState {
      MemoryRegion *sram;
      MemoryRegion sram_alias;
      MemoryRegion uart_alias;
-    MemoryRegion scu_alias;
      Clock *sysclk;

- AspeedSCUState *scu;

      AspeedSCUState scuio;
      AspeedTimerCtrlState timerctrl;
      SerialMM *uart;
@@ -52,6 +50,9 @@ struct Aspeed27x0CoprocessorState {
      UnimplementedDeviceState otp;

ARMv7MState armv7m;


If you resend, or in a following series, please add a comment
saying that the fields below are shared with the main SoC.

+    MemoryRegion scu_alias;
+    Aspeed2700SCUState *scu;
  };

#define TYPE_ASPEED27X0SSP_COPROCESSOR "aspeed27x0ssp-coprocessor"

diff --git a/hw/arm/aspeed_ast27x0-ssp.c b/hw/arm/aspeed_ast27x0-ssp.c
index 68a8ab26f7..28bb59c8c5 100644
--- a/hw/arm/aspeed_ast27x0-ssp.c
+++ b/hw/arm/aspeed_ast27x0-ssp.c
@@ -167,6 +167,12 @@ static void aspeed_soc_ast27x0ssp_realize(DeviceState 
*dev_soc, Error **errp)
          return;
      }

+ if (!a->scu) {

+        error_setg(errp, TYPE_ASPEED27X0SSP_COPROCESSOR
+                   ": 'scu' link is not set");
+        return;
+    }
+
      /* AST27X0 SSP Core */
      armv7m = DEVICE(&a->armv7m);
      qdev_prop_set_uint32(armv7m, "num-irq", 256);
@@ -195,11 +201,11 @@ static void aspeed_soc_ast27x0ssp_realize(DeviceState 
*dev_soc, Error **errp)
                                  &s->sram_alias);

/* SCU */

-    memory_region_init_alias(&s->scu_alias, OBJECT(s), "scu.alias",
-                             &s->scu->iomem, 0,
-                             memory_region_size(&s->scu->iomem));
+    memory_region_init_alias(&a->scu_alias, OBJECT(a), "scu.alias",
+                             &a->scu->parent_obj.iomem, 0,
+                             memory_region_size(&a->scu->parent_obj.iomem));
      memory_region_add_subregion(s->memory, sc->memmap[ASPEED_DEV_SCU],
-                                &s->scu_alias);
+                                &a->scu_alias);

/* INTC */

      if (!sysbus_realize(SYS_BUS_DEVICE(&a->intc[0]), errp)) {
@@ -275,6 +281,11 @@ static void aspeed_soc_ast27x0ssp_realize(DeviceState 
*dev_soc, Error **errp)
                                    sc->memmap[ASPEED_DEV_OTP], 0x800);
  }

+static const Property aspeed_27x0_coprocessor_properties[] = {

+    DEFINE_PROP_LINK("scu", Aspeed27x0CoprocessorState, scu,
+                     TYPE_ASPEED_2700_SCU, Aspeed2700SCUState *),
+};
+
  static void aspeed_soc_ast27x0ssp_class_init(ObjectClass *klass,
                                               const void *data)
  {
@@ -288,6 +299,7 @@ static void aspeed_soc_ast27x0ssp_class_init(ObjectClass 
*klass,
      /* Reason: The Aspeed Coprocessor can only be instantiated from a board */
      dc->user_creatable = false;
      dc->realize = aspeed_soc_ast27x0ssp_realize;
+    device_class_set_props(dc, aspeed_27x0_coprocessor_properties);

sc->valid_cpu_types = valid_cpu_types;

      sc->irqmap = aspeed_soc_ast27x0ssp_irqmap;
diff --git a/hw/arm/aspeed_ast27x0-tsp.c b/hw/arm/aspeed_ast27x0-tsp.c
index b8a4f7c91d..f5c4a02161 100644
--- a/hw/arm/aspeed_ast27x0-tsp.c
+++ b/hw/arm/aspeed_ast27x0-tsp.c
@@ -167,6 +167,12 @@ static void aspeed_soc_ast27x0tsp_realize(DeviceState 
*dev_soc, Error **errp)
          return;
      }