Patchwork [U-Boot] PXA: FIX: Deep-sleep return address in stored in PSPR

login
register
mail settings
Submitter Marek Vasut
Date Sept. 7, 2011, 1:25 p.m.
Message ID <1315401946-17065-1-git-send-email-marek.vasut@gmail.com>
Download mbox | patch
Permalink /patch/113765/
State Accepted
Commit b793bb92a277e61de4089d7e19506c968d1dcd9d
Headers show

Comments

Marek Vasut - Sept. 7, 2011, 1:25 p.m.
FIX for a typo-bug: The address is stored in PSPR, not PSSR.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/cpu/pxa/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Marek Vasut - Sept. 7, 2011, 1:26 p.m.
On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  arch/arm/cpu/pxa/cpu.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 

Albert, this is actually a resend of a very old patch. I dunno why it didn't get 
into mainline, but it really SHOULD be picked up.

Also, can you please just merge it without pull rq?

Thanks!

> diff --git a/arch/arm/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c
> index 7d49cbb..3bc0525 100644
> --- a/arch/arm/cpu/pxa/cpu.c
> +++ b/arch/arm/cpu/pxa/cpu.c
> @@ -305,7 +305,7 @@ void pxa_wakeup(void)
>  		pxa_dram_init();
>  		icache_disable();
>  		dcache_disable();
> -		asm volatile("mov	pc, %0"::"r"(readl(PSSR)));
> +		asm volatile("mov	pc, %0"::"r"(readl(PSPR)));
>  	}
>  }
Albert ARIBAUD - Sept. 7, 2011, 2:23 p.m.
Hi Marek,

Le 07/09/2011 15:26, Marek Vasut a écrit :
> On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
>> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
>>
>> Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
>> ---
>>   arch/arm/cpu/pxa/cpu.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>
> Albert, this is actually a resend of a very old patch. I dunno why it didn't get
> into mainline, but it really SHOULD be picked up.
>
> Also, can you please just merge it without pull rq?

You mean apply it to u-boot-arm/master directly ? I can, but if you want 
it applied ASAP, maybe you should ask that Wolfgang apply it to 
u-boot/master directly.

Amicalement,
Marek Vasut - Sept. 7, 2011, 2:28 p.m.
On Wednesday, September 07, 2011 04:23:19 PM Albert ARIBAUD wrote:
> Hi Marek,
> 
> Le 07/09/2011 15:26, Marek Vasut a écrit :
> > On Wednesday, September 07, 2011 03:25:45 PM Marek Vasut wrote:
> >> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> >> 
> >> Signed-off-by: Marek Vasut<marek.vasut@gmail.com>
> >> ---
> >> 
> >>   arch/arm/cpu/pxa/cpu.c |    2 +-
> >>   1 files changed, 1 insertions(+), 1 deletions(-)
> > 
> > Albert, this is actually a resend of a very old patch. I dunno why it
> > didn't get into mainline, but it really SHOULD be picked up.
> > 
> > Also, can you please just merge it without pull rq?
> 
> You mean apply it to u-boot-arm/master directly ? I can, but if you want
> it applied ASAP, maybe you should ask that Wolfgang apply it to
> u-boot/master directly.

It's a bugfix that wasn't applied for six months ... AND noone complained. It 
means 1) PXA is dead and noone cares 2) it's in no hurry.

Wolfgang, if you feel like applying it to master, please do.

> 
> Amicalement,
Wolfgang Denk - Sept. 7, 2011, 9:51 p.m.
Dear Marek Vasut,

In message <1315401946-17065-1-git-send-email-marek.vasut@gmail.com> you wrote:
> FIX for a typo-bug: The address is stored in PSPR, not PSSR.
> 
> Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
> ---
>  arch/arm/cpu/pxa/cpu.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Patch

diff --git a/arch/arm/cpu/pxa/cpu.c b/arch/arm/cpu/pxa/cpu.c
index 7d49cbb..3bc0525 100644
--- a/arch/arm/cpu/pxa/cpu.c
+++ b/arch/arm/cpu/pxa/cpu.c
@@ -305,7 +305,7 @@  void pxa_wakeup(void)
 		pxa_dram_init();
 		icache_disable();
 		dcache_disable();
-		asm volatile("mov	pc, %0"::"r"(readl(PSSR)));
+		asm volatile("mov	pc, %0"::"r"(readl(PSPR)));
 	}
 }