[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-ppc] [PATCH v4 12/29] target-ppc: Move POWER7/8 PIR/PURR/SPURR
From: |
Tom Musta |
Subject: |
Re: [Qemu-ppc] [PATCH v4 12/29] target-ppc: Move POWER7/8 PIR/PURR/SPURR SPR registration to helpers |
Date: |
Tue, 03 Jun 2014 11:48:02 -0500 |
User-agent: |
Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 |
On 6/3/2014 4:27 AM, Alexey Kardashevskiy wrote:
> This moves PIR/PURR/SPURR SPRs to helpers. Later these helpers will be
> called from generalized init_proc_book3s_64().
>
> Signed-off-by: Alexey Kardashevskiy <address@hidden>
> ---
> target-ppc/translate_init.c | 40 ++++++++++++++++++++++++++--------------
> 1 file changed, 26 insertions(+), 14 deletions(-)
>
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 3445b17..aa88727 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -7499,6 +7499,30 @@ static void gen_spr_power5p_lpar(CPUPPCState *env)
> KVM_REG_PPC_LPCR, 0x00000000);
> }
>
> +static void gen_spr_book3s_ids(CPUPPCState *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",
> + &spr_read_purr, SPR_NOACCESS,
> + &spr_read_purr, SPR_NOACCESS,
> + KVM_REG_PPC_PURR, 0x00000000);
> + spr_register_kvm(env, SPR_SPURR, "SPURR",
> + &spr_read_purr, SPR_NOACCESS,
> + &spr_read_purr, SPR_NOACCESS,
> + KVM_REG_PPC_SPURR, 0x00000000);
> +#endif
> +}
> +
> static void init_proc_book3s_64(CPUPPCState *env, int version)
> {
> gen_spr_ne_601(env);
> @@ -7712,21 +7736,7 @@ static void init_proc_POWER7 (CPUPPCState *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);
> #if !defined(CONFIG_USER_ONLY)
> - /* PURR & SPURR: Hack - treat these as aliases for the TB for now */
> - spr_register_kvm(env, SPR_PURR, "PURR",
> - &spr_read_purr, SPR_NOACCESS,
> - &spr_read_purr, SPR_NOACCESS,
> - KVM_REG_PPC_PURR, 0x00000000);
> - spr_register_kvm(env, SPR_SPURR, "SPURR",
> - &spr_read_purr, SPR_NOACCESS,
> - &spr_read_purr, SPR_NOACCESS,
> - KVM_REG_PPC_SPURR, 0x00000000);
> spr_register(env, SPR_CFAR, "SPR_CFAR",
> SPR_NOACCESS, SPR_NOACCESS,
> &spr_read_cfar, &spr_write_cfar,
> @@ -7748,6 +7758,8 @@ static void init_proc_POWER7 (CPUPPCState *env)
> &spr_read_generic, &spr_write_generic,
> KVM_REG_PPC_PMC6, 0x00000000);
> #endif /* !CONFIG_USER_ONLY */
> + gen_spr_book3s_ids(env);
> + gen_spr_book3s_purr(env);
> gen_spr_amr(env);
> /* XXX : not implemented */
> spr_register(env, SPR_CTRL, "SPR_CTRLT",
>
Reviewed-by: Tom Musta <address@hidden>
- Re: [Qemu-ppc] [PATCH v4 06/29] target-ppc: Add PMC5/6, SDAR and MMCRA to 970 family, (continued)
- [Qemu-ppc] [PATCH v4 08/29] target-ppc: Add HID4 SPR for PPC970, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 11/29] target-ppc: Enable PMU SPRs migration, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 03/29] target-ppc: Refactor PPC970, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 01/29] target-ppc: Rename 7XX/60x/74XX/e600 PMU SPRs, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 12/29] target-ppc: Move POWER7/8 PIR/PURR/SPURR SPR registration to helpers, Alexey Kardashevskiy, 2014/06/03
- Re: [Qemu-ppc] [PATCH v4 12/29] target-ppc: Move POWER7/8 PIR/PURR/SPURR SPR registration to helpers,
Tom Musta <=
- [Qemu-ppc] [PATCH v4 07/29] target-ppc: Add PMC7/8 to 970 class, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 02/29] target-ppc: Merge 970FX and 970MP into a single 970 class, Alexey Kardashevskiy, 2014/06/03
- [Qemu-ppc] [PATCH v4 15/29] target-ppc: Make use of gen_spr_book3s_altivec() for POWER7/8, Alexey Kardashevskiy, 2014/06/03