From patchwork Thu Jan 28 05:49:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bharata B Rao X-Patchwork-Id: 8146511 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D68909F8AA for ; Thu, 28 Jan 2016 05:57:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1A9AD20256 for ; Thu, 28 Jan 2016 05:57:42 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3412D201CD for ; Thu, 28 Jan 2016 05:57:41 +0000 (UTC) Received: from localhost ([::1]:54146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOfaO-0005dE-K3 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jan 2016 00:57:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50759) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOfUP-0002ak-QY for qemu-devel@nongnu.org; Thu, 28 Jan 2016 00:51:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOfUM-0005HK-JF for qemu-devel@nongnu.org; Thu, 28 Jan 2016 00:51:29 -0500 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:55448) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOfUL-0005Go-SS for qemu-devel@nongnu.org; Thu, 28 Jan 2016 00:51:26 -0500 Received: from localhost by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 28 Jan 2016 15:51:23 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 28 Jan 2016 15:51:20 +1000 X-IBM-Helo: d23dlp02.au.ibm.com X-IBM-MailFrom: bharata@linux.vnet.ibm.com X-IBM-RcptTo: qemu-devel@nongnu.org;qemu-ppc@nongnu.org Received: from d23relay07.au.ibm.com (d23relay07.au.ibm.com [9.190.26.37]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 63AEE2BB0055; Thu, 28 Jan 2016 16:51:20 +1100 (EST) Received: from d23av02.au.ibm.com (d23av02.au.ibm.com [9.190.235.138]) by d23relay07.au.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u0S5pENk38404190; Thu, 28 Jan 2016 16:51:22 +1100 Received: from d23av02.au.ibm.com (localhost [127.0.0.1]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u0S5olgc002786; Thu, 28 Jan 2016 16:50:48 +1100 Received: from bharata.in.ibm.com ([9.124.35.121]) by d23av02.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u0S5oG87001110; Thu, 28 Jan 2016 16:50:44 +1100 From: Bharata B Rao To: qemu-devel@nongnu.org Date: Thu, 28 Jan 2016 11:19:50 +0530 Message-Id: <1453960195-15181-9-git-send-email-bharata@linux.vnet.ibm.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1453960195-15181-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1453960195-15181-1-git-send-email-bharata@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16012805-1618-0000-0000-00000395AE8F X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.143 Cc: mjrosato@linux.vnet.ibm.com, ehabkost@redhat.com, aik@ozlabs.ru, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de, pbonzini@redhat.com, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, david@gibson.dropbear.id.au Subject: [Qemu-devel] [PATCH v7 08/13] target-ppc: Introduce PowerPC specific CPU core device X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Bharata B Rao --- hw/ppc/Makefile.objs | 1 + hw/ppc/cpu-core.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++ include/hw/ppc/cpu-core.h | 33 +++++++++++++++++++++ 3 files changed, 109 insertions(+) create mode 100644 hw/ppc/cpu-core.c create mode 100644 include/hw/ppc/cpu-core.h 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) += e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-$(CONFIG_XILINX) += virtex_ml507.o +obj-y += cpu-core.o diff --git a/hw/ppc/cpu-core.c b/hw/ppc/cpu-core.c new file mode 100644 index 0000000..aa96e79 --- /dev/null +++ b/hw/ppc/cpu-core.c @@ -0,0 +1,75 @@ +/* + * PowerPC CPU core device, acts as container of CPU thread devices. + * + * Copyright (C) 2016 Bharata B Rao + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * 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 = 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 = DEVICE_CLASS(oc); + + dc->realize = ppc_cpu_core_realize; + dc->desc = "PowerPC CPU core"; +} + +static void ppc_cpu_core_instance_init(Object *obj) +{ + int i; + CPUState *cpu; + MachineState *machine = MACHINE(qdev_get_machine()); + PowerPCCPUCore *core = POWERPC_CPU_CORE(obj); + + /* Create as many CPU threads as specified in the topology */ + for (i = 0; i < smp_threads; i++) { + cpu = cpu_generic_init(TYPE_POWERPC_CPU, machine->cpu_model); + if (!cpu) { + error_report("Unable to find CPU definition: %s", + machine->cpu_model); + exit(EXIT_FAILURE); + } + object_property_add_child(obj, "thread[*]", OBJECT(cpu), &error_abort); + object_unref(OBJECT(cpu)); + if (!i) { + core->thread0 = POWERPC_CPU(cpu); + } + } +} + +static const TypeInfo ppc_cpu_core_type_info = { + .name = TYPE_POWERPC_CPU_CORE, + .parent = TYPE_DEVICE, + .class_init = ppc_cpu_core_class_init, + .instance_init = ppc_cpu_core_instance_init, + .instance_size = sizeof(PowerPCCPUCore), +}; + +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..ff2ebc2 --- /dev/null +++ b/include/hw/ppc/cpu-core.h @@ -0,0 +1,33 @@ +/* + * CPU core device. + * + * Copyright (C) 2016 Bharata B Rao + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * 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 + +#define POWERPC_CPU_CORE(obj) \ + OBJECT_CHECK(PowerPCCPUCore, (obj), TYPE_POWERPC_CPU_CORE) + +typedef struct PowerPCCPUCore { + /*< private >*/ + DeviceState parent_obj; + /*< public >*/ + + PowerPCCPU *thread0; +} PowerPCCPUCore; + +#endif