From patchwork Tue Jun 7 10:48:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 631480 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 ozlabs.org (Postfix) with ESMTPS id 3rP88M3R3Wz9t4Z for ; Tue, 7 Jun 2016 21:13:55 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=BeIGD1Gy; dkim-atps=neutral Received: from localhost ([::1]:48593 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAExF-0004Rs-Gw for incoming@patchwork.ozlabs.org; Tue, 07 Jun 2016 07:13:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAEYe-0006y7-7N for qemu-devel@nongnu.org; Tue, 07 Jun 2016 06:48:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bAEYY-00056T-44 for qemu-devel@nongnu.org; Tue, 07 Jun 2016 06:48:27 -0400 Received: from ozlabs.org ([103.22.144.67]:36889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bAEYX-00054R-Ph; Tue, 07 Jun 2016 06:48:22 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3rP7Zp0yxCz9t5w; Tue, 7 Jun 2016 20:48:17 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1465296498; bh=eiDhWitJEAN+oe6okAp2GeN5HuTJg3rhmxxy5trXZkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BeIGD1Gy45X2bpz6jP1M6uNWEFELYWyP0rE3xGKQ4KF+YH8iY0FqfVdIJfVEtNn6l cz5DzY8Lvc/NXxLfPcikL1nV3E9hthXXk2WdavJPHcvkN2ByFKhhW7Dj8Dd5VwgoQM jY/oDmnW9LXuXrBmNJ2i6uILUvXYRCSE/acy8ScI= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 7 Jun 2016 20:48:08 +1000 Message-Id: <1465296493-10851-22-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1465296493-10851-1-git-send-email-david@gibson.dropbear.id.au> References: <1465296493-10851-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 21/26] ppc: POWER7 had ACOP and PID registers 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: David Gibson , qemu-ppc@nongnu.org, agraf@suse.de, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Benjamin Herrenschmidt We only had them on POWER8, add them to POWER7 as well Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/translate_init.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index 55f8553..ad6f2f3 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -8024,6 +8024,21 @@ static void gen_spr_power8_book4(CPUPPCState *env) #endif } +static void gen_spr_power7_book4(CPUPPCState *env) +{ + /* Add a number of P7 book4 registers */ +#if !defined(CONFIG_USER_ONLY) + spr_register_kvm(env, SPR_ACOP, "ACOP", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_ACOP, 0); + spr_register_kvm(env, SPR_BOOKS_PID, "PID", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_PID, 0); +#endif +} + static void init_proc_book3s_64(CPUPPCState *env, int version) { gen_spr_ne_601(env); @@ -8066,6 +8081,9 @@ static void init_proc_book3s_64(CPUPPCState *env, int version) gen_spr_power6_common(env); gen_spr_power6_dbg(env); } + if (version == BOOK3S_CPU_POWER7) { + gen_spr_power7_book4(env); + } if (version >= BOOK3S_CPU_POWER8) { gen_spr_power8_tce_address_control(env); gen_spr_power8_ids(env);