From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a05:6512:e9d:0:0:0:0 with SMTP id bi29csp1618455lfb; Thu, 31 Mar 2022 01:32:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyZHZ/6okUeajT3QEQlbxp19nwI/okYCqDEDKkHV0Ee2mg4k1C1J2a6XcjbxjxupdGHhv0v X-Received: by 2002:a05:622a:1906:b0:2e1:e563:12b9 with SMTP id w6-20020a05622a190600b002e1e56312b9mr3267560qtc.44.1648715541158; Thu, 31 Mar 2022 01:32:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1648715541; cv=none; d=google.com; s=arc-20160816; b=OlFainwV3qgfLIGlrSYezhyFiqyF6IQ7B66VKkHU5/6j2Ym1cynVt9OjlN4YvTXeTw OhK91kAW+w1GKF5p5FWaHnTiKUKxfS9XQfKITSDQrM1xoMtj4TKZU0Ss1Z6s5GoOtLla xj+hOjhCkqQMgbOducRla7zgQlO6tFiWFTFQgoGnEI/X8D/63K3WpzrcWb4lslm5vBmO pHR0Wk/1NsYQ+tH/oAWD5ikVIyguFkQ71DAcprgOub3s6dqGhVI9CS/6U4q2EHjfj/eS 6xPqnpTf6kBnOu/GPtY4kgrLmOHD4TEuIS94m8OtAi4PgjqHhvsK0z2jrkHTvdTb04fH 7T2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:mime-version:references :in-reply-to:message-id:date:subject:to:from; bh=CfH6EEpQNqWwaU0CedHCI374rXaRhKwKjxgimQPye3A=; b=w4ezRr4dpoiHQEs9nB69A9ZLcB6A8gZxBjbnGT9QWsONqUKVbOMMJ+DJHAbljZu7BM s/elVMInQPoiw98A1jBbn0QrKvflk0zi0odWFByT1xbr/Xw41axX6aOBmnMpPidVWDu4 kU2UD/F2zVlKfPgacFoYI+6N8VdmzJSo3kvPix9XYeBrtA7cpGy+81lhkv/nntbM5O7N F/XR/lwJgmwE9VJ3S/uR6XPIP5b3sV0iIZj5W4BYlsHUbtnaPdasHN8HZ28Gpz3cioVE CLsbBDT6rhEiBltKi9xZt5ApqJbraIqZGqDvc35fsVz3fKhYRnLL/J8yIfXnVrt2/HTr mo7A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d11-20020ac851cb000000b002e1fbf3c0dfsi11886928qtn.720.2022.03.31.01.32.20 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Mar 2022 01:32:21 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:44804 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nZqE7-0007cz-W7 for alex.bennee@linaro.org; Thu, 31 Mar 2022 04:32:20 -0400 Received: from eggs.gnu.org ([209.51.188.92]:57280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZpzS-000290-Jf; Thu, 31 Mar 2022 04:17:10 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:46365) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nZpzQ-00017L-Be; Thu, 31 Mar 2022 04:17:10 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 22V84ttu054264; Thu, 31 Mar 2022 16:04:55 +0800 (GMT-8) (envelope-from jamin_lin@aspeedtech.com) Received: from localhost.localdomain (192.168.70.87) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Thu, 31 Mar 2022 16:15:53 +0800 From: Jamin Lin To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell , Andrew Jeffery , Joel Stanley , Alistair Francis , Cleber Rosa , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , "Beraldo Leal" , "open list:ASPEED BMCs" , "open list:All patches CC here" Subject: [PATCH v2 8/9] aspeed: Add an AST1030 eval board Date: Thu, 31 Mar 2022 16:15:44 +0800 Message-ID: <20220331081545.7140-9-jamin_lin@aspeedtech.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220331081545.7140-1-jamin_lin@aspeedtech.com> References: <20220331081545.7140-1-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.70.87] X-ClientProxiedBy: TWMBX02.aspeed.com (192.168.0.24) To TWMBX02.aspeed.com (192.168.0.24) X-DNSRBL: X-MAIL: twspam01.aspeedtech.com 22V84ttu054264 Received-SPF: pass client-ip=211.20.114.71; envelope-from=jamin_lin@aspeedtech.com; helo=twspam01.aspeedtech.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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jamin_lin@aspeedtech.com, troy_lee@aspeedtech.com, steven_lee@aspeedtech.com Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: z7y7EAqAuwn5 The image should be supplied with ELF binary. $ qemu-system-arm -M ast1030-evb -kernel zephyr.elf -nographic Signed-off-by: Troy Lee Signed-off-by: Jamin Lin Signed-off-by: Steven Lee --- hw/arm/aspeed.c | 111 ++++++++++++++++++++++++++++++++++++++++ include/hw/arm/aspeed.h | 21 ++++++++ 2 files changed, 132 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index d205384d98..14ce0dff8b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -24,6 +24,7 @@ #include "hw/loader.h" #include "qemu/error-report.h" #include "qemu/units.h" +#include "hw/qdev-clock.h" static struct arm_boot_info aspeed_board_binfo = { .board_id = -1, /* device-tree-only board */ @@ -1361,3 +1362,113 @@ static const TypeInfo aspeed_machine_types[] = { }; DEFINE_TYPES(aspeed_machine_types) + +#define AST1030_INTERNAL_FLASH_SIZE (1024 * 1024) + +struct AspeedMiniBmcMachineState { + /* Private */ + MachineState parent_obj; + /* Public */ + + AspeedSoCState soc; + MemoryRegion ram_container; + MemoryRegion max_ram; + bool mmio_exec; + char *fmc_model; + char *spi_model; +}; + +/* Main SYSCLK frequency in Hz (200MHz) */ +#define SYSCLK_FRQ 200000000ULL + +static void aspeed_minibmc_machine_ast1030_evb_class_init(ObjectClass *oc, + void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + AspeedMiniBmcMachineClass *amc = ASPEED_MINIBMC_MACHINE_CLASS(oc); + + mc->desc = "Aspeed AST1030 MiniBMC (Cortex-M4)"; + amc->soc_name = "ast1030-a1"; + amc->hw_strap1 = 0; + amc->hw_strap2 = 0; + mc->default_ram_size = 0; + mc->default_cpus = mc->min_cpus = mc->max_cpus = 1; + amc->fmc_model = "sst25vf032b"; + amc->spi_model = "sst25vf032b"; + amc->num_cs = 2; +} + +static void ast1030_machine_instance_init(Object *obj) +{ + ASPEED_MINIBMC_MACHINE(obj)->mmio_exec = false; +} + +static void aspeed_minibmc_machine_init(MachineState *machine) +{ + AspeedMiniBmcMachineState *bmc = ASPEED_MINIBMC_MACHINE(machine); + AspeedMiniBmcMachineClass *amc = ASPEED_MINIBMC_MACHINE_GET_CLASS(machine); + Clock *sysclk; + + sysclk = clock_new(OBJECT(machine), "SYSCLK"); + clock_set_hz(sysclk, SYSCLK_FRQ); + + object_initialize_child(OBJECT(machine), "soc", &bmc->soc, amc->soc_name); + qdev_connect_clock_in(DEVICE(&bmc->soc), "sysclk", sysclk); + + qdev_prop_set_uint32(DEVICE(&bmc->soc), "uart-default", + amc->uart_default); + qdev_realize(DEVICE(&bmc->soc), NULL, &error_abort); + + aspeed_board_init_flashes(&bmc->soc.fmc, + bmc->fmc_model ? bmc->fmc_model : amc->fmc_model, + amc->num_cs, + 0); + + aspeed_board_init_flashes(&bmc->soc.spi[0], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, amc->num_cs); + + aspeed_board_init_flashes(&bmc->soc.spi[1], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, (amc->num_cs * 2)); + + if (amc->i2c_init) { + amc->i2c_init(bmc); + } + + armv7m_load_kernel(ARM_CPU(first_cpu), + machine->kernel_filename, + AST1030_INTERNAL_FLASH_SIZE); +} + +static void aspeed_minibmc_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + AspeedMiniBmcMachineClass *amc = ASPEED_MINIBMC_MACHINE_CLASS(oc); + + mc->init = aspeed_minibmc_machine_init; + mc->no_floppy = 1; + mc->no_cdrom = 1; + mc->no_parallel = 1; + mc->default_ram_id = "ram"; + amc->uart_default = ASPEED_DEV_UART5; +} + +static const TypeInfo aspeed_minibmc_machine_types[] = { + { + .name = MACHINE_TYPE_NAME("ast1030-evb"), + .parent = TYPE_ASPEED_MINIBMC_MACHINE, + .class_init = aspeed_minibmc_machine_ast1030_evb_class_init, + }, { + .name = TYPE_ASPEED_MINIBMC_MACHINE, + .parent = TYPE_MACHINE, + .instance_size = sizeof(AspeedMiniBmcMachineState), + .instance_init = ast1030_machine_instance_init, + .class_size = sizeof(AspeedMiniBmcMachineClass), + .class_init = aspeed_minibmc_machine_class_init, + .abstract = true, + } +}; + +DEFINE_TYPES(aspeed_minibmc_machine_types) + diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index cbeacb214c..d300ab0042 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -13,12 +13,18 @@ #include "qom/object.h" typedef struct AspeedMachineState AspeedMachineState; +typedef struct AspeedMiniBmcMachineState AspeedMiniBmcMachineState; #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") +#define TYPE_ASPEED_MINIBMC_MACHINE MACHINE_TYPE_NAME("aspeed-minibmc") typedef struct AspeedMachineClass AspeedMachineClass; DECLARE_OBJ_CHECKERS(AspeedMachineState, AspeedMachineClass, ASPEED_MACHINE, TYPE_ASPEED_MACHINE) +typedef struct AspeedMiniBmcMachineClass AspeedMiniBmcMachineClass; +DECLARE_OBJ_CHECKERS(AspeedMiniBmcMachineState, AspeedMiniBmcMachineClass, + ASPEED_MINIBMC_MACHINE, TYPE_ASPEED_MINIBMC_MACHINE) + #define ASPEED_MAC0_ON (1 << 0) #define ASPEED_MAC1_ON (1 << 1) #define ASPEED_MAC2_ON (1 << 2) @@ -41,5 +47,20 @@ struct AspeedMachineClass { uint32_t uart_default; }; +struct AspeedMiniBmcMachineClass { + MachineClass parent_obj; + + const char *name; + const char *desc; + const char *soc_name; + uint32_t hw_strap1; + uint32_t hw_strap2; + const char *fmc_model; + const char *spi_model; + uint32_t num_cs; + uint32_t macs_mask; + void (*i2c_init)(AspeedMiniBmcMachineState *bmc); + uint32_t uart_default; +}; #endif -- 2.17.1