summaryrefslogtreecommitdiffstats
path: root/arch/mips/lib
diff options
context:
space:
mode:
authorMarkos Chandras <markos.chandras@imgtec.com>2014-01-02 16:04:38 +0000
committerRalf Baechle <ralf@linux-mips.org>2014-03-26 23:09:13 +0100
commit053970542f049d3e30dc4be6eb19e92ff1f70f00 (patch)
tree63fcc75f9ae253079349d640b0fd7a9caf1c9060 /arch/mips/lib
parent5cc494972adbaeff08a1b7544acaa608c68cd527 (diff)
downloadop-kernel-dev-053970542f049d3e30dc4be6eb19e92ff1f70f00.zip
op-kernel-dev-053970542f049d3e30dc4be6eb19e92ff1f70f00.tar.gz
MIPS: lib: strlen_user: Add EVA support
In non-EVA mode, strlen_user* aliases are used for the strlen_kernel* symbols since the code is identical. In EVA mode, new strlen_user* symbols are used which use the EVA specific instructions to load values from userspace. Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/lib')
-rw-r--r--arch/mips/lib/strlen_user.S20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S
index 6e8bdb3..bef65c9 100644
--- a/arch/mips/lib/strlen_user.S
+++ b/arch/mips/lib/strlen_user.S
@@ -30,7 +30,11 @@ LEAF(__strlen_\func\()_asm)
FEXPORT(__strlen_\func\()_nocheck_asm)
move v0, a0
+.ifeqs "\func", "kernel"
1: EX(lbu, v1, (v0), .Lfault\@)
+.else
+1: EX(lbue, v1, (v0), .Lfault\@)
+.endif
PTR_ADDIU v0, 1
bnez v1, 1b
PTR_SUBU v0, a0
@@ -41,4 +45,20 @@ FEXPORT(__strlen_\func\()_nocheck_asm)
jr ra
.endm
+#ifndef CONFIG_EVA
+ /* Set aliases */
+ .global __strlen_user_asm
+ .global __strlen_user_nocheck_asm
+ .set __strlen_user_asm, __strlen_kernel_asm
+ .set __strlen_user_nocheck_asm, __strlen_kernel_nocheck_asm
+#endif
+
+__BUILD_STRLEN_ASM kernel
+
+#ifdef CONFIG_EVA
+
+ .set push
+ .set eva
__BUILD_STRLEN_ASM user
+ .set pop
+#endif
OpenPOWER on IntegriCloud