From nobody Wed Apr 9 04:40:26 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1735092559; cv=none; d=zohomail.com; s=zohoarc; b=dxil2D0nvSmLzrxXYw+cIu8aZOzj/8yH8Bpf/wzajZ8YrhwaVRlBr7gp43TwXjaqzzZss4oZNcGs8JVmdzPUoLDNvG+8pTY1JYSEy+XwhBmsC88uFPHFA8+JwDpaEN4PKGJ27qgOGVBLb05P7Qq0FdnZKtJxW9yqhb0w7UgmLVw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735092559; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=A2QwnpnkJDyi9ivkhA4U9Bqid+p3uBzE/USMb1lal4o=; b=PSJAbLuRtsjBsMZ1IPUcJ+rfIo9yhqLGAoycUCcTK4lhNI4EQCYBOxNowkD11RvR1k75OTC1jsRvrgZPBl5r8yQKy6VpcQheHbI8q7y9zSffKSI1AmbLJrCie5av1SqmB4y62ngLE3FchTXW4ghKfGINUBg+ISFPCPO8SZNhv8k= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1735092559637387.4315902142687; Tue, 24 Dec 2024 18:09:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tQGpC-00081k-Qi; Tue, 24 Dec 2024 21:08:39 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQGpA-00081J-RA; Tue, 24 Dec 2024 21:08:37 -0500 Received: from mail.aspeedtech.com ([211.20.114.72] helo=TWMBX01.aspeed.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tQGp7-0002ew-J2; Tue, 24 Dec 2024 21:08:35 -0500 Received: from TWMBX01.aspeed.com (192.168.0.62) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Wed, 25 Dec 2024 10:03:13 +0800 Received: from localhost.localdomain (192.168.10.10) by TWMBX01.aspeed.com (192.168.0.62) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Wed, 25 Dec 2024 10:03:13 +0800 To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Troy Lee , Jamin Lin , Andrew Jeffery , Joel Stanley , "open list:ASPEED BMCs" , "open list:All patches CC here" CC: , , Subject: [PATCH 3/5] aspeed: Introduce AST27x0 SoC with Cortex-M4 support Date: Wed, 25 Dec 2024 10:03:09 +0800 Message-ID: <20241225020311.3718080-4-steven_lee@aspeedtech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20241225020311.3718080-1-steven_lee@aspeedtech.com> References: <20241225020311.3718080-1-steven_lee@aspeedtech.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=211.20.114.72; envelope-from=steven_lee@aspeedtech.com; helo=TWMBX01.aspeed.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_FAIL=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Steven Lee From: Steven Lee via Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1735092562775116600 Content-Type: text/plain; charset="utf-8" This initial module adds support for the AST27x0 SoC, which features four Cortex-A35 cores and two Cortex-M4 cores. The patch enables emulation of the Cortex-M4 cores, laying the groundwork for co-processor support. Signed-off-by: Steven Lee --- hw/arm/aspeed_ast27x0-cm4.c | 397 ++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 1 + include/hw/arm/aspeed_soc.h | 23 +++ 3 files changed, 421 insertions(+) create mode 100644 hw/arm/aspeed_ast27x0-cm4.c diff --git a/hw/arm/aspeed_ast27x0-cm4.c b/hw/arm/aspeed_ast27x0-cm4.c new file mode 100644 index 0000000000..591e54f0a7 --- /dev/null +++ b/hw/arm/aspeed_ast27x0-cm4.c @@ -0,0 +1,397 @@ +/* + * ASPEED Ast27x0 CM4 SoC + * + * Copyright (C) 2024 ASPEED Technology Inc. + * + * This code is licensed under the GPL version 2 or later. See + * the COPYING file in the top-level directory. + * + * Implementation extracted from the AST2600 and adapted for Ast10x0. + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "exec/address-spaces.h" +#include "hw/qdev-clock.h" +#include "hw/misc/unimp.h" +#include "hw/arm/aspeed_soc.h" + +#define ASPEED_SOC_IOMEM_SIZE 0x00200000 + +static const hwaddr aspeed_soc_ast27x0ssp_memmap[] =3D { + [ASPEED_DEV_SRAM] =3D 0x00000000, + [ASPEED_DEV_INTC] =3D 0x72100000, + [ASPEED_DEV_INTC0] =3D 0x72102000, + [ASPEED_DEV_INTC1] =3D 0x72102100, + [ASPEED_DEV_INTC2] =3D 0x72102200, + [ASPEED_DEV_INTC3] =3D 0x72102300, + [ASPEED_DEV_INTC4] =3D 0x72102400, + [ASPEED_DEV_INTC5] =3D 0x72102500, + [ASPEED_DEV_INTC6] =3D 0x72102600, + [ASPEED_DEV_INTC7] =3D 0x72102700, + [ASPEED_DEV_INTC8] =3D 0x72102800, + [ASPEED_DEV_SCU] =3D 0x72C02000, + [ASPEED_DEV_SCUIO] =3D 0x74C02000, + [ASPEED_DEV_UART0] =3D 0X74C33000, + [ASPEED_DEV_UART1] =3D 0X74C33100, + [ASPEED_DEV_UART2] =3D 0X74C33200, + [ASPEED_DEV_UART3] =3D 0X74C33300, + [ASPEED_DEV_UART4] =3D 0X72C1A000, + [ASPEED_DEV_IPC0] =3D 0x72C1C000, + [ASPEED_DEV_IPC1] =3D 0x72C1C200, + [ASPEED_DEV_IPC2] =3D 0x72C1C800, + [ASPEED_DEV_UART5] =3D 0X74C33400, + [ASPEED_DEV_UART6] =3D 0X74C33500, + [ASPEED_DEV_UART7] =3D 0X74C33600, + [ASPEED_DEV_UART8] =3D 0X74C33700, + [ASPEED_DEV_UART9] =3D 0X74C33800, + [ASPEED_DEV_UART10] =3D 0X74C33900, + [ASPEED_DEV_UART11] =3D 0X74C33A00, + [ASPEED_DEV_UART12] =3D 0X74C33B00, + [ASPEED_DEV_TIMER1] =3D 0x72C10000, +}; + +static const int aspeed_soc_ast27x0ssp_irqmap[] =3D { + [ASPEED_DEV_SCU] =3D 12, + [ASPEED_DEV_UART0] =3D 132, + [ASPEED_DEV_UART1] =3D 132, + [ASPEED_DEV_UART2] =3D 132, + [ASPEED_DEV_UART3] =3D 132, + [ASPEED_DEV_UART4] =3D 8, + [ASPEED_DEV_UART5] =3D 132, + [ASPEED_DEV_UART6] =3D 140, + [ASPEED_DEV_UART7] =3D 132, + [ASPEED_DEV_UART8] =3D 132, + [ASPEED_DEV_UART9] =3D 132, + [ASPEED_DEV_UART10] =3D 132, + [ASPEED_DEV_UART11] =3D 132, + [ASPEED_DEV_UART12] =3D 132, + [ASPEED_DEV_TIMER1] =3D 16, +}; + +static const hwaddr aspeed_soc_ast27x0tsp_memmap[] =3D { + [ASPEED_DEV_SRAM] =3D 0x00000000, + [ASPEED_DEV_INTC] =3D 0x72100000, + [ASPEED_DEV_INTC0] =3D 0x72103000, + [ASPEED_DEV_INTC1] =3D 0x72103100, + [ASPEED_DEV_INTC2] =3D 0x72103200, + [ASPEED_DEV_INTC3] =3D 0x72103300, + [ASPEED_DEV_INTC4] =3D 0x72103400, + [ASPEED_DEV_INTC5] =3D 0x72103500, + [ASPEED_DEV_INTC6] =3D 0x72103600, + [ASPEED_DEV_INTC7] =3D 0x72103700, + [ASPEED_DEV_INTC8] =3D 0x72103800, + [ASPEED_DEV_SCU] =3D 0x72C02000, + [ASPEED_DEV_SCUIO] =3D 0x74C02000, + [ASPEED_DEV_UART0] =3D 0X74C33000, + [ASPEED_DEV_UART1] =3D 0X74C33100, + [ASPEED_DEV_UART2] =3D 0X74C33200, + [ASPEED_DEV_UART3] =3D 0X74C33300, + [ASPEED_DEV_UART4] =3D 0X72C1A000, + [ASPEED_DEV_IPC0] =3D 0x72C1C400, + [ASPEED_DEV_IPC1] =3D 0x72C1C600, + [ASPEED_DEV_IPC2] =3D 0x72C1C800, + [ASPEED_DEV_UART5] =3D 0X74C33400, + [ASPEED_DEV_UART6] =3D 0X74C33500, + [ASPEED_DEV_UART7] =3D 0X74C33600, + [ASPEED_DEV_UART8] =3D 0X74C33700, + [ASPEED_DEV_UART9] =3D 0X74C33800, + [ASPEED_DEV_UART10] =3D 0X74C33900, + [ASPEED_DEV_UART11] =3D 0X74C33A00, + [ASPEED_DEV_UART12] =3D 0X74C33B00, + [ASPEED_DEV_TIMER1] =3D 0x72C10000, +}; + +static const int aspeed_soc_ast27x0tsp_irqmap[] =3D { + [ASPEED_DEV_SCU] =3D 12, + [ASPEED_DEV_UART0] =3D 132, + [ASPEED_DEV_UART1] =3D 132, + [ASPEED_DEV_UART2] =3D 132, + [ASPEED_DEV_UART3] =3D 132, + [ASPEED_DEV_UART4] =3D 8, + [ASPEED_DEV_UART5] =3D 132, + [ASPEED_DEV_UART6] =3D 140, + [ASPEED_DEV_UART7] =3D 132, + [ASPEED_DEV_UART8] =3D 132, + [ASPEED_DEV_UART9] =3D 132, + [ASPEED_DEV_UART10] =3D 132, + [ASPEED_DEV_UART11] =3D 132, + [ASPEED_DEV_UART12] =3D 132, + [ASPEED_DEV_TIMER1] =3D 16, +}; + +static qemu_irq aspeed_soc_ast27x0ssp_get_irq(AspeedSoCState *s, int dev) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(s); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + + return qdev_get_gpio_in(DEVICE(&a->armv7m), sc->irqmap[dev]); +} + +static void aspeed_soc_ast27x0ssp_init(Object *obj) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(obj); + AspeedSoCState *s =3D ASPEED_SOC(obj); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + char socname[8]; + char typename[64]; + int i; + + if (sscanf(sc->name, "%7s", socname) !=3D 1) { + g_assert_not_reached(); + } + + object_initialize_child(obj, "armv7m", &a->armv7m, TYPE_ARMV7M); + + s->sysclk =3D qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0); + + snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname); + object_initialize_child(obj, "scu", &s->scu, typename); + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", sc->silicon_rev); + + for (i =3D 0; i < sc->uarts_num; i++) { + object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_M= M); + } + + object_initialize_child(obj, "timerctrl", &s->timerctrl, + TYPE_UNIMPLEMENTED_DEVICE); + object_initialize_child(obj, "intc", &s->intc, + TYPE_UNIMPLEMENTED_DEVICE); + object_initialize_child(obj, "ipc", &s->ipc, + TYPE_UNIMPLEMENTED_DEVICE); +} + +static void aspeed_soc_ast27x0ssp_realize(DeviceState *dev_soc, Error **er= rp) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(dev_soc); + AspeedSoCState *s =3D ASPEED_SOC(dev_soc); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + DeviceState *armv7m; + Error *err =3D NULL; + g_autofree char *sram_name =3D NULL; + + if (!clock_has_source(s->sysclk)) { + error_setg(errp, "sysclk clock must be wired up by the board code"= ); + return; + } + + /* AST27X0 SSP Core */ + armv7m =3D DEVICE(&a->armv7m); + qdev_prop_set_uint32(armv7m, "num-irq", 256); + qdev_prop_set_string(armv7m, "cpu-type", aspeed_soc_cpu_type(sc)); + qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk); + object_property_set_link(OBJECT(&a->armv7m), "memory", + OBJECT(s->memory), &error_abort); + sysbus_realize(SYS_BUS_DEVICE(&a->armv7m), &error_abort); + + /* Internal SRAM */ + sram_name =3D g_strdup_printf("aspeed.sram.%d", + CPU(a->armv7m.cpu)->cpu_index); + memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, = &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SRAM], + &s->sram); + + /* SCU */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_S= CU]); + + /* UART */ + if (!aspeed_soc_uart_realize(s, errp)) { + return; + } + + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->timerctrl), + "aspeed.timerctrl", + sc->memmap[ASPEED_DEV_TIMER1], 0x200); + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->intc), + "aspeed.intc", + sc->memmap[ASPEED_DEV_INTC], 0x4000); + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->ipc), + "aspeed.ipc", + sc->memmap[ASPEED_DEV_IPC0], 0x1000); +} + +static void aspeed_soc_ast27x0ssp_class_init(ObjectClass *klass, void *dat= a) +{ + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-m4"), /* TODO cortex-m4f */ + NULL + }; + DeviceClass *dc =3D DEVICE_CLASS(klass); + AspeedSoCClass *sc =3D ASPEED_SOC_CLASS(dc); + + /* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable =3D false; + dc->realize =3D aspeed_soc_ast27x0ssp_realize; + + sc->name =3D "ast2700ssp-a0"; + sc->valid_cpu_types =3D valid_cpu_types; + sc->silicon_rev =3D AST2700_A0_SILICON_REV; + sc->sram_size =3D 0x1000000; + sc->spis_num =3D 0; + sc->ehcis_num =3D 0; + sc->wdts_num =3D 0; + sc->macs_num =3D 0; + sc->uarts_num =3D 13; + sc->uarts_base =3D ASPEED_DEV_UART0; + sc->irqmap =3D aspeed_soc_ast27x0ssp_irqmap; + sc->memmap =3D aspeed_soc_ast27x0ssp_memmap; + sc->num_cpus =3D 1; + sc->get_irq =3D aspeed_soc_ast27x0ssp_get_irq; +} + +static qemu_irq aspeed_soc_ast27x0tsp_get_irq(AspeedSoCState *s, int dev) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(s); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + + return qdev_get_gpio_in(DEVICE(&a->armv7m), sc->irqmap[dev]); +} + +static void aspeed_soc_ast27x0tsp_init(Object *obj) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(obj); + AspeedSoCState *s =3D ASPEED_SOC(obj); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + char socname[8]; + char typename[64]; + int i; + + if (sscanf(sc->name, "%7s", socname) !=3D 1) { + g_assert_not_reached(); + } + + object_initialize_child(obj, "armv7m", &a->armv7m, TYPE_ARMV7M); + + s->sysclk =3D qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0); + + snprintf(typename, sizeof(typename), "aspeed.scu-%s", socname); + object_initialize_child(obj, "scu", &s->scu, typename); + qdev_prop_set_uint32(DEVICE(&s->scu), "silicon-rev", sc->silicon_rev); + + for (i =3D 0; i < sc->uarts_num; i++) { + object_initialize_child(obj, "uart[*]", &s->uart[i], TYPE_SERIAL_M= M); + } + + object_initialize_child(obj, "timerctrl", &s->timerctrl, + TYPE_UNIMPLEMENTED_DEVICE); + object_initialize_child(obj, "intc", &s->intc, + TYPE_UNIMPLEMENTED_DEVICE); + object_initialize_child(obj, "ipc", &s->ipc, + TYPE_UNIMPLEMENTED_DEVICE); +} + +static void aspeed_soc_ast27x0tsp_realize(DeviceState *dev_soc, Error **er= rp) +{ + Aspeed27x0CM4SoCState *a =3D ASPEED27X0CM4_SOC(dev_soc); + AspeedSoCState *s =3D ASPEED_SOC(dev_soc); + AspeedSoCClass *sc =3D ASPEED_SOC_GET_CLASS(s); + DeviceState *armv7m; + Error *err =3D NULL; + g_autofree char *sram_name =3D NULL; + + if (!clock_has_source(s->sysclk)) { + error_setg(errp, "sysclk clock must be wired up by the board code"= ); + return; + } + + /* AST27X0 TSP Core */ + armv7m =3D DEVICE(&a->armv7m); + qdev_prop_set_uint32(armv7m, "num-irq", 256); + qdev_prop_set_string(armv7m, "cpu-type", aspeed_soc_cpu_type(sc)); + qdev_connect_clock_in(armv7m, "cpuclk", s->sysclk); + object_property_set_link(OBJECT(&a->armv7m), "memory", + OBJECT(s->memory), &error_abort); + sysbus_realize(SYS_BUS_DEVICE(&a->armv7m), &error_abort); + + /* Internal SRAM */ + sram_name =3D g_strdup_printf("aspeed.sram.%d", + CPU(a->armv7m.cpu)->cpu_index); + memory_region_init_ram(&s->sram, OBJECT(s), sram_name, sc->sram_size, = &err); + if (err !=3D NULL) { + error_propagate(errp, err); + return; + } + memory_region_add_subregion(s->memory, + sc->memmap[ASPEED_DEV_SRAM], + &s->sram); + + /* SCU */ + if (!sysbus_realize(SYS_BUS_DEVICE(&s->scu), errp)) { + return; + } + aspeed_mmio_map(s, SYS_BUS_DEVICE(&s->scu), 0, sc->memmap[ASPEED_DEV_S= CU]); + + /* UART */ + if (!aspeed_soc_uart_realize(s, errp)) { + return; + } + + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->timerctrl), + "aspeed.timerctrl", + sc->memmap[ASPEED_DEV_TIMER1], 0x200); + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->intc), + "aspeed.intc", + sc->memmap[ASPEED_DEV_INTC], 0x4000); + aspeed_mmio_map_unimplemented(s, SYS_BUS_DEVICE(&s->ipc), + "aspeed.ipc", + sc->memmap[ASPEED_DEV_IPC0], 0x1000); +} + +static void aspeed_soc_ast27x0tsp_class_init(ObjectClass *klass, void *dat= a) +{ + static const char * const valid_cpu_types[] =3D { + ARM_CPU_TYPE_NAME("cortex-m4"), /* TODO cortex-m4f */ + NULL + }; + DeviceClass *dc =3D DEVICE_CLASS(klass); + AspeedSoCClass *sc =3D ASPEED_SOC_CLASS(dc); + + /* Reason: The Aspeed SoC can only be instantiated from a board */ + dc->user_creatable =3D false; + dc->realize =3D aspeed_soc_ast27x0tsp_realize; + + sc->name =3D "ast2700tsp-a0"; + sc->valid_cpu_types =3D valid_cpu_types; + sc->silicon_rev =3D AST2700_A0_SILICON_REV; + sc->sram_size =3D 0x1000000; + sc->spis_num =3D 0; + sc->ehcis_num =3D 0; + sc->wdts_num =3D 0; + sc->macs_num =3D 0; + sc->uarts_num =3D 13; + sc->uarts_base =3D ASPEED_DEV_UART0; + sc->irqmap =3D aspeed_soc_ast27x0tsp_irqmap; + sc->memmap =3D aspeed_soc_ast27x0tsp_memmap; + sc->num_cpus =3D 1; + sc->get_irq =3D aspeed_soc_ast27x0tsp_get_irq; +} + + +static const TypeInfo aspeed_soc_ast27x0cm4_types[] =3D { + { + .name =3D TYPE_ASPEED27X0CM4_SOC, + .parent =3D TYPE_ASPEED_SOC, + .instance_size =3D sizeof(Aspeed27x0CM4SoCState), + .abstract =3D true, + }, { + .name =3D "ast2700ssp-a0", + .parent =3D TYPE_ASPEED27X0CM4_SOC, + .instance_init =3D aspeed_soc_ast27x0ssp_init, + .class_init =3D aspeed_soc_ast27x0ssp_class_init, + }, { + .name =3D "ast2700tsp-a0", + .parent =3D TYPE_ASPEED27X0CM4_SOC, + .instance_init =3D aspeed_soc_ast27x0tsp_init, + .class_init =3D aspeed_soc_ast27x0tsp_class_init, + }, +}; + +DEFINE_TYPES(aspeed_soc_ast27x0cm4_types) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 490234b3b8..cd7780b997 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -43,6 +43,7 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc_common.c', 'aspeed_ast2400.c', 'aspeed_ast2600.c', + 'aspeed_ast27x0-cm4.c', 'aspeed_ast10x0.c', 'aspeed_eeprom.c', 'fby35.c')) diff --git a/include/hw/arm/aspeed_soc.h b/include/hw/arm/aspeed_soc.h index bf885da3fc..7de69dc57d 100644 --- a/include/hw/arm/aspeed_soc.h +++ b/include/hw/arm/aspeed_soc.h @@ -101,6 +101,8 @@ struct AspeedSoCState { UnimplementedDeviceState sgpiom; UnimplementedDeviceState ltpi; UnimplementedDeviceState jtag[ASPEED_JTAG_NUM]; + UnimplementedDeviceState intc; + UnimplementedDeviceState ipc; AspeedAPB2OPBState fsi[2]; }; =20 @@ -127,6 +129,15 @@ struct Aspeed2600SoCState { #define TYPE_ASPEED2600_SOC "aspeed2600-soc" OBJECT_DECLARE_SIMPLE_TYPE(Aspeed2600SoCState, ASPEED2600_SOC) =20 +struct Aspeed27x0CM4SoCState { + AspeedSoCState parent; + + ARMv7MState armv7m; +}; + +#define TYPE_ASPEED27X0CM4_SOC "aspeed27x0cm4-soc" +OBJECT_DECLARE_SIMPLE_TYPE(Aspeed27x0CM4SoCState, ASPEED27X0CM4_SOC) + struct Aspeed27x0SoCState { AspeedSoCState parent; =20 @@ -201,6 +212,15 @@ enum { ASPEED_DEV_EHCI2, ASPEED_DEV_VIC, ASPEED_DEV_INTC, + ASPEED_DEV_INTC0, + ASPEED_DEV_INTC1, + ASPEED_DEV_INTC2, + ASPEED_DEV_INTC3, + ASPEED_DEV_INTC4, + ASPEED_DEV_INTC5, + ASPEED_DEV_INTC6, + ASPEED_DEV_INTC7, + ASPEED_DEV_INTC8, ASPEED_DEV_SDMC, ASPEED_DEV_SCU, ASPEED_DEV_ADC, @@ -253,6 +273,9 @@ enum { ASPEED_DEV_SCUIO, ASPEED_DEV_SLI, ASPEED_DEV_SLIIO, + ASPEED_DEV_IPC0, + ASPEED_DEV_IPC1, + ASPEED_DEV_IPC2, ASPEED_GIC_DIST, ASPEED_GIC_REDIST, }; --=20 2.34.1