From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56063) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsAfF-0005XE-5m for qemu-devel@nongnu.org; Wed, 04 Jun 2014 08:52:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsAez-0002mC-OW for qemu-devel@nongnu.org; Wed, 04 Jun 2014 08:51:33 -0400 Received: from e23smtp02.au.ibm.com ([202.81.31.144]:35016) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsAey-0002kl-W7 for qemu-devel@nongnu.org; Wed, 04 Jun 2014 08:51:17 -0400 Received: from /spool/local by e23smtp02.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Jun 2014 22:51:14 +1000 From: Alexey Kardashevskiy Date: Wed, 4 Jun 2014 22:50:41 +1000 Message-Id: <1401886265-6589-7-git-send-email-aik@ozlabs.ru> In-Reply-To: <1401886265-6589-1-git-send-email-aik@ozlabs.ru> References: <1401886265-6589-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH v5 06/30] target-ppc: Add "POWER" prefix to MMCRA PMU registers List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alexey Kardashevskiy , Tom Musta , qemu-ppc@nongnu.org, Alexander Graf , Greg Kurz Since we started adding "POWER" prefix to 64bit PMU SPRs, let's finish the transition and fix MMCRA and define a supermode version of it. Signed-off-by: Alexey Kardashevskiy Reviewed-by: Tom Musta --- target-ppc/cpu.h | 3 ++- target-ppc/translate_init.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 8e01db4..0cbae7c 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1466,7 +1466,7 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_PERF2 (0x302) #define SPR_RCPU_MI_RBA2 (0x302) #define SPR_MPC_MI_AP (0x302) -#define SPR_MMCRA (0x302) +#define SPR_POWER_UMMCRA (0x302) #define SPR_PERF3 (0x303) #define SPR_RCPU_MI_RBA3 (0x303) #define SPR_MPC_MI_EPN (0x303) @@ -1509,6 +1509,7 @@ static inline int cpu_mmu_index (CPUPPCState *env) #define SPR_UPERF0 (0x310) #define SPR_UPERF1 (0x311) #define SPR_UPERF2 (0x312) +#define SPR_POWER_MMCRA (0X312) #define SPR_UPERF3 (0x313) #define SPR_POWER_PMC1 (0X313) #define SPR_UPERF4 (0x314) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index def4074..11db6e7 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7712,7 +7712,7 @@ static void init_proc_POWER7 (CPUPPCState *env) SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_DSCR, 0x00000000); - spr_register_kvm(env, SPR_MMCRA, "SPR_MMCRA", + spr_register_kvm(env, SPR_POWER_MMCRA, "SPR_MMCRA", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_MMCRA, 0x00000000); -- 2.0.0