From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [RESEND v3 39/52] ARM: lib64: Make string functions aware of MMU configuration
Date: Thu, 7 Jun 2018 06:00:55 -0700 [thread overview]
Message-ID: <20180607130108.5339-40-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180607130108.5339-1-andrew.smirnov@gmail.com>
Optimized version of memset() in memset.S if called as:
memset(foo, 0, size)
will try to explicitly zero out data cache with:
dc zva, dst
which will result in Alignement Exception (DABT) if MMU is not
enabled.
For more info see:
- C4.4.8 "DC ZVA, Data Cache Zero by VA"
- D5.2.8 "The effects of disabling a stage of address translation"
in "ARM Architecture Reference Manual. ARMv8, for ARMv8-A architecture
profile"
In similar vein, using optimized version of memcpy() could lead to a
unaligned 16-byte write (using 'stp'), which is not allowed for
Device-nGnRnE type of memory (see D5.2.8) and would liead to
Alignement Exception.
To fix both problems expose non-optimized and optimzied versions of
the function and created a wrapper to dispatch the call to either one
based on if MMU is enabled or not.
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
arch/arm/Kconfig | 7 +++++++
arch/arm/lib64/Makefile | 2 +-
arch/arm/lib64/memcpy.S | 6 +++---
arch/arm/lib64/memset.S | 4 ++--
arch/arm/lib64/string.c | 22 ++++++++++++++++++++++
include/string.h | 3 +++
lib/string.c | 18 ++++++++++++------
7 files changed, 50 insertions(+), 12 deletions(-)
create mode 100644 arch/arm/lib64/string.c
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index bd736284f..c330a5a18 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -353,6 +353,13 @@ menu "ARM specific settings"
config ARM_OPTIMZED_STRING_FUNCTIONS
bool "use assembler optimized string functions"
+ #
+ # memset() and memcpy() in arm/lib64/mem[set|cpy].S are
+ # written with assumption of enabled MMU and cache. Depending
+ # on the inputs in may fail with Alignement exception if used
+ # without MMU
+ #
+ depends on !CPU_V8 || MMU
help
Say yes here to use assembler optimized memcpy / memset functions.
These functions work much faster than the normal versions but
diff --git a/arch/arm/lib64/Makefile b/arch/arm/lib64/Makefile
index 77647128a..4c0019fab 100644
--- a/arch/arm/lib64/Makefile
+++ b/arch/arm/lib64/Makefile
@@ -2,7 +2,7 @@ obj-y += stacktrace.o
obj-$(CONFIG_ARM_LINUX) += armlinux.o
obj-y += div0.o
obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memcpy.o
-obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memset.o
+obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memset.o string.o
extra-y += barebox.lds
obj-pbl-y += runtime-offset.o
diff --git a/arch/arm/lib64/memcpy.S b/arch/arm/lib64/memcpy.S
index cfed3191c..a70e96ca2 100644
--- a/arch/arm/lib64/memcpy.S
+++ b/arch/arm/lib64/memcpy.S
@@ -67,8 +67,8 @@
stp \ptr, \regB, [\regC], \val
.endm
- .weak memcpy
-ENTRY(memcpy)
+ .weak __arch_memcpy
+ENTRY(__arch_memcpy)
#include "copy_template.S"
ret
-ENDPROC(memcpy)
+ENDPROC(__arch_memcpy)
diff --git a/arch/arm/lib64/memset.S b/arch/arm/lib64/memset.S
index 380a54097..d17bcc612 100644
--- a/arch/arm/lib64/memset.S
+++ b/arch/arm/lib64/memset.S
@@ -54,7 +54,7 @@ tmp3w .req w9
tmp3 .req x9
.weak memset
-ENTRY(memset)
+ENTRY(__arch_memset)
mov dst, dstin /* Preserve return value. */
and A_lw, val, #255
orr A_lw, A_lw, A_lw, lsl #8
@@ -212,4 +212,4 @@ ENTRY(memset)
ands count, count, zva_bits_x
b.ne .Ltail_maybe_long
ret
-ENDPROC(memset)
+ENDPROC(__arch_memset)
diff --git a/arch/arm/lib64/string.c b/arch/arm/lib64/string.c
new file mode 100644
index 000000000..cb2633152
--- /dev/null
+++ b/arch/arm/lib64/string.c
@@ -0,0 +1,22 @@
+#include <common.h>
+#include <asm/system.h>
+#include <string.h>
+
+void *__arch_memset(void *dst, int c, __kernel_size_t size);
+void *__arch_memcpy(void * dest, const void *src, size_t count);
+
+void *memset(void *dst, int c, __kernel_size_t size)
+{
+ if (likely(get_cr() & CR_M))
+ return __arch_memset(dst, c, size);
+
+ return __default_memset(dst, c, size);
+}
+
+void *memcpy(void * dest, const void *src, size_t count)
+{
+ if (likely(get_cr() & CR_M))
+ return __arch_memcpy(dest, src, count);
+
+ return __default_memcpy(dest, src, count);
+}
\ No newline at end of file
diff --git a/include/string.h b/include/string.h
index 0c557d6f1..6ceb33224 100644
--- a/include/string.h
+++ b/include/string.h
@@ -6,4 +6,7 @@
void *memdup(const void *, size_t);
int strtobool(const char *str, int *val);
+void *__default_memset(void *, int, __kernel_size_t);
+void *__default_memcpy(void * dest,const void *src,size_t count);
+
#endif /* __STRING_H */
diff --git a/lib/string.c b/lib/string.c
index f588933e8..717b59aa5 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -479,7 +479,6 @@ char *strswab(const char *s)
}
#endif
-#ifndef __HAVE_ARCH_MEMSET
/**
* memset - Fill a region of memory with the given value
* @s: Pointer to the start of the area.
@@ -488,7 +487,7 @@ char *strswab(const char *s)
*
* Do not use memset() to access IO space, use memset_io() instead.
*/
-void * memset(void * s,int c,size_t count)
+void *__default_memset(void * s,int c,size_t count)
{
char *xs = (char *) s;
@@ -497,10 +496,12 @@ void * memset(void * s,int c,size_t count)
return s;
}
+EXPORT_SYMBOL(__default_memset);
+
+#ifndef __HAVE_ARCH_MEMSET
+void *memset(void *s, int c, size_t count) __alias(__default_memset);
#endif
-EXPORT_SYMBOL(memset);
-#ifndef __HAVE_ARCH_MEMCPY
/**
* memcpy - Copy one area of memory to another
* @dest: Where to copy to
@@ -510,7 +511,7 @@ EXPORT_SYMBOL(memset);
* You should not use this function to access IO space, use memcpy_toio()
* or memcpy_fromio() instead.
*/
-void * memcpy(void * dest,const void *src,size_t count)
+void *__default_memcpy(void * dest,const void *src,size_t count)
{
char *tmp = (char *) dest, *s = (char *) src;
@@ -519,9 +520,14 @@ void * memcpy(void * dest,const void *src,size_t count)
return dest;
}
-#endif
EXPORT_SYMBOL(memcpy);
+#ifndef __HAVE_ARCH_MEMCPY
+void *memcpy(void * dest, const void *src, size_t count)
+ __alias(__default_memcpy);
+#endif
+
+
#ifndef __HAVE_ARCH_MEMMOVE
/**
* memmove - Copy one area of memory to another
--
2.17.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2018-06-07 13:03 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 13:00 [RESEND v3 00/52] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 01/52] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 02/52] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 03/52] ARM: Add i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 04/52] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 05/52] Include our own include/dt-bindings Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 06/52] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 07/52] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 08/52] net: fec_imx: Use dma mapping functions Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 09/52] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 10/52] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 11/52] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 12/52] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 13/52] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 14/52] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 15/52] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 16/52] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 17/52] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 18/52] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 19/52] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 20/52] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 21/52] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 22/52] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 23/52] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 24/52] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 25/52] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 26/52] pinctrl: i.MX: " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 27/52] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 28/52] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 29/52] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 30/52] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 31/52] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 32/52] common/clock: Move delay and timeout functions to clock.h Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 33/52] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 34/52] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 35/52] Kbuild: Add $(quote) Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 36/52] Add builtin firmware support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 37/52] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 38/52] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-07 13:00 ` Andrey Smirnov [this message]
2018-06-07 13:00 ` [RESEND v3 40/52] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 41/52] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 42/52] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 43/52] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 44/52] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 45/52] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 46/52] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 47/52] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 48/52] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 49/52] scripts: imx-image: Limit v2 header size to HEADER_LEN Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 51/52] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 52/52] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-08 6:46 ` [RESEND v3 00/52] ARM: i.MX8MQ and " Sascha Hauer
2018-06-11 17:56 ` Andrey Smirnov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180607130108.5339-40-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox