On Sat, Nov 10, 2018 at 09:11:32AM +0100, Luc Michel wrote: > This commit adds the cpu-cluster type. It aims at gathering CPUs from > the same cluster in a machine. > > For now it only has a `cluster-id` property. > > Signed-off-by: Luc Michel <luc.mic...@greensocs.com> > Reviewed-by: Alistair Francis <alistair.fran...@wdc.com> > Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > Tested-by: Philippe Mathieu-Daudé <phi...@redhat.com>
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com> > --- > include/hw/cpu/cluster.h | 38 ++++++++++++++++++++++++++ > hw/cpu/cluster.c | 59 ++++++++++++++++++++++++++++++++++++++++ > MAINTAINERS | 2 ++ > hw/cpu/Makefile.objs | 2 +- > 4 files changed, 100 insertions(+), 1 deletion(-) > create mode 100644 include/hw/cpu/cluster.h > create mode 100644 hw/cpu/cluster.c > > diff --git a/include/hw/cpu/cluster.h b/include/hw/cpu/cluster.h > new file mode 100644 > index 0000000000..11f50d5f6b > --- /dev/null > +++ b/include/hw/cpu/cluster.h > @@ -0,0 +1,38 @@ > +/* > + * QEMU CPU cluster > + * > + * Copyright (c) 2018 GreenSocs SAS > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, see > + * <http://www.gnu.org/licenses/gpl-2.0.html> > + */ > +#ifndef HW_CPU_CLUSTER_H > +#define HW_CPU_CLUSTER_H > + > +#include "qemu/osdep.h" > +#include "hw/qdev.h" > + > +#define TYPE_CPU_CLUSTER "cpu-cluster" > +#define CPU_CLUSTER(obj) \ > + OBJECT_CHECK(CPUClusterState, (obj), TYPE_CPU_CLUSTER) > + > +typedef struct CPUClusterState { > + /*< private >*/ > + DeviceState parent_obj; > + > + /*< public >*/ > + uint32_t cluster_id; > +} CPUClusterState; > + > +#endif > diff --git a/hw/cpu/cluster.c b/hw/cpu/cluster.c > new file mode 100644 > index 0000000000..e0ffd76152 > --- /dev/null > +++ b/hw/cpu/cluster.c > @@ -0,0 +1,59 @@ > +/* > + * QEMU CPU cluster > + * > + * Copyright (c) 2018 GreenSocs SAS > + * > + * This program is free software; you can redistribute it and/or > + * modify it under the terms of the GNU General Public License > + * as published by the Free Software Foundation; either version 2 > + * of the License, or (at your option) any later version. > + * > + * This program is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > + * GNU General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, see > + * <http://www.gnu.org/licenses/gpl-2.0.html> > + */ > + > +#include "qemu/osdep.h" > +#include "hw/cpu/cluster.h" > +#include "qapi/error.h" > +#include "qemu/module.h" > + > +static void cpu_cluster_init(Object *obj) > +{ > + static uint32_t cluster_id_auto_increment; > + CPUClusterState *cluster = CPU_CLUSTER(obj); > + > + cluster->cluster_id = cluster_id_auto_increment++; > +} > + > +static Property cpu_cluster_properties[] = { > + DEFINE_PROP_UINT32("cluster-id", CPUClusterState, cluster_id, 0), > + DEFINE_PROP_END_OF_LIST() > +}; > + > +static void cpu_cluster_class_init(ObjectClass *klass, void *data) > +{ > + DeviceClass *dc = DEVICE_CLASS(klass); > + > + dc->props = cpu_cluster_properties; > +} > + > +static const TypeInfo cpu_cluster_type_info = { > + .name = TYPE_CPU_CLUSTER, > + .parent = TYPE_DEVICE, > + .instance_size = sizeof(CPUClusterState), > + .instance_init = cpu_cluster_init, > + .class_init = cpu_cluster_class_init, > +}; > + > +static void cpu_cluster_register_types(void) > +{ > + type_register_static(&cpu_cluster_type_info); > +} > + > +type_init(cpu_cluster_register_types) > diff --git a/MAINTAINERS b/MAINTAINERS > index 126fe0be7e..8e20b0e672 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1022,11 +1022,13 @@ Machine core > M: Eduardo Habkost <ehabk...@redhat.com> > M: Marcel Apfelbaum <marcel.apfelb...@gmail.com> > S: Supported > F: hw/core/machine.c > F: hw/core/null-machine.c > +F: hw/cpu/cluster.c > F: include/hw/boards.h > +F: include/hw/cpu/cluster.h > T: git git://github.com/ehabkost/qemu.git machine-next > > Xtensa Machines > --------------- > sim > diff --git a/hw/cpu/Makefile.objs b/hw/cpu/Makefile.objs > index cd52d20b65..8db9e8a7b3 100644 > --- a/hw/cpu/Makefile.objs > +++ b/hw/cpu/Makefile.objs > @@ -1,5 +1,5 @@ > obj-$(CONFIG_ARM11MPCORE) += arm11mpcore.o > obj-$(CONFIG_REALVIEW) += realview_mpcore.o > obj-$(CONFIG_A9MPCORE) += a9mpcore.o > obj-$(CONFIG_A15MPCORE) += a15mpcore.o > -common-obj-y += core.o > +common-obj-y += core.o cluster.o > -- > 2.19.1 > >
