From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmztV-00009O-Lp for qemu-devel@nongnu.org; Wed, 21 May 2014 02:21:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WmztI-0005ly-SQ for qemu-devel@nongnu.org; Wed, 21 May 2014 02:20:53 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:47491) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WmztI-0005lC-6R for qemu-devel@nongnu.org; Wed, 21 May 2014 02:20:40 -0400 Received: from /spool/local by e23smtp05.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 21 May 2014 16:20:37 +1000 From: Alexey Kardashevskiy Date: Wed, 21 May 2014 16:20:21 +1000 Message-Id: <1400653228-31540-3-git-send-email-aik@ozlabs.ru> In-Reply-To: <1400653228-31540-1-git-send-email-aik@ozlabs.ru> References: <1400653228-31540-1-git-send-email-aik@ozlabs.ru> Subject: [Qemu-devel] [PATCH 2/9] target-ppc: Refactor init_proc_POWER7 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 This moves SPR initialization to helper functions. Signed-off-by: Alexey Kardashevskiy --- target-ppc/translate_init.c | 83 +++++++++++++++++++++++++++++++++------------ 1 file changed, 62 insertions(+), 21 deletions(-) diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c index bf5ea09..e9c37fa 100644 --- a/target-ppc/translate_init.c +++ b/target-ppc/translate_init.c @@ -7680,17 +7680,17 @@ POWERPC_FAMILY(POWER5P)(ObjectClass *oc, void *data) pcc->l1_icache_size = 0x10000; } -static void init_proc_POWER7 (CPUPPCState *env) +static void gen_spr_book3s_ids(CPUPPCState *env) { - gen_spr_ne_601(env); - gen_spr_7xx(env); - /* Time base */ - gen_tbl(env); /* Processor identification */ spr_register(env, SPR_PIR, "PIR", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_pir, 0x00000000); +} + +static void gen_spr_book3s_purr(CPUPPCState *env) +{ #if !defined(CONFIG_USER_ONLY) /* PURR & SPURR: Hack - treat these as aliases for the TB for now */ spr_register_kvm(env, SPR_PURR, "PURR", @@ -7701,14 +7701,22 @@ static void init_proc_POWER7 (CPUPPCState *env) &spr_read_purr, SPR_NOACCESS, &spr_read_purr, SPR_NOACCESS, KVM_REG_PPC_SPURR, 0x00000000); +#endif +} + +static void gen_spr_book3s_debug(CPUPPCState *env) +{ +#if !defined(CONFIG_USER_ONLY) spr_register(env, SPR_CFAR, "SPR_CFAR", SPR_NOACCESS, SPR_NOACCESS, &spr_read_cfar, &spr_write_cfar, 0x00000000); - spr_register_kvm(env, SPR_DSCR, "SPR_DSCR", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - KVM_REG_PPC_DSCR, 0x00000000); +#endif +} + +static void gen_spr_book3s_pmu(CPUPPCState *env) +{ +#if !defined(CONFIG_USER_ONLY) spr_register_kvm(env, SPR_MMCRA, "SPR_MMCRA", SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, @@ -7721,8 +7729,34 @@ static void init_proc_POWER7 (CPUPPCState *env) SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, &spr_write_generic, KVM_REG_PPC_PMC6, 0x00000000); -#endif /* !CONFIG_USER_ONLY */ - gen_spr_amr(env); +#endif +} + +static void gen_spr_book3s_vr(CPUPPCState *env) +{ + spr_register(env, SPR_VRSAVE, "SPR_VRSAVE", + &spr_read_generic, &spr_write_generic, + &spr_read_generic, &spr_write_generic, + 0x00000000); +} + +static void gen_spr_book3s_lpar(CPUPPCState *env) +{ + /* Logical partitionning */ + spr_register_kvm(env, SPR_LPCR, "LPCR", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_LPCR, 0x00000000); +} + +static void gen_spr_book3s_common(CPUPPCState *env) +{ +#if !defined(CONFIG_USER_ONLY) + spr_register_kvm(env, SPR_DSCR, "SPR_DSCR", + SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_generic, + KVM_REG_PPC_DSCR, 0x00000000); +#endif /* XXX : not implemented */ spr_register(env, SPR_CTRL, "SPR_CTRLT", SPR_NOACCESS, SPR_NOACCESS, @@ -7732,22 +7766,29 @@ static void init_proc_POWER7 (CPUPPCState *env) SPR_NOACCESS, SPR_NOACCESS, &spr_read_generic, SPR_NOACCESS, 0x80800000); - spr_register(env, SPR_VRSAVE, "SPR_VRSAVE", - &spr_read_generic, &spr_write_generic, - &spr_read_generic, &spr_write_generic, - 0x00000000); spr_register(env, SPR_PPR, "PPR", &spr_read_generic, &spr_write_generic, &spr_read_generic, &spr_write_generic, 0x00000000); - /* Logical partitionning */ - spr_register_kvm(env, SPR_LPCR, "LPCR", - SPR_NOACCESS, SPR_NOACCESS, - &spr_read_generic, &spr_write_generic, - KVM_REG_PPC_LPCR, 0x00000000); +} + +static void init_proc_POWER7 (CPUPPCState *env) +{ + gen_spr_ne_601(env); + gen_spr_7xx(env); + /* Time base */ + gen_tbl(env); + gen_spr_book3s_ids(env); + gen_spr_book3s_common(env); + gen_spr_amr(env); + gen_spr_book3s_vr(env); + gen_spr_book3s_lpar(env); + gen_spr_book3s_purr(env); + gen_spr_book3s_debug(env); + gen_spr_book3s_pmu(env); #if !defined(CONFIG_USER_ONLY) env->slb_nr = 32; -#endif +#endif /* !CONFIG_USER_ONLY */ init_excp_POWER7(env); env->dcache_line_size = 128; env->icache_line_size = 128; -- 1.9.rc0