Skip to contentSkip to conversation

ARM: MX5: Fix broken leftover TO-2 errata workaround

PATCH Superseded David Jander 3 participants 3 messages Jul 14, 2011

Subsystems (2)
Arm (32-bit) Arm/actions semi architecture

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

David Jander

author
#0 lore raw

PATCH v2 1/1 ARM: MX5: Fix broken leftover TO-2 errata workaround

This check was broken. r3 does not contain the silicon revision anymore, so we need to reload it. Also, this errata only applies to i.MX51.

Changed in this version:
- Added #ifdef CONFIG_MX51 around the workaround

Signed-off-by David Jander <[email protected]>
---
 arch/arm/cpu/armv7/mx5/lowlevel_init.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/arm/cpu/armv7/mx5/lowlevel_init.S +5 -1
index ee4150d..6c66b42 100644
@@ -39,10 +39,14 @@
 	orr r0, r0, #(1 << 23)		/* disable write allocate combine */
 	orr r0, r0, #(1 << 22)		/* disable write allocate */
 
-	cmp r3, #0x10    /* r3 contains the silicon rev */
+#if defined(CONFIG_MX51)
+	ldr r1, =0x0
+	ldr r3, [r1, #ROM_SI_REV]
+	cmp r3, #0x10
 
 	/* disable write combine for TO 2 and lower revs */
 	orrls r0, r0, #(1 << 25)
+#endif
 
 	mcr 15, 1, r0, c9, c0, 2
 .endm /* init_l2cc */
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH v2 1/1 ARM: MX5: Fix broken leftover TO-2 errata workaround

arch/arm/cpu/armv7/mx5/lowlevel_init.S

Quoted 13 lines · David Jander

This check was broken. r3 does not contain the silicon revision anymore, so we need to reload it. Also, this errata only applies to i.MX51.

Changed in this version:
- Added #ifdef CONFIG_MX51 around the workaround

Signed-off-by David Jander <[email protected]>
---
 arch/arm/cpu/armv7/mx5/lowlevel_init.S |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
arch/arm/cpu/armv7/mx5/lowlevel_init.S +0 -0
index ee4150d..6c66b42 100644
Acked-by Stefano Babic <[email protected]>

Best regards,
Stefano Babic

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-0 Fax: +49-8142-66989-80  Email: office at denx.de
=====================================================================
#2 lore raw

PATCH v2 1/1 ARM: MX5: Fix broken leftover TO-2 errata workaround

In reply to David Jander

Hi David,

Le 14/07/2011 14:54, David Jander a ?crit :

Quoted 5 lines

This check was broken. r3 does not contain the silicon revision anymore, so we need to reload it. Also, this errata only applies to i.MX51.

Changed in this version:
- Added #ifdef CONFIG_MX51 around the workaround

Please keep patch history below the commit message line '---' so that the history does not appear in the Git tree.

Quoted 2 lines
Signed-off-by David Jander<[email protected]>

---

Put history here.

(please post a V3 for fixing this, not an amended V2!)

Amicalement,

Signature · 1 line
Albert.