Message ID | 20190124124906.16653-4-laurent@vivier.eu |
---|---|
State | New |
Headers | show |
Series | [PULL,1/5] MAINTAINERS: Fix utf-8 mangling | expand |
On 24/01/2019 23:49, Laurent Vivier wrote: > From: Jon Diekema <jon.diekema@ge.com> > > 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 ! > > Signed-off-by: Jon Diekema <jon.diekema@ge.com> > Message-Id: <CALvuzg43uSodseEHjNaRcPFBKKPTY2mcppUbYgiLL=QO9RxX_Q@mail.gmail.com> > [removed duplicated mail header in the commit message] > Signed-off-by: Laurent Vivier <laurent@vivier.eu> > --- > 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 ade06cc773..59e0b86762 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); Out of curiosity - does every BookE board have these? > /* Thread identification */ > spr_register(env, SPR_TIR, "TIR", > SPR_NOACCESS, SPR_NOACCESS, >
diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index ade06cc773..59e0b86762 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,