From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39133) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIqc2-0001Iv-Do for qemu-devel@nongnu.org; Mon, 11 Jan 2016 23:31:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIqc0-0001jA-Om for qemu-devel@nongnu.org; Mon, 11 Jan 2016 23:31:18 -0500 Date: Tue, 12 Jan 2016 15:24:53 +1100 From: David Gibson Message-ID: <20160112042453.GP22925@voom.redhat.com> References: <1452236119-24452-1-git-send-email-bharata@linux.vnet.ibm.com> <1452236119-24452-9-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="5AmtYbcgdBTTPS58" Content-Disposition: inline In-Reply-To: <1452236119-24452-9-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v6 08/11] target-ppc: Introduce PowerPC specific CPU core device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, agraf@suse.de, qemu-devel@nongnu.org, pbonzini@redhat.com, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, ehabkost@redhat.com --5AmtYbcgdBTTPS58 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 08, 2016 at 12:25:16PM +0530, Bharata B Rao wrote: > CPU core device is a container of CPU thread devices. CPU hotplug is > performed at the granularity of CPU core device. When hotplugged, CPU core > creates CPU thread devices. >=20 > Signed-off-by: Bharata B Rao Reviewed-by: David Gibson Some comments below, but nothing serious enough that I'd delay the patch for it. > --- > hw/ppc/Makefile.objs | 1 + > hw/ppc/cpu-core.c | 69 +++++++++++++++++++++++++++++++++++++++++= ++++++ > include/hw/ppc/cpu-core.h | 22 +++++++++++++++ > 3 files changed, 92 insertions(+) > create mode 100644 hw/ppc/cpu-core.c > create mode 100644 include/hw/ppc/cpu-core.h >=20 > diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs > index c1ffc77..a6b7cfb 100644 > --- a/hw/ppc/Makefile.objs > +++ b/hw/ppc/Makefile.objs > @@ -21,3 +21,4 @@ obj-$(CONFIG_E500) +=3D e500.o mpc8544ds.o e500plat.o > obj-$(CONFIG_E500) +=3D mpc8544_guts.o ppce500_spin.o > # PowerPC 440 Xilinx ML507 reference board. > obj-$(CONFIG_XILINX) +=3D virtex_ml507.o > +obj-y +=3D cpu-core.o > diff --git a/hw/ppc/cpu-core.c b/hw/ppc/cpu-core.c > new file mode 100644 > index 0000000..c5c6188 > --- /dev/null > +++ b/hw/ppc/cpu-core.c > @@ -0,0 +1,69 @@ > +/* > + * CPU core device, acts as container of CPU thread devices. > + * > + * Copyright (C) 2015 Bharata B Rao > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > +#include "hw/ppc/cpu-core.h" > +#include "hw/boards.h" > +#include > +#include "qemu/error-report.h" > + > +static int ppc_cpu_core_realize_child(Object *child, void *opaque) > +{ > + Error **errp =3D opaque; > + > + object_property_set_bool(child, true, "realized", errp); > + if (*errp) { > + return 1; > + } > + > + return 0; > +} > + > +static void ppc_cpu_core_realize(DeviceState *dev, Error **errp) > +{ > + object_child_foreach(OBJECT(dev), ppc_cpu_core_realize_child, errp); > +} > + > +static void ppc_cpu_core_class_init(ObjectClass *oc, void *data) > +{ > + DeviceClass *dc =3D DEVICE_CLASS(oc); > + > + dc->realize =3D ppc_cpu_core_realize; > +} > + > +static void ppc_cpu_core_instance_init(Object *obj) > +{ > + int i; > + CPUState *cpu; > + MachineState *machine =3D MACHINE(qdev_get_machine()); > + > + /* Create as many CPU threads as specified in the topology */ > + for (i =3D 0; i < smp_threads; i++) { I think it would make more sense to have a field in the core object give the number of threads, even if it's just initialized to global smp_threads for the time being. > + cpu =3D cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model); > + if (!cpu) { > + error_report("Unable to find CPU definition: %s\n", > + machine->cpu_model); > + exit(EXIT_FAILURE); > + } > + object_property_add_child(obj, "thread[*]", OBJECT(cpu), &error_= abort); Using thread[*] is a bit nasty, since we already know the correct index. But I guess it avoids some messy string mangling, and it's not like there's enough threads to make list[*]'s O(N^2) behaviour to be a real problem. > + object_unref(OBJECT(cpu)); > + } > +} > + > +static const TypeInfo ppc_cpu_core_type_info =3D { > + .name =3D TYPE_POWERPC_CPU_CORE, > + .parent =3D TYPE_DEVICE, > + .class_init =3D ppc_cpu_core_class_init, > + .instance_init =3D ppc_cpu_core_instance_init, > +}; > + > +static void cpu_core_register_types(void) > +{ > + type_register_static(&ppc_cpu_core_type_info); > +} > + > +type_init(cpu_core_register_types) > diff --git a/include/hw/ppc/cpu-core.h b/include/hw/ppc/cpu-core.h > new file mode 100644 > index 0000000..91e31ef > --- /dev/null > +++ b/include/hw/ppc/cpu-core.h > @@ -0,0 +1,22 @@ > +/* > + * CPU core device. > + * > + * Copyright (C) 2015 Bharata B Rao > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or la= ter. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef HW_PPC_CPU_CORE_H > +#define HW_PPC_CPU_CORE_H > + > +#include "hw/qdev.h" > + > +#ifdef TARGET_PPC64 > +#define TYPE_POWERPC_CPU_CORE "powerpc64-cpu-core" > +#elif defined(TARGET_PPCEMB) > +#define TYPE_POWERPC_CPU_CORE "embedded-powerpc-cpu-core" > +#else > +#define TYPE_POWERPC_CPU_CORE "powerpc-cpu-core" > +#endif > + > +#endif --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --5AmtYbcgdBTTPS58 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWlIAVAAoJEGw4ysog2bOS2AkP/0p8pcUylYcrhaPRB2K8J1bX 8oErseC1Wvu1BK0XseeYYYfUKpkJlvU6zsAXBr5fvD62+syG78RqfNzT8MXe+Foq XQ+xj/6+OWasnpiHTtn9yPkFXNr2p0sJ/qCIJJMq7RJhwQjBgQLsxnyXlmaZxX6h aATDD7EcsKB1T1phwM7pQC2e2HB4nRoyjQvAxTQtGCcq8PXHWDFujtVgfc0aDIoJ ygP4elVFtLtUvFXVv+CKkWQiJKOaz+pC7PBVIp3XIJp4mAiKbZ4Hisl+kxdqz/4T JnHyDhF8+iA716K+ztp0OM2UyBRC+N9zWrP6uXo9Q2tkZfD5C+bxM5VdyD3NFeS/ U7swYoIFEDBS+o9mBH17YoM4ZT8Sa25L5w+iKS9AjnS6Fm7mpI+a9adH3GOOi6RW HTXIeVTkZSa0jGMcShoQHbKYErHdOQ8lwxJwSF5LzmlDk9Sbat2KlCnOLEaheDj3 GKZX0mFEwwYttnFLQRRzbcpyK+1RLgnrT+HS0PNaClod6UN3q+lf1nayisDBBBwB kdkmRwX9BODnyrgD2lTFIQqBovWlw5Q22oakqG4O5X5DV9h28oGm6Ox8q6DUTi1B MdZ1NBmH07FD5c30GcsE3M0lLS/xmMtWf9RWkHevB/bxpIkGzrQ7UIipc/2oJY4r gpx7kDmG1RszvzgQCmpd =yeI0 -----END PGP SIGNATURE----- --5AmtYbcgdBTTPS58--