Re: [Qemu-devel] [Qemu-trivial] ppc: e6500 registers SPR 604 twice

[Laurent Vivier]

Please cc: qemu-devel and maintainers (see MAINTAINERS file)

Le 25/12/2018 à 10:50, Jon Diekema a écrit :
> From f399f28441e0aa79458d68996038ca3606fcb699 Mon Sep 17 00:00:00 2001
> From: Jon Diekema <address@hidden <mailto:address@hidden>>

it's better to use the same email address for the patch author and to
send it.

> Date: Tue, 25 Dec 2018 04:36:06 -0500
> Subject: ppc: e6500 registers SPR 604 twice
> 
> When using the e6500 CPU, QEMU generates a fatal error after
> complaining about registering SPR 604 twice.
> 
> Building and testing with commit
> 9b2e891ec5ccdb4a7d583b77988848282606fdea shows the issue:
> 
> qemu-system-ppc64 --version
> QEMU emulator version 3.1.50 (v3.1.0-456-g9b2e891ec5-dirty)
> Copyright (c) 2003-2018 Fabrice Bellard and the QEMU Project developers
> 
> qemu-system-ppc64 -M none -cpu e6500
> Error: Trying to register SPR 604 (25c) twice !

Fixes: 0e3bf48909
       ppc: add DBCR based debugging

> Signed-off-by: Jon Diekema <address@hidden <mailto:address@hidden>>
> ---
>  target/ppc/translate_init.inc.c | 8 --------
>  1 file changed, 8 deletions(-)
> 
> diff --git a/target/ppc/translate_init.inc.c
> b/target/ppc/translate_init.inc.c
> index 03f1d34a97..c971a5faf7 100644
> --- a/target/ppc/translate_init.inc.c
> +++ b/target/ppc/translate_init.inc.c
> @@ -4947,14 +4947,6 @@ static void init_proc_e500(CPUPPCState *env, int
> version)
>      }
>  
>      if (version == fsl_e6500) {
> -        spr_register(env, SPR_BOOKE_SPRG8, "SPRG8",
> -                     SPR_NOACCESS, SPR_NOACCESS,
> -                     &spr_read_generic, &spr_write_generic,
> -                     0x00000000);
> -        spr_register(env, SPR_BOOKE_SPRG9, "SPRG9",
> -                     SPR_NOACCESS, SPR_NOACCESS,
> -                     &spr_read_generic, &spr_write_generic,
> -                     0x00000000);
>          /* Thread identification */
>          spr_register(env, SPR_TIR, "TIR",
>                       SPR_NOACCESS, SPR_NOACCESS,
> -- 
> 2.20.1.3.gf17a2b179
> 

Reviewed-by: Laurent Vivier <address@hidden>
Tested-by: Laurent Vivier <address@hidden>