From patchwork Wed Jul 8 03:43:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 492707 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 CF19A1402B7 for ; Wed, 8 Jul 2015 13:44:12 +1000 (AEST) Received: from localhost ([::1]:33121 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCgHL-0006rv-1g for incoming@patchwork.ozlabs.org; Tue, 07 Jul 2015 23:44:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCgH4-0006Wc-1V for qemu-devel@nongnu.org; Tue, 07 Jul 2015 23:43:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZCgH0-0008W5-7Z for qemu-devel@nongnu.org; Tue, 07 Jul 2015 23:43:53 -0400 Received: from ozlabs.org ([103.22.144.67]:58591) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZCgGz-0008Uh-Tg; Tue, 07 Jul 2015 23:43:50 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id C1A0F1402BA; Wed, 8 Jul 2015 13:43:43 +1000 (AEST) From: David Gibson To: agraf@suse.de Date: Wed, 8 Jul 2015 13:43:41 +1000 Message-Id: <1436327021-14744-1-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.4.3 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: lvivier@redhat.com, thuth@redhat.com, aik@ozlabs.ru, qemu-devel@nongnu.org, abologna@redhat.com, qemu-ppc@nongnu.org, mdroth@linuc.vnet.ibm.com, afaerber@suse.de, David Gibson Subject: [Qemu-devel] [PATCH] target-ppc: Add POWER8E_v2.1 CPU model. 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Andrea Bolognani Add a missing PVR value for the POWER8E v2.1 CPU. Information taken from the kernel cputable. Signed-off-by: Andrea Bolognani Signed-off-by: David Gibson --- target-ppc/cpu-models.c | 4 +++- target-ppc/cpu-models.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) Alex, Not sure if this counts as a bugfix which can be merged now we're in the hard freeze. The lack of it does mean we can't work on one of our dev machines which has this CPU. diff --git a/target-ppc/cpu-models.c b/target-ppc/cpu-models.c index 4d5ab4b..9d8769b 100644 --- a/target-ppc/cpu-models.c +++ b/target-ppc/cpu-models.c @@ -1140,6 +1140,8 @@ "POWER7+ v2.1") POWERPC_DEF("POWER8E_v1.0", CPU_POWERPC_POWER8E_v10, POWER8, "POWER8E v1.0") + POWERPC_DEF("POWER8E_v2.1", CPU_POWERPC_POWER8E_v21, POWER8, + "POWER8E v2.1") POWERPC_DEF("POWER8_v1.0", CPU_POWERPC_POWER8_v10, POWER8, "POWER8 v1.0") POWERPC_DEF("970_v2.2", CPU_POWERPC_970_v22, 970, @@ -1389,7 +1391,7 @@ PowerPCCPUAlias ppc_cpu_aliases[] = { { "POWER5gs", "POWER5+_v2.1" }, { "POWER7", "POWER7_v2.3" }, { "POWER7+", "POWER7+_v2.1" }, - { "POWER8E", "POWER8E_v1.0" }, + { "POWER8E", "POWER8E_v2.1" }, { "POWER8", "POWER8_v1.0" }, { "970", "970_v2.2" }, { "970fx", "970fx_v3.1" }, diff --git a/target-ppc/cpu-models.h b/target-ppc/cpu-models.h index 9d80e72..add31c6 100644 --- a/target-ppc/cpu-models.h +++ b/target-ppc/cpu-models.h @@ -558,6 +558,7 @@ enum { CPU_POWERPC_POWER7P_v21 = 0x004A0201, CPU_POWERPC_POWER8E_BASE = 0x004B0000, CPU_POWERPC_POWER8E_v10 = 0x004B0100, + CPU_POWERPC_POWER8E_v21 = 0x004B0201, CPU_POWERPC_POWER8_BASE = 0x004D0000, CPU_POWERPC_POWER8_v10 = 0x004D0100, CPU_POWERPC_970_v22 = 0x00390202,