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

[David Gibson]

On Wed, Jan 09, 2019 at 11:17:00AM +0100, Laurent Vivier wrote:
> David,
> 
> will you take this through your ppc branch?

Somehow I missed this one, sorry.  Even when I look back through my
mail archives I can't see the original message of this thread.  Can
you resend please?

> 
> Thanks,
> Laurent
> 
> On 04/01/2019 11:41, Roman Kapl wrote:
> >> 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>>
> >>> 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.
> >>>
> >>>
> >>> 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>
> >>
> > 
> > Thanks Jon, I did not test with e6500. The patch fixes the issue &
> > debugging still works on e5500.
> > 
> > Roman Kapl
> > 
> 

-- 
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

signature.asc
Description: PGP signature