diff mbox

[for-1.5] ppc: do not register IABR SPR twice for 603e

Message ID 1368299031-17587-1-git-send-email-hpoussin@reactos.org
State New
Headers show

Commit Message

Hervé Poussineau May 11, 2013, 7:03 p.m. UTC
IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 target-ppc/translate_init.c |    5 -----
 1 file changed, 5 deletions(-)

Comments

Hervé Poussineau May 20, 2013, 6:17 p.m. UTC | #1
Ping.
This should be IMO committed to stable, as it fixes a crash with 
qemu-system-ppc -M prep -cpu 603e

Hervé

Hervé Poussineau a écrit :
> IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  target-ppc/translate_init.c |    5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 6feb62a..248d3e0 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -4980,11 +4980,6 @@ static void init_proc_603E (CPUPPCState *env)
>                   SPR_NOACCESS, SPR_NOACCESS,
>                   &spr_read_generic, &spr_write_generic,
>                   0x00000000);
> -    /* XXX : not implemented */
> -    spr_register(env, SPR_IABR, "IABR",
> -                 SPR_NOACCESS, SPR_NOACCESS,
> -                 &spr_read_generic, &spr_write_generic,
> -                 0x00000000);
>      /* Memory management */
>      gen_low_BATs(env);
>      gen_6xx_7xx_soft_tlb(env, 64, 2);
Michael Roth June 11, 2013, 9:42 p.m. UTC | #2
On Mon, May 20, 2013 at 08:17:47PM +0200, Hervé Poussineau wrote:
> Ping.
> This should be IMO committed to stable, as it fixes a crash with
> qemu-system-ppc -M prep -cpu 603e

Ping^2. Looking to pull this in for 1.5.1

> 
> Hervé
> 
> Hervé Poussineau a écrit :
> >IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
> >
> >Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> >---
> > target-ppc/translate_init.c |    5 -----
> > 1 file changed, 5 deletions(-)
> >
> >diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> >index 6feb62a..248d3e0 100644
> >--- a/target-ppc/translate_init.c
> >+++ b/target-ppc/translate_init.c
> >@@ -4980,11 +4980,6 @@ static void init_proc_603E (CPUPPCState *env)
> >                  SPR_NOACCESS, SPR_NOACCESS,
> >                  &spr_read_generic, &spr_write_generic,
> >                  0x00000000);
> >-    /* XXX : not implemented */
> >-    spr_register(env, SPR_IABR, "IABR",
> >-                 SPR_NOACCESS, SPR_NOACCESS,
> >-                 &spr_read_generic, &spr_write_generic,
> >-                 0x00000000);
> >     /* Memory management */
> >     gen_low_BATs(env);
> >     gen_6xx_7xx_soft_tlb(env, 64, 2);
> 
>
Hervé Poussineau June 15, 2013, 6:19 p.m. UTC | #3
mdroth a écrit :
> On Mon, May 20, 2013 at 08:17:47PM +0200, Hervé Poussineau wrote:
>> Ping.
>> This should be IMO committed to stable, as it fixes a crash with
>> qemu-system-ppc -M prep -cpu 603e
> 
> Ping^2. Looking to pull this in for 1.5.1

Ping^3

> 
>> Hervé
>>
>> Hervé Poussineau a écrit :
>>> IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
>>>
>>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>>> ---
>>> target-ppc/translate_init.c |    5 -----
>>> 1 file changed, 5 deletions(-)
>>>
>>> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
>>> index 6feb62a..248d3e0 100644
>>> --- a/target-ppc/translate_init.c
>>> +++ b/target-ppc/translate_init.c
>>> @@ -4980,11 +4980,6 @@ static void init_proc_603E (CPUPPCState *env)
>>>                  SPR_NOACCESS, SPR_NOACCESS,
>>>                  &spr_read_generic, &spr_write_generic,
>>>                  0x00000000);
>>> -    /* XXX : not implemented */
>>> -    spr_register(env, SPR_IABR, "IABR",
>>> -                 SPR_NOACCESS, SPR_NOACCESS,
>>> -                 &spr_read_generic, &spr_write_generic,
>>> -                 0x00000000);
>>>     /* Memory management */
>>>     gen_low_BATs(env);
>>>     gen_6xx_7xx_soft_tlb(env, 64, 2);
>>
>
Hervé Poussineau June 15, 2013, 6:20 p.m. UTC | #4
mdroth a écrit :
> On Mon, May 20, 2013 at 08:17:47PM +0200, Hervé Poussineau wrote:
>> Ping.
>> This should be IMO committed to stable, as it fixes a crash with
>> qemu-system-ppc -M prep -cpu 603e
> 
> Ping^2. Looking to pull this in for 1.5.1

Ping^3

>> Hervé Poussineau a écrit :
>>> IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
>>>
>>> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
>>> ---
>>> target-ppc/translate_init.c |    5 -----
>>> 1 file changed, 5 deletions(-)
>>>
>>> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
>>> index 6feb62a..248d3e0 100644
>>> --- a/target-ppc/translate_init.c
>>> +++ b/target-ppc/translate_init.c
>>> @@ -4980,11 +4980,6 @@ static void init_proc_603E (CPUPPCState *env)
>>>                  SPR_NOACCESS, SPR_NOACCESS,
>>>                  &spr_read_generic, &spr_write_generic,
>>>                  0x00000000);
>>> -    /* XXX : not implemented */
>>> -    spr_register(env, SPR_IABR, "IABR",
>>> -                 SPR_NOACCESS, SPR_NOACCESS,
>>> -                 &spr_read_generic, &spr_write_generic,
>>> -                 0x00000000);
>>>     /* Memory management */
>>>     gen_low_BATs(env);
>>>     gen_6xx_7xx_soft_tlb(env, 64, 2);
>>
>
Andreas Färber June 15, 2013, 9 p.m. UTC | #5
Am 11.05.2013 21:03, schrieb Hervé Poussineau:
> IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Confirmed,

Reviewed-by: Andreas Färber <afaerber@suse.de>

Andreas
Alexander Graf June 18, 2013, 3:38 p.m. UTC | #6
On 11.05.2013, at 21:03, Hervé Poussineau wrote:

> IABR SPR is already registered in gen_spr_603(), called from init_proc_603E().
> 
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>

Thanks, applied to ppc-next. Sorry for the long delay - I was on vacation :)


Alex

> ---
> target-ppc/translate_init.c |    5 -----
> 1 file changed, 5 deletions(-)
> 
> diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
> index 6feb62a..248d3e0 100644
> --- a/target-ppc/translate_init.c
> +++ b/target-ppc/translate_init.c
> @@ -4980,11 +4980,6 @@ static void init_proc_603E (CPUPPCState *env)
>                  SPR_NOACCESS, SPR_NOACCESS,
>                  &spr_read_generic, &spr_write_generic,
>                  0x00000000);
> -    /* XXX : not implemented */
> -    spr_register(env, SPR_IABR, "IABR",
> -                 SPR_NOACCESS, SPR_NOACCESS,
> -                 &spr_read_generic, &spr_write_generic,
> -                 0x00000000);
>     /* Memory management */
>     gen_low_BATs(env);
>     gen_6xx_7xx_soft_tlb(env, 64, 2);
> -- 
> 1.7.10.4
>
diff mbox

Patch

diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c
index 6feb62a..248d3e0 100644
--- a/target-ppc/translate_init.c
+++ b/target-ppc/translate_init.c
@@ -4980,11 +4980,6 @@  static void init_proc_603E (CPUPPCState *env)
                  SPR_NOACCESS, SPR_NOACCESS,
                  &spr_read_generic, &spr_write_generic,
                  0x00000000);
-    /* XXX : not implemented */
-    spr_register(env, SPR_IABR, "IABR",
-                 SPR_NOACCESS, SPR_NOACCESS,
-                 &spr_read_generic, &spr_write_generic,
-                 0x00000000);
     /* Memory management */
     gen_low_BATs(env);
     gen_6xx_7xx_soft_tlb(env, 64, 2);