summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Loeliger <jdl@jdl.com>2006-05-19 13:14:15 -0500
committerJon Loeliger <jdl@jdl.com>2006-05-19 13:54:02 -0500
commitcccce5d0581bb0ba4602799a4b5112e58d1579cb (patch)
tree064ff4b3efe5d33abfd1ff43b9d3bebffd2729b5
parentf35ec68fb066cec0e36294bfe07dec2d4e8ad3a8 (diff)
downloadu-boot-imx-cccce5d0581bb0ba4602799a4b5112e58d1579cb.zip
u-boot-imx-cccce5d0581bb0ba4602799a4b5112e58d1579cb.tar.gz
u-boot-imx-cccce5d0581bb0ba4602799a4b5112e58d1579cb.tar.bz2
Remove L2 Cache invalidate polling.
-rw-r--r--cpu/mpc86xx/cache.S28
1 files changed, 17 insertions, 11 deletions
diff --git a/cpu/mpc86xx/cache.S b/cpu/mpc86xx/cache.S
index 75186b1..f316b3e 100644
--- a/cpu/mpc86xx/cache.S
+++ b/cpu/mpc86xx/cache.S
@@ -28,7 +28,7 @@
* Most of this code is taken from 74xx_7xx/cache.S
* and then cleaned up a bit
*/
-
+
/*
* Invalidate L1 instruction cache.
*/
@@ -316,24 +316,30 @@ _GLOBAL(dcache_status)
blr
/*
- * Invalidate L2 cache using L2I and polling L2IP
+ * Invalidate L2 cache using L2I, assume L2 is enabled
*/
_GLOBAL(l2cache_invalidate)
- sync
- oris r3, r3, L2CR_L2I@h
+ mfspr r3, l2cr
+ rlwinm. r3, r3, 0, 0, 0
+ beq 1f
+
+ mfspr r3, l2cr
+ rlwinm r3, r3, 0, 1, 31
+
+#ifdef CONFIG_ALTIVEC
+ dssall
+#endif
sync
mtspr l2cr, r3
sync
+1: mfspr r3, l2cr
+ oris r3, r3, L2CR_L2I@h
+ mtspr l2cr, r3
+
invl2:
mfspr r3, l2cr
- andi. r3, r3, L2CR_L2IP
+ andi. r3, r3, L2CR_L2I@h
bne invl2
- /* turn off the global invalidate bit */
- mfspr r3, l2cr
- rlwinm r3, r3, 0, 11, 9
- sync
- mtspr l2cr, r3
- sync
blr
/*