summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-22 13:09:39 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2016-04-22 14:30:06 +0200
commit582e427280d00cde3bdac7c81e8fa26bec7fbde9 (patch)
treed54856bcec082b86cd84e18dd6e169f00d3722d1
parentbsp/qoriq: Do not reset time base (diff)
downloadrtems-582e427280d00cde3bdac7c81e8fa26bec7fbde9.tar.bz2
bsp/qoriq: Move L1 cache invalidate function
-rw-r--r--c/src/lib/libbsp/powerpc/qoriq/Makefile.am1
-rw-r--r--c/src/lib/libbsp/powerpc/qoriq/start/start.S20
-rw-r--r--c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S43
3 files changed, 45 insertions, 19 deletions
diff --git a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
index 936f857004..2fd34e9412 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
+++ b/c/src/lib/libbsp/powerpc/qoriq/Makefile.am
@@ -70,6 +70,7 @@ libbsp_a_SOURCES += \
../shared/startup/bspidle.c \
../shared/uboot_getenv.c \
../shared/uboot_dump_bdinfo.c \
+ startup/l1cache.S \
startup/l2cache.S \
startup/mmu.c \
startup/mmu-tlb1.S \
diff --git a/c/src/lib/libbsp/powerpc/qoriq/start/start.S b/c/src/lib/libbsp/powerpc/qoriq/start/start.S
index 466df88c32..64f7f2ec91 100644
--- a/c/src/lib/libbsp/powerpc/qoriq/start/start.S
+++ b/c/src/lib/libbsp/powerpc/qoriq/start/start.S
@@ -60,25 +60,7 @@ _start:
bl bsp_fdt_copy
#endif /* U_BOOT_USE_FDT */
- /* Invalidate L1 data cache */
- mfspr r3, FSL_EIS_L1CSR0
- ori r3, r3, FSL_EIS_L1CSR0_CFI
- mtspr FSL_EIS_L1CSR0, r3
-1:
- mfspr r3, FSL_EIS_L1CSR0
- andi. r3, r3, FSL_EIS_L1CSR0_CFI
- bne 1b
- isync
-
- /* Invalidate L1 instruction cache */
- mfspr r3, FSL_EIS_L1CSR1
- ori r3, r3, FSL_EIS_L1CSR1_ICFI
- mtspr FSL_EIS_L1CSR1, r3
-1:
- mfspr r3, FSL_EIS_L1CSR1
- andi. r3, r3, FSL_EIS_L1CSR1_ICFI
- bne 1b
- isync
+ bl qoriq_l1cache_invalidate
#ifdef QORIQ_CLUSTER_1_L2CSR0
LWI r3, QORIQ_CLUSTER_1_L2CSR0
diff --git a/c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S b/c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S
new file mode 100644
index 0000000000..bee3d28123
--- /dev/null
+++ b/c/src/lib/libbsp/powerpc/qoriq/startup/l1cache.S
@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2015, 2016 embedded brains GmbH. All rights reserved.
+ *
+ * embedded brains GmbH
+ * Dornierstr. 4
+ * 82178 Puchheim
+ * Germany
+ * <rtems@embedded-brains.de>
+ *
+ * The license and distribution terms for this file may be
+ * found in the file LICENSE in this distribution or at
+ * http://www.rtems.org/license/LICENSE.
+ */
+
+#include <libcpu/powerpc-utility.h>
+
+ .global qoriq_l1cache_invalidate
+
+ .section ".bsp_start_text", "ax"
+
+qoriq_l1cache_invalidate:
+
+ /* Invalidate L1 data cache */
+ mfspr r3, FSL_EIS_L1CSR0
+ ori r3, r3, FSL_EIS_L1CSR0_CFI
+ mtspr FSL_EIS_L1CSR0, r3
+1:
+ mfspr r3, FSL_EIS_L1CSR0
+ andi. r3, r3, FSL_EIS_L1CSR0_CFI
+ bne 1b
+ isync
+
+ /* Invalidate L1 instruction cache */
+ mfspr r3, FSL_EIS_L1CSR1
+ ori r3, r3, FSL_EIS_L1CSR1_ICFI
+ mtspr FSL_EIS_L1CSR1, r3
+1:
+ mfspr r3, FSL_EIS_L1CSR1
+ andi. r3, r3, FSL_EIS_L1CSR1_ICFI
+ bne 1b
+ isync
+
+ blr