[Qemu-devel] [PATCH] ppc: move POWER8 Book4 regs in their own routine

[Qemu-devel] [PATCH] ppc: move POWER8 Book4 regs in their own routine

[Cédric Le Goater]

commit fce55481360d "ppc: A couple more dummy POWER8 Book4 regs"
squashed in to rapidly a set of POWER8 Book4 regs in the wrong
routine. This patch introduces the missing gen_spr_power8_book4()
routine to fix their location.

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
 target-ppc/translate_init.c |    8 ++++++++
 1 file changed, 8 insertions(+)

Index: qemu-dgibson-for-2.6.git/target-ppc/translate_init.c
===================================================================
--- qemu-dgibson-for-2.6.git.orig/target-ppc/translate_init.c
+++ qemu-dgibson-for-2.6.git/target-ppc/translate_init.c
@@ -8018,6 +8018,13 @@ static void gen_spr_power8_ic(CPUPPCStat
                     &spr_read_generic, SPR_NOACCESS,
                     &spr_read_generic, &spr_write_generic,
                     0);
+#endif
+}
+
+static void gen_spr_power8_book4(CPUPPCState *env)
+{
+    /* Add a number of P8 book4 registers */
+#if !defined(CONFIG_USER_ONLY)
     spr_register_kvm(env, SPR_ACOP, "ACOP",
                      SPR_NOACCESS, SPR_NOACCESS,
                      &spr_read_generic, &spr_write_generic,
@@ -8086,6 +8093,7 @@ static void init_proc_book3s_64(CPUPPCSt
         gen_spr_power8_pspb(env);
         gen_spr_vtb(env);
         gen_spr_power8_ic(env);
+        gen_spr_power8_book4(env);
     }
     if (version < BOOK3S_CPU_POWER8) {
         gen_spr_book3s_dbg(env);

Re: [Qemu-devel] [PATCH] ppc: move POWER8 Book4 regs in their own routine

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1797 bytes --]

On Tue, Mar 22, 2016 at 03:23:13PM +0100, Cédric Le Goater wrote:
> commit fce55481360d "ppc: A couple more dummy POWER8 Book4 regs"
> squashed in to rapidly a set of POWER8 Book4 regs in the wrong
> routine. This patch introduces the missing gen_spr_power8_book4()
> routine to fix their location.
> 
> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>

Applied to ppc-for-2.6, thanks.

> ---
>  target-ppc/translate_init.c |    8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> Index: qemu-dgibson-for-2.6.git/target-ppc/translate_init.c
> ===================================================================
> --- qemu-dgibson-for-2.6.git.orig/target-ppc/translate_init.c
> +++ qemu-dgibson-for-2.6.git/target-ppc/translate_init.c
> @@ -8018,6 +8018,13 @@ static void gen_spr_power8_ic(CPUPPCStat
>                      &spr_read_generic, SPR_NOACCESS,
>                      &spr_read_generic, &spr_write_generic,
>                      0);
> +#endif
> +}
> +
> +static void gen_spr_power8_book4(CPUPPCState *env)
> +{
> +    /* Add a number of P8 book4 registers */
> +#if !defined(CONFIG_USER_ONLY)
>      spr_register_kvm(env, SPR_ACOP, "ACOP",
>                       SPR_NOACCESS, SPR_NOACCESS,
>                       &spr_read_generic, &spr_write_generic,
> @@ -8086,6 +8093,7 @@ static void init_proc_book3s_64(CPUPPCSt
>          gen_spr_power8_pspb(env);
>          gen_spr_vtb(env);
>          gen_spr_power8_ic(env);
> +        gen_spr_power8_book4(env);
>      }
>      if (version < BOOK3S_CPU_POWER8) {
>          gen_spr_book3s_dbg(env);
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]