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 087DFC433F5 for ; Fri, 1 Apr 2022 08:51:29 +0000 (UTC) Received: from localhost ([::1]:52596 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naD0D-0002XM-1A for qemu-devel@archiver.kernel.org; Fri, 01 Apr 2022 04:51:29 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52452) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naCvD-0007XM-Ua; Fri, 01 Apr 2022 04:46:20 -0400 Received: from twspam01.aspeedtech.com ([211.20.114.71]:16261) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naCvA-0002E9-R8; Fri, 01 Apr 2022 04:46:19 -0400 Received: from mail.aspeedtech.com ([192.168.0.24]) by twspam01.aspeedtech.com with ESMTP id 2318YYaS031364; Fri, 1 Apr 2022 16:34:34 +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 16:45:35 +0800 Date: Fri, 1 Apr 2022 16:45:32 +0800 From: Jamin Lin To: =?utf-8?Q?C=C3=A9dric?= Le Goater Subject: Re: [PATCH v4 8/9] aspeed: Add an AST1030 eval board Message-ID: <20220401084530.GA15438@aspeedtech.com> References: <20220401034651.9066-1-jamin_lin@aspeedtech.com> <20220401034651.9066-9-jamin_lin@aspeedtech.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: 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 2318YYaS031364 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 04/01/2022 06:59, Cédric Le Goater wrote: > On 4/1/22 05:46, 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 | 97 +++++++++++++++++++++++++++++++++++++++++ > > include/hw/arm/aspeed.h | 6 +-- > > 2 files changed, 100 insertions(+), 3 deletions(-) > > > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > > index d205384d98..30b49d2db1 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,99 @@ static const TypeInfo aspeed_machine_types[] = { > > }; > > > > DEFINE_TYPES(aspeed_machine_types) > > + > > +#define AST1030_INTERNAL_FLASH_SIZE (1024 * 1024) > > +/* 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); > > + AspeedMachineClass *amc = ASPEED_MINIBMC_MACHINE_CLASS(oc); > > I don't think we need a ASPEED_MINIBMC type (yet) > Fixed > > + > > + 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; > > In this routine, you could add : > > amc->macs_mask = 0; > > Since the NICs are not modeled yet. > Thanks for your review and suggestion. Added in v5 patch. > > +} > > + > > +static void ast1030_machine_instance_init(Object *obj) > > +{ > > + ASPEED_MINIBMC_MACHINE(obj)->mmio_exec = false; > > +} > > ast1030_machine_instance_init() is not that useful either. > Fixed > > + > > +static void aspeed_minibmc_machine_init(MachineState *machine) > > +{ > > + AspeedMachineState *bmc = ASPEED_MINIBMC_MACHINE(machine); > > + AspeedMachineClass *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); > > + AspeedMachineClass *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; > > This is very much like aspeed_machine_class_init() > > > > +} > > + > > +static const TypeInfo aspeed_minibmc_machine_types[] = { > > + { > > + .name = MACHINE_TYPE_NAME("ast1030-evb"), > > + .parent = TYPE_ASPEED_MINIBMC_MACHINE, > > Why don't you inherit directly from TYPE_ASPEED_MACHINE and simplify > the model by removing the duplicate TYPE_ASPEED_MINIBMC_MACHINE ? > Fixed and removed TYPE_ASPEED_MINIBMC_MACHINE in v5 patch. > > + .class_init = aspeed_minibmc_machine_ast1030_evb_class_init, > > + }, { > > + .name = TYPE_ASPEED_MINIBMC_MACHINE, > > + .parent = TYPE_MACHINE, > > + .instance_size = sizeof(AspeedMachineState), > > + .instance_init = ast1030_machine_instance_init, > > + .class_size = sizeof(AspeedMachineClass), > > + .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..b7411c860d 100644 > > --- a/include/hw/arm/aspeed.h > > +++ b/include/hw/arm/aspeed.h > > @@ -13,18 +13,19 @@ > > #include "qom/object.h" > > > > typedef struct AspeedMachineState AspeedMachineState; > > - > > #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) > > +DECLARE_OBJ_CHECKERS(AspeedMachineState, AspeedMachineClass, > > + ASPEED_MINIBMC_MACHINE, TYPE_ASPEED_MINIBMC_MACHINE) > > This looks useless to me. > > We might want a new type of Aspeed machines someday but I don't see > the need yet. > > Thanks, > > C. > removed and fixed in v5 patch. Thanks for your review. > > > > #define ASPEED_MAC0_ON (1 << 0) > > #define ASPEED_MAC1_ON (1 << 1) > > #define ASPEED_MAC2_ON (1 << 2) > > #define ASPEED_MAC3_ON (1 << 3) > > > > - > > struct AspeedMachineClass { > > MachineClass parent_obj; > > > > @@ -41,5 +42,4 @@ struct AspeedMachineClass { > > uint32_t uart_default; > > }; > > > > - > > #endif >