From patchwork Tue Jul 12 12:12:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kurz X-Patchwork-Id: 647360 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rpgqm6dvXz9s9N for ; Tue, 12 Jul 2016 22:14:12 +1000 (AEST) Received: from localhost ([::1]:39975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwZl-0004S2-SB for incoming@patchwork.ozlabs.org; Tue, 12 Jul 2016 08:14:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwYo-0003ps-JX for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bMwYj-0005iB-0n for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:13:09 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:3331) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bMwYi-0005ht-Oj for qemu-devel@nongnu.org; Tue, 12 Jul 2016 08:13:04 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u6CC3j0i101892 for ; Tue, 12 Jul 2016 08:13:04 -0400 Received: from e36.co.us.ibm.com (e36.co.us.ibm.com [32.97.110.154]) by mx0a-001b2d01.pphosted.com with ESMTP id 242ws9kyaj-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 12 Jul 2016 08:13:02 -0400 Received: from localhost by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jul 2016 06:13:00 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Jul 2016 06:12:57 -0600 X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: groug@kaod.org Received: from b01cxnp23034.gho.pok.ibm.com (b01cxnp23034.gho.pok.ibm.com [9.57.198.29]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 4FB4A19D8040; Tue, 12 Jul 2016 06:12:33 -0600 (MDT) Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp23034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u6CCCxB512255608; Tue, 12 Jul 2016 12:12:59 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 52F5530001; Tue, 12 Jul 2016 08:12:56 -0400 (EDT) Received: from bahia.lan (unknown [9.164.146.113]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id 6B429124012; Tue, 12 Jul 2016 08:12:54 -0400 (EDT) From: Greg Kurz To: David Gibson Date: Tue, 12 Jul 2016 14:12:53 +0200 In-Reply-To: <146832546271.14159.13423837073754447992.stgit@bahia.lan> References: <146832546271.14159.13423837073754447992.stgit@bahia.lan> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16071212-0020-0000-0000-0000094D2A37 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16071212-0021-0000-0000-0000539C632A Message-Id: <146832556870.14159.6011006537855255082.stgit@bahia.lan> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-12_06:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607120112 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v4 2/5] ppc: parse cpu features once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, Bharata B Rao Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Considering that features are converted to global properties and global properties are automatically applied to every new instance of created CPU (at object_new() time), there is no point in parsing cpu_model string every time a CPU created. So move parsing outside CPU creation loop and do it only once. Parsing also should be done before any CPU is created so that features would affect the first CPU a well. This patch does that for all PowerPC machine types. It is based on previous work from Bharata: https://lists.nongnu.org/archive/html/qemu-devel/2016-06/msg07564.html Signed-off-by: Greg Kurz --- hw/ppc/e500.c | 2 ++ hw/ppc/mac_newworld.c | 1 + hw/ppc/mac_oldworld.c | 1 + hw/ppc/ppc.c | 26 ++++++++++++++++++++++++++ hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/ppc4xx_devs.c | 1 + hw/ppc/prep.c | 1 + hw/ppc/spapr.c | 2 ++ hw/ppc/virtex_ml507.c | 1 + include/hw/ppc/ppc.h | 1 + 10 files changed, 37 insertions(+) diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c index ff5d92e48dd9..b9221cc2c14a 100644 --- a/hw/ppc/e500.c +++ b/hw/ppc/e500.c @@ -814,6 +814,8 @@ void ppce500_init(MachineState *machine, PPCE500Params *params) machine->cpu_model = "e500v2_v30"; } + ppc_cpu_parse_features(machine->cpu_model); + irqs = g_malloc0(smp_cpus * sizeof(qemu_irq *)); irqs[0] = g_malloc0(smp_cpus * sizeof(qemu_irq) * OPENPIC_OUTPUT_NB); for (i = 0; i < smp_cpus; i++) { diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c index ecd40914be45..366089085844 100644 --- a/hw/ppc/mac_newworld.c +++ b/hw/ppc/mac_newworld.c @@ -192,6 +192,7 @@ static void ppc_core99_init(MachineState *machine) machine->cpu_model = "G4"; #endif } + ppc_cpu_parse_features(machine->cpu_model); for (i = 0; i < smp_cpus; i++) { cpu = ppc_cpu_init(machine->cpu_model); if (cpu == NULL) { diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 77fbdfffd4e2..5c2dc53cb584 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -112,6 +112,7 @@ static void ppc_heathrow_init(MachineState *machine) /* init CPUs */ if (machine->cpu_model == NULL) machine->cpu_model = "G3"; + ppc_cpu_parse_features(machine->cpu_model); for (i = 0; i < smp_cpus; i++) { cpu = ppc_cpu_init(machine->cpu_model); if (cpu == NULL) { diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c index dc3d214009c5..313b3f0b9a51 100644 --- a/hw/ppc/ppc.c +++ b/hw/ppc/ppc.c @@ -33,6 +33,7 @@ #include "hw/timer/m48t59.h" #include "qemu/log.h" #include "qemu/error-report.h" +#include "qapi/error.h" #include "hw/loader.h" #include "sysemu/kvm.h" #include "kvm_ppc.h" @@ -1355,3 +1356,28 @@ PowerPCCPU *ppc_cpu_init(const char *cpu_model) { return POWERPC_CPU(cpu_generic_init(TYPE_POWERPC_CPU, cpu_model)); } + +void ppc_cpu_parse_features(const char *cpu_model) +{ + CPUClass *cc; + ObjectClass *oc; + const char *typename; + gchar **model_pieces; + + model_pieces = g_strsplit(cpu_model, ",", 2); + if (!model_pieces[0]) { + error_report("Invalid/empty CPU model name"); + exit(1); + } + + oc = cpu_class_by_name(TYPE_POWERPC_CPU, model_pieces[0]); + if (oc == NULL) { + error_report("Unable to find CPU definition: %s", model_pieces[0]); + exit(1); + } + + typename = object_class_get_name(oc); + cc = CPU_CLASS(oc); + cc->parse_features(typename, model_pieces[1], &error_fatal); + g_strfreev(model_pieces); +} diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 7f22433c8e91..709a779cba7e 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -186,6 +186,7 @@ static void bamboo_init(MachineState *machine) if (machine->cpu_model == NULL) { machine->cpu_model = "440EP"; } + ppc_cpu_parse_features(machine->cpu_model); cpu = ppc_cpu_init(machine->cpu_model); if (cpu == NULL) { fprintf(stderr, "Unable to initialize CPU!\n"); diff --git a/hw/ppc/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index d48b61f04910..8cbe50361e86 100644 --- a/hw/ppc/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c @@ -56,6 +56,7 @@ PowerPCCPU *ppc4xx_init(const char *cpu_model, CPUPPCState *env; /* init CPUs */ + ppc_cpu_parse_features(cpu_model); cpu = ppc_cpu_init(cpu_model); if (cpu == NULL) { fprintf(stderr, "Unable to find PowerPC %s CPU definition\n", diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c index e62fe643f492..99409a09f0ef 100644 --- a/hw/ppc/prep.c +++ b/hw/ppc/prep.c @@ -508,6 +508,7 @@ static void ppc_prep_init(MachineState *machine) /* init CPUs */ if (machine->cpu_model == NULL) machine->cpu_model = "602"; + ppc_cpu_parse_features(machine->cpu_model); for (i = 0; i < smp_cpus; i++) { cpu = ppc_cpu_init(machine->cpu_model); if (cpu == NULL) { diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index d134eb2f338e..658ccee799c0 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -1803,6 +1803,8 @@ static void ppc_spapr_init(MachineState *machine) machine->cpu_model = kvm_enabled() ? "host" : "POWER7"; } + ppc_cpu_parse_features(machine->cpu_model); + if (smc->dr_cpu_enabled) { char *type = spapr_get_cpu_core_type(machine->cpu_model); diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 7e4445b6879a..a19dd17addda 100644 --- a/hw/ppc/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c @@ -96,6 +96,7 @@ static PowerPCCPU *ppc440_init_xilinx(ram_addr_t *ram_size, CPUPPCState *env; qemu_irq *irqs; + ppc_cpu_parse_features(cpu_model); cpu = ppc_cpu_init(cpu_model); if (cpu == NULL) { fprintf(stderr, "Unable to initialize CPU!\n"); diff --git a/include/hw/ppc/ppc.h b/include/hw/ppc/ppc.h index a4db1db82e1b..2ed063e09bec 100644 --- a/include/hw/ppc/ppc.h +++ b/include/hw/ppc/ppc.h @@ -107,4 +107,5 @@ enum { void ppc_booke_timers_init(PowerPCCPU *cpu, uint32_t freq, uint32_t flags); PowerPCCPU *ppc_cpu_init(const char *cpu_model); +void ppc_cpu_parse_features(const char *cpu_model); #endif