summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-12-21 08:39:33 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-12-21 10:32:41 +0100
commit41a557bc2fc9621c49bbbea635a90ab4b86ef49a (patch)
treebe5c1e1e7b93d0573d6339a22e61d18bec3de95e
parentbsps: Add CPU_CACHE_SUPPORT_PROVIDES_DISABLE_DATA (diff)
downloadrtems-41a557bc2fc9621c49bbbea635a90ab4b86ef49a.tar.bz2
bsps/arm: Add ARMv7-AR disable data cache
Close #3667.
-rw-r--r--bsps/arm/shared/cache/cache-cp15.c14
-rw-r--r--bsps/arm/shared/cache/cache-v7ar-disable-data.S120
-rw-r--r--c/src/lib/libbsp/arm/beagle/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/imx/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/raspberrypi/Makefile.am1
-rw-r--r--c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am1
6 files changed, 131 insertions, 7 deletions
diff --git a/bsps/arm/shared/cache/cache-cp15.c b/bsps/arm/shared/cache/cache-cp15.c
index 4fb38c7a0f..148d78d1fe 100644
--- a/bsps/arm/shared/cache/cache-cp15.c
+++ b/bsps/arm/shared/cache/cache-cp15.c
@@ -7,13 +7,7 @@
*/
/*
- * Copyright (c) 2009-2011 embedded brains GmbH. All rights reserved.
- *
- * embedded brains GmbH
- * Obere Lagerstr. 30
- * 82178 Puchheim
- * Germany
- * <rtems@embedded-brains.de>
+ * Copyright (C) 2009, 2018 embedded brains GmbH
*
* The license and distribution terms for this file may be
* found in the file LICENSE in this distribution or at
@@ -21,10 +15,13 @@
*/
#include <libcpu/arm-cp15.h>
+
#include "cache-cp15.h"
#define CPU_DATA_CACHE_ALIGNMENT 32
+
#define CPU_INSTRUCTION_CACHE_ALIGNMENT 32
+
#if defined(__ARM_ARCH_7A__)
/* Some/many ARM Cortex-A cores have L1 data line length 64 bytes */
#define CPU_MAXIMAL_CACHE_ALIGNMENT 64
@@ -32,6 +29,9 @@
#define CPU_CACHE_SUPPORT_PROVIDES_RANGE_FUNCTIONS
+#if __ARM_ARCH >= 7 && (__ARM_ARCH_PROFILE == 65 || __ARM_ARCH_PROFILE == 82)
+#define CPU_CACHE_SUPPORT_PROVIDES_DISABLE_DATA
+#endif
static inline void _CPU_cache_flush_1_data_line(const void *d_addr)
{
diff --git a/bsps/arm/shared/cache/cache-v7ar-disable-data.S b/bsps/arm/shared/cache/cache-v7ar-disable-data.S
new file mode 100644
index 0000000000..b275c1d484
--- /dev/null
+++ b/bsps/arm/shared/cache/cache-v7ar-disable-data.S
@@ -0,0 +1,120 @@
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (C) 2018 embedded brains GmbH
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <rtems/asm.h>
+
+ .globl rtems_cache_disable_data
+
+ .syntax unified
+ .section .text
+ .arm
+
+ /*
+ * This function disables the data cache on an ARMv7-AR compatible
+ * processor.
+ */
+FUNCTION_ENTRY(rtems_cache_disable_data)
+ /* Disable interrupts */
+ mrs r0, CPSR
+ orr r1, r0, #0x80
+ msr CPSR_fc, r1
+
+ stmdb sp!, {r4 - r11, lr}
+ dmb
+
+ /* Disable data cache in SCTLR */
+ mrc p15, 0, r1, c1, c0, 0
+ bic r1, r1, #0x4
+ mcr p15, 0, r1, c1, c0, 0
+ isb
+
+ /* Get cache levels (LoC) from CLIDR */
+ mrc p15, 1, r1, c0, c0, 1
+ mov r2, r1, lsr #24
+ ands r2, r2, #0x7
+ beq .Ldone
+
+ /* Start with level 0 */
+ mov r3, #0
+
+.Lflush_level:
+ /* Flush level specified by r3 */
+
+ /* Check cache type */
+ add r4, r3, r3, lsl #1
+ lsr r5, r1, r4
+ and r5, r5, #0x7
+ cmp r5, #2
+ blt .Lno_data_cache
+
+ /* Read CCSIDR */
+ lsl r4, r3, #1
+ mcr p15, 2, r5, c0, c0, 0
+ isb
+ mrc p15, 1, r5, c0, c0, 0
+
+ /* Get cache line power */
+ and r6, r5, #0x7
+ add r6, r6, #4
+
+ /* Get ways minus one */
+ mov r7, #0x3ff
+ ands r7, r7, r5, lsr #3
+
+ /* Get way shift */
+ clz r8, r7
+
+ /* Get sets minus one */
+ mov r9, #0x7fff
+ ands r9, r9, r5, lsr #13
+
+.Lloop_over_ways:
+ mov r10, r9
+
+.Lloop_over_sets:
+ orr r11, r4, r7, lsl r8
+ orr r11, r11, r10, lsl r6
+
+ /* Clean and invalidate by set and way */
+ mcr p15, 0, r11, c7, c14, 2
+
+ subs r10, r10, #1
+ bge .Lloop_over_sets
+ subs r7, r7, #1
+ bge .Lloop_over_ways
+
+.Lno_data_cache:
+ /* Next level */
+ add r3, r3, #1
+ cmp r2, r3
+ bgt .Lflush_level
+
+.Ldone:
+ /* Restore interrupts */
+ msr CPSR_fc, r0
+
+ ldmia sp!, {r4 - r11, pc}
diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am
index a990d734a9..acab25c52f 100644
--- a/c/src/lib/libbsp/arm/beagle/Makefile.am
+++ b/c/src/lib/libbsp/arm/beagle/Makefile.am
@@ -84,6 +84,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/beagle/clock/clock.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-v7ar-disable-data.S
###############################################################################
# Special Rules #
diff --git a/c/src/lib/libbsp/arm/imx/Makefile.am b/c/src/lib/libbsp/arm/imx/Makefile.am
index d9c55c82d7..d8623c9779 100644
--- a/c/src/lib/libbsp/arm/imx/Makefile.am
+++ b/c/src/lib/libbsp/arm/imx/Makefile.am
@@ -62,6 +62,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-generic-t
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-v7ar-disable-data.S
# I2C
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/imx/i2c/imx-i2c.c
diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
index 5860868561..14a348411d 100644
--- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
+++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am
@@ -103,6 +103,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/spi/spi.c
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-v7ar-disable-data.S
# Start hooks
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/raspberrypi/start/bspstarthooks.c
diff --git a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
index b6f2c02aba..d5549275be 100644
--- a/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
+++ b/c/src/lib/libbsp/arm/realview-pbx-a9/Makefile.am
@@ -72,6 +72,7 @@ librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/clock/clock-a9mpcore.
# Cache
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-cp15.c
+librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/shared/cache/cache-v7ar-disable-data.S
# Start hooks
librtemsbsp_a_SOURCES += ../../../../../../bsps/arm/realview-pbx-a9/start/bspstarthooks.c