From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSfJy-00045D-6X for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:01:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSfJs-0001bM-AC for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:01:29 -0400 Received: from 6.mo7.mail-out.ovh.net ([188.165.39.218]:52988) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSfJr-0001b8-VM for qemu-devel@nongnu.org; Thu, 28 Jul 2016 03:01:24 -0400 Received: from player796.ha.ovh.net (b7.ovh.net [213.186.33.57]) by mo7.mail-out.ovh.net (Postfix) with ESMTP id F366A100CEB0 for ; Thu, 28 Jul 2016 09:01:22 +0200 (CEST) References: <1469638018-17590-1-git-send-email-clg@kaod.org> <1469638018-17590-5-git-send-email-clg@kaod.org> <1469673943.5468.94.camel@aj.id.au> From: =?UTF-8?Q?C=c3=a9dric_Le_Goater?= Message-ID: Date: Thu, 28 Jul 2016 09:01:08 +0200 MIME-Version: 1.0 In-Reply-To: <1469673943.5468.94.camel@aj.id.au> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 4/6] palmetto-bmc: add board specific configuration List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Jeffery , Peter Maydell Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org On 07/28/2016 04:45 AM, Andrew Jeffery wrote: > On Wed, 2016-07-27 at 18:46 +0200, C=C3=A9dric Le Goater wrote: >> aspeed_init() now uses a board identifier to customize some values >> specific to the board, ram base, board revision number, etc. >> >> Signed-off-by: C=C3=A9dric Le Goater >=20 > Looks okay to me, some minor comments below: >=20 >> --- >> hw/arm/palmetto-bmc.c | 34 ++++++++++++++++++++++++++-------- >> 1 file changed, 26 insertions(+), 8 deletions(-) >> >> diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c >> index 8a3ff5568575..cd8aa59756b9 100644 >> --- a/hw/arm/palmetto-bmc.c >> +++ b/hw/arm/palmetto-bmc.c >> @@ -22,8 +22,6 @@ >> #include "sysemu/blockdev.h" >> =20 >> static struct arm_boot_info aspeed_binfo =3D { >> - .loader_start =3D AST2400_SDRAM_BASE, >> - .board_id =3D 0, >> .nb_cpus =3D 1, >> }; >> =20 >> @@ -32,6 +30,21 @@ typedef struct AspeedBoardState { >> MemoryRegion ram; >> } AspeedBoardState; >> =20 >> +typedef struct AspeedBoardConfig { >> + uint32_t hw_strap1; >> + uint32_t silicon_rev; >> + hwaddr sdram_base; >> +} AspeedBoardConfig; >> + >> +enum { >> + PALMETTO_BMC >> +}; >> + >> +static const AspeedBoardConfig aspeed_boards[] =3D { >> + [ PALMETTO_BMC ] =3D { 0x120CE416, AST2400_A0_SILICON_REV, >> + AST2400_SDRAM_BASE }, >=20 > I was playing around before and my test scripts noticed checkpatch > complained about the spacing with the array indexing: "[PALMETTO_BMC]" > fixed the error. sigh. I am not sure I checkpatched this one. >> +}; >> + >> static void aspeed_init_flashes(AspeedSMCState *s, const char *flasht= ype, >> Error **errp) >> { >> @@ -58,7 +71,7 @@ static void aspeed_init_flashes(AspeedSMCState *s, c= onst char *flashtype, >> } >> } >> =20 >> -static void aspeed_init(MachineState *machine) >> +static void aspeed_init(MachineState *machine, int board_model) >=20 > I feel like we should pass a "struct AspeedBoardConfig *" rather than > the "int board_model", cleaning up the repeated indexing into > aspeed_boards the body. Thoughts? yep. I agree. Will change that. Thanks, C.=20 > Andrew >=20 >> { >> AspeedBoardState *bmc; >> =20 >> @@ -68,13 +81,16 @@ static void aspeed_init(MachineState *machine) >> &error_abort); >> =20 >> memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_= size); >> - memory_region_add_subregion(get_system_memory(), AST2400_SDRAM_BA= SE, >> + memory_region_add_subregion(get_system_memory(), >> + aspeed_boards[board_model].sdram_base= , >> &bmc->ram); >> object_property_add_const_link(OBJECT(&bmc->soc), "ram", OBJECT(&= bmc->ram), >> &error_abort); >> - object_property_set_int(OBJECT(&bmc->soc), 0x120CE416, "hw-strap1= ", >> - &error_abort); >> - object_property_set_int(OBJECT(&bmc->soc), AST2400_A0_SILICON_REV= , >> + object_property_set_int(OBJECT(&bmc->soc), >> + aspeed_boards[board_model].hw_strap1, >> + "hw-strap1", &error_abort); >> + object_property_set_int(OBJECT(&bmc->soc), >> + aspeed_boards[board_model].silicon_rev, >> "silicon-rev", &error_abort); >> object_property_set_bool(OBJECT(&bmc->soc), true, "realized", >> &error_abort); >> @@ -86,13 +102,15 @@ static void aspeed_init(MachineState *machine) >> aspeed_binfo.initrd_filename =3D machine->initrd_filename; >> aspeed_binfo.kernel_cmdline =3D machine->kernel_cmdline; >> aspeed_binfo.ram_size =3D ram_size; >> + aspeed_binfo.loader_start =3D aspeed_boards[board_model].sdram_ba= se, >> + aspeed_binfo.board_id =3D aspeed_boards[board_model].silicon_rev, >> arm_load_kernel(ARM_CPU(first_cpu), &aspeed_binfo); >> } >> =20 >> static void palmetto_bmc_init(MachineState *machine) >> { >> machine->cpu_model =3D "arm926"; >> - aspeed_init(machine); >> + aspeed_init(machine, PALMETTO_BMC); >> } >> =20 >> static void palmetto_bmc_class_init(ObjectClass *oc, void *data)