From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 36765C433F5 for ; Fri, 1 Apr 2022 01:27:27 +0000 (UTC) Received: from localhost ([::1]:43700 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1na64U-0002IU-0a for qemu-devel@archiver.kernel.org; Thu, 31 Mar 2022 21:27:26 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43710) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na634-00017W-7r; Thu, 31 Mar 2022 21:25:58 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:39256) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1na62z-0002ss-Fo; Thu, 31 Mar 2022 21:25:56 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 2311DZNZ079190; Fri, 1 Apr 2022 09:13:35 +0800 (GMT-8) (envelope-from jamin_lin@aspeedtech.com) Received: from aspeedtech.com (192.168.70.87) by TWMBX02.aspeed.com (192.168.0.24) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 1 Apr 2022 09:24:35 +0800 Date: Fri, 1 Apr 2022 09:24:30 +0800 From: Jamin Lin To: =?utf-8?Q?C=C3=A9dric?= Le Goater Subject: Re: [PATCH v2 8/9] aspeed: Add an AST1030 eval board Message-ID: <20220401012427.GA3590@aspeedtech.com> References: <20220331081545.7140-1-jamin_lin@aspeedtech.com> <20220331081545.7140-9-jamin_lin@aspeedtech.com> <09f78864-066e-a18c-6abe-26fe50753c81@kaod.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <09f78864-066e-a18c-6abe-26fe50753c81@kaod.org> User-Agent: Mutt/1.9.4 (2018-02-28) 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 2311DZNZ079190 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-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Troy Lee , Beraldo Leal , Andrew Jeffery , Alistair Francis , Steven Lee , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Wainer dos Santos Moschetta , "open list:All patches CC here" , "open list:ASPEED BMCs" , Joel Stanley , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The 03/31/2022 11:04, Cédric Le Goater wrote: Hi Cedric, > Hello Jamin, > > On 3/31/22 10:15, Jamin Lin wrote: > > 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; > > +}; > > > > Why duplicate the state structure since it is the same ? > Will fix > > +/* 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; > > +}; > > I don't see a good reason to duplicate the class either. > > Thanks, > > C. Will fix