[oe-commits] Koen Kooi : u-boot git: add patch to fix Cortex-A8 erratum 725233 for beagleboard

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 8b932e307af6689e3fc55d1826ea538de0db558d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=8b932e307af6689e3fc55d1826ea538de0db558d

Author: Koen Kooi <koen at openembedded.org>
Date:   Fri Feb 26 14:41:55 2010 +0100

u-boot git: add patch to fix Cortex-A8 erratum 725233 for beagleboard

---

 .../u-boot-git/Cortex-A8-erratum-725233.diff       |   45 ++++++++++++++++++++
 recipes/u-boot/u-boot_git.bb                       |    3 +-
 2 files changed, 47 insertions(+), 1 deletions(-)

diff --git a/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff b/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff
new file mode 100644
index 0000000..73f955b
--- /dev/null
+++ b/recipes/u-boot/u-boot-git/Cortex-A8-erratum-725233.diff
@@ -0,0 +1,45 @@
+From: Siarhei Siamashka <siarhei.siamashka at gmail.com>
+Date: Wed, 24 Feb 2010 04:56:36 +0000 (-0500)
+Subject: OMAP3: workaround for ARM Cortex-A8 erratum 725233
+X-Git-Url: http://git.denx.de/?p=u-boot%2Fu-boot-arm.git;a=commitdiff_plain;h=42d97d08838d4e010d80c92ad1300c426320dd18
+
+OMAP3: workaround for ARM Cortex-A8 erratum 725233
+
+725233: PLD instructions executed with PLD data forwarding
+enabled can result in a processor deadlock
+
+This deadlock can happen when NEON load instructions are used together
+with cache preload instructions (PLD). The problematic conditions
+can be triggered in-the-wild by NEON optimized functions from pixman
+library (http://cgit.freedesktop.org/pixman), which perform dynamic
+adjustment of prefetch distance.
+
+The workaround disables PLD data forwarding by setting PLD_FWD bit
+in L2 Cache Auxiliary Control Register as recommended in ARM Cortex-A8
+errata list.
+
+The deadlock can only happen on r1pX revisions of Cortex-A8 (used in
+OMAP34xx/OMAP35xx). Performance impact of the workaround is practically
+non-existant.
+
+Signed-off-by: Siarhei Siamashka <siarhei.siamashka at gmail.com>
+Signed-off-by: Sandeep Paulraj <s-paulraj at ti.com>
+---
+
+diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c
+index 2aa69b3..7b78fa4 100644
+--- a/cpu/arm_cortexa8/omap3/board.c
++++ b/cpu/arm_cortexa8/omap3/board.c
+@@ -146,6 +146,12 @@ void setup_auxcr()
+ 	__asm__ __volatile__("orr r0, r0, #1 << 5");
+ 	/* SMI instruction to call ROM Code API */
+ 	__asm__ __volatile__(".word 0xE1600070");
++	/* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */
++	__asm__ __volatile__("mov r12, #0x2");
++	__asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2");
++	__asm__ __volatile__("orr r0, r0, #1 << 27");
++	/* SMI instruction to call ROM Code API */
++	__asm__ __volatile__(".word 0xE1600070");
+ 	__asm__ __volatile__("mov r0, %0":"=r"(i));
+ 	__asm__ __volatile__("mov r12, %0":"=r"(j));
+ }
diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb
index 865176d..3c65a1e 100644
--- a/recipes/u-boot/u-boot_git.bb
+++ b/recipes/u-boot/u-boot_git.bb
@@ -1,5 +1,5 @@
 require u-boot.inc
-PR ="r40"
+PR ="r41"
 
 FILESPATHPKG =. "u-boot-git:"
 
@@ -26,6 +26,7 @@ file://dss.patch;patch=1 \
 file://0001-omap3-clock.c-don-t-reprogram-clocks-when-trying-to-.patch;patch=1 \
 file://0002-beagleboard-add-pinmuxing-for-beagleboard-XM.patch;patch=1 \
 file://0003-beagleboard-move-muxing-into-revision-print-switch.patch;patch=1 \
+file://Cortex-A8-erratum-725233.diff;patch=1 \
 "
 
 SRCREV_beagleboard = "a5cf522a91ba479d459f8221135bdb3e9ae97479"