From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bSdFU-0001UQ-8G for qemu-devel@nongnu.org; Thu, 28 Jul 2016 00:48:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bSdFR-0005wr-Pf for qemu-devel@nongnu.org; Thu, 28 Jul 2016 00:48:43 -0400 Message-ID: <1469681289.5468.101.camel@aj.id.au> From: Andrew Jeffery Date: Thu, 28 Jul 2016 14:18:09 +0930 In-Reply-To: <1469638018-17590-3-git-send-email-clg@kaod.org> References: <1469638018-17590-1-git-send-email-clg@kaod.org> <1469638018-17590-3-git-send-email-clg@kaod.org> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-oqUluHRvkDjBntXt3kAA" Mime-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH 2/6] palmetto-bmc: replace palmetto_bmc with aspeed List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?ISO-8859-1?Q?C=E9dric?= Le Goater , Peter Maydell Cc: qemu-devel@nongnu.org, qemu-arm@nongnu.org --=-oqUluHRvkDjBntXt3kAA Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2016-07-27 at 18:46 +0200, C=C3=A9dric Le Goater wrote: > This is mostly a name replacement to prepare ground for other socs > specificities. It also adds a specific TypeInfo struct for the > palmetto_bmc board with a custom initialization for the same reason. I think we should rename the file, it feels a bit confusing having the ast2500 machine glue (added later in the series) in palmetto-bmc.c. You mentioned in the cover letter that moving it would break history but it isn't necessarily so, you can follow renames in the logs with `git log --follow`. It's a git switch that feels like it should be a default but isn't :/ Maybe create a commit that renames the file, then add these changes after? Andrew >=20 > Signed-off-by: C=C3=A9dric Le Goater > --- >=20 > =C2=A0Should we change the name of the file to aspeed.c ? I am not found = of > =C2=A0such renames as it is then difficult to track code changes. >=20 > =C2=A0hw/arm/palmetto-bmc.c | 54 ++++++++++++++++++++++++++++++++++------= ----------- > =C2=A01 file changed, 36 insertions(+), 18 deletions(-) >=20 > diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c > index 1ee13d578899..f80a15733864 100644 > --- a/hw/arm/palmetto-bmc.c > +++ b/hw/arm/palmetto-bmc.c > @@ -21,19 +21,19 @@ > =C2=A0#include "sysemu/block-backend.h" > =C2=A0#include "sysemu/blockdev.h" > =C2=A0 > -static struct arm_boot_info palmetto_bmc_binfo =3D { > +static struct arm_boot_info aspeed_binfo =3D { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0.loader_start =3D AST2400_SDRAM_BASE, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0.board_id =3D 0, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0.nb_cpus =3D 1, > =C2=A0}; > =C2=A0 > -typedef struct PalmettoBMCState { > +typedef struct AspeedBoardState { > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0AST2400State soc; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0MemoryRegion ram; > -} PalmettoBMCState; > +} AspeedBoardState; > =C2=A0 > -static void palmetto_bmc_init_flashes(AspeedSMCState *s, const char *fla= shtype, > -=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0Error **errp) > +static void aspeed_init_flashes(AspeedSMCState *s, const char *flashtype= , > +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0Error **errp) > =C2=A0{ > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0int i ; > =C2=A0 > @@ -58,11 +58,11 @@ static void palmetto_bmc_init_flashes(AspeedSMCState = *s, const char *flashtype, > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0} > =C2=A0} > =C2=A0 > -static void palmetto_bmc_init(MachineState *machine) > +static void aspeed_init(MachineState *machine) > =C2=A0{ > -=C2=A0=C2=A0=C2=A0=C2=A0PalmettoBMCState *bmc; > +=C2=A0=C2=A0=C2=A0=C2=A0AspeedBoardState *bmc; > =C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0bmc =3D g_new0(PalmettoBMCState, 1); > +=C2=A0=C2=A0=C2=A0=C2=A0bmc =3D g_new0(AspeedBoardState, 1); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0object_initialize(&bmc->soc, (sizeof(bmc->s= oc)), TYPE_AST2400); > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0object_property_add_child(OBJECT(machine), = "soc", OBJECT(&bmc->soc), > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&error_abort); > @@ -79,19 +79,26 @@ static void palmetto_bmc_init(MachineState *machine) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0object_property_set_bool(OBJECT(&bmc->soc),= true, "realized", > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0&error_abort); > =C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_init_flashes(&bmc->soc.smc, "n25q25= 6a", &error_abort); > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_init_flashes(&bmc->soc.spi, "mx25l2= 5635e", &error_abort); > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_init_flashes(&bmc->soc.smc, "n25q256a", &= error_abort); > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_init_flashes(&bmc->soc.spi, "mx25l25635e"= , &error_abort); > + > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_binfo.kernel_filename =3D machine->kernel= _filename; > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_binfo.initrd_filename =3D machine->initrd= _filename; > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_binfo.kernel_cmdline =3D machine->kernel_= cmdline; > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_binfo.ram_size =3D ram_size; > +=C2=A0=C2=A0=C2=A0=C2=A0arm_load_kernel(ARM_CPU(first_cpu), &aspeed_binf= o); > +} > =C2=A0 > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_binfo.kernel_filename =3D machine->= kernel_filename; > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_binfo.initrd_filename =3D machine->= initrd_filename; > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_binfo.kernel_cmdline =3D machine->k= ernel_cmdline; > -=C2=A0=C2=A0=C2=A0=C2=A0palmetto_bmc_binfo.ram_size =3D ram_size; > -=C2=A0=C2=A0=C2=A0=C2=A0arm_load_kernel(ARM_CPU(first_cpu), &palmetto_bm= c_binfo); > +static void palmetto_bmc_init(MachineState *machine) > +{ > +=C2=A0=C2=A0=C2=A0=C2=A0aspeed_init(machine); > =C2=A0} > =C2=A0 > -static void palmetto_bmc_machine_init(MachineClass *mc) > +static void palmetto_bmc_class_init(ObjectClass *oc, void *data) > =C2=A0{ > -=C2=A0=C2=A0=C2=A0=C2=A0mc->desc =3D "OpenPOWER Palmetto BMC"; > +=C2=A0=C2=A0=C2=A0=C2=A0MachineClass *mc =3D MACHINE_CLASS(oc); > + > +=C2=A0=C2=A0=C2=A0=C2=A0mc->desc =3D "OpenPOWER Palmetto BMC (ARM926EJ-S= )"; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mc->init =3D palmetto_bmc_init; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mc->max_cpus =3D 1; > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mc->no_sdcard =3D 1; > @@ -101,4 +108,15 @@ static void palmetto_bmc_machine_init(MachineClass *= mc) > =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0mc->no_parallel =3D 1; > =C2=A0} > =C2=A0 > -DEFINE_MACHINE("palmetto-bmc", palmetto_bmc_machine_init); > +static const TypeInfo palmetto_bmc_type =3D { > +=C2=A0=C2=A0=C2=A0=C2=A0.name =3D MACHINE_TYPE_NAME("palmetto-bmc"), > +=C2=A0=C2=A0=C2=A0=C2=A0.parent =3D TYPE_MACHINE, > +=C2=A0=C2=A0=C2=A0=C2=A0.class_init =3D palmetto_bmc_class_init, > +}; > + > +static void aspeed_machine_init(void) > +{ > +=C2=A0=C2=A0=C2=A0=C2=A0type_register_static(&palmetto_bmc_type); > +} > + > +type_init(aspeed_machine_init) --=-oqUluHRvkDjBntXt3kAA Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCgAGBQJXmY6KAAoJEJ0dnzgO5LT5BkoP/Azv+fr+BjVoWc+y0MWIc0Pl EKjh2V0ZiVx2mfagZuqC3FsYKrLXU94DYdBDlFAmEnLgxqPE1bbIF8yGnnSnckXf eZBk/Emd083gnIcNxXB0003CGoM1AXsclaLzdwCqYKME5X64pnqKGFGVamNWKPUp KOG2vu98lGlmlgYoUVeoRpHusMd0FFrnWtBCXDFr1mX4mk2j2lswcC5f1vBELBVA 2qDpEegcyE6SzY18g/WBmb/y+4nrsiKRTlNCGyjIvrk2Heyjk8pXoOq3s/CU3YQx 43vy9/7QpmViPuGe0LAI1bB8yVFaAuqmHqrHPGRp1/MVNxC7xA86hMy5NS3HLZgp BMUR9Gy6p27tRYhs2Rg9Da5M5DHrwDqPeTbynkPNdYUATAEvYv0i/+Luv+8uyFL+ WIzg4paKDfcjZFFb95/ViuA/WDFJ8TUwznkFH9dnmXwSm8P+mP752BrEoucPc+R2 ePJqi6kRj/0ASVmGl0Flhhz718DcfyYc7g2knEIpl4eSUkm/2JoQgG/+owM3YoD8 831qSxt5kQ/irIrfY2trmkBzx7euR9/07NuqzIHuzSJQgc9WMFqrU6o9+snwLo1v NZqrTJ6JoDKyFPIuHoDVujN0RXfaxDAjaJUV3RTf5JSrDR++a4a6KpAGwD9zuUqN /wx9OB9Z+f8bys7fUhlC =l6Ai -----END PGP SIGNATURE----- --=-oqUluHRvkDjBntXt3kAA--