Skip to contentSkip to conversation

PXA: FIX: Deep-sleep return address in stored in PSPR

PATCH New Marek Vasut 3 participants 5 messages Sep 7, 2011 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 PXA: FIX: Deep-sleep return address in stored in PSPR

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

---
 arch/arm/cpu/pxa/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/cpu/pxa/cpu.c +1 -1
index 7d49cbb..3bc0525 100644
@@ -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)));
 	}
 }
 
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 PXA: FIX: Deep-sleep return address in stored in PSPR

Quoted 7 lines · Marek Vasut

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

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

Quoted 12 lines
arch/arm/cpu/pxa/cpu.c +1 -1
index 7d49cbb..3bc0525 100644
@@ -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)));
 	}
 }
#2 lore raw

PATCH 1/1 PXA: FIX: Deep-sleep return address in stored in PSPR

Hi Marek,

Le 07/09/2011 15:26, Marek Vasut a ?crit :

Quoted 9 lines · Marek Vasut
Quoted 7 lines

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

---
  arch/arm/cpu/pxa/cpu.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 4 lines

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,

Signature · 1 line
Albert.
#3 lore raw

PATCH 1/1 PXA: FIX: Deep-sleep return address in stored in PSPR

Quoted 12 lines · Albert ARIBAUD

Hi Marek,

Le 07/09/2011 15:26, Marek Vasut a ?crit :

Quoted 9 lines · Marek Vasut
Quoted 7 lines

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

---

  arch/arm/cpu/pxa/cpu.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
Quoted 8 lines
Quoted 4 lines

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.

Quoted 2 lines

Amicalement,

#4 lore raw

PATCH 1/1 PXA: FIX: Deep-sleep return address in stored in PSPR

In reply to Marek Vasut

Dear Marek Vasut,

Quoted 6 lines · In message <[email protected]> you wrote:

FIX for a typo-bug: The address is stored in PSPR, not PSSR.

---
 arch/arm/cpu/pxa/cpu.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

Signature · 5 lines
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Put your Nose to the Grindstone!
                 -- Amalgamated Plastic Surgeons and Toolmakers, Ltd.