diff options
author | Markos Chandras <markos.chandras@imgtec.com> | 2013-12-09 10:28:10 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-03-26 18:09:13 -0400 |
commit | 4968db4b9c4528b097ab4e549c4e0d0420dd1efc (patch) | |
tree | eb6e7f405bb9abab9e1c75ca2cfd0b8648ad5fb9 /arch/mips/lib/strnlen_user.S | |
parent | c48be43eb5248ff96dacda58f9e51ee8bfd058ac (diff) |
MIPS: lib: strnlen_user: Add EVA support
In non-EVA mode, a strlen_user* alias is used for the
strlen_kernel* symbols since the code is identical. In EVA
mode, a new strlen_user* symbol is used which uses the EVA
specific instructions to load values from userspace.
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Diffstat (limited to 'arch/mips/lib/strnlen_user.S')
-rw-r--r-- | arch/mips/lib/strnlen_user.S | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S index 44221602ce1c..f3af6995e2a6 100644 --- a/arch/mips/lib/strnlen_user.S +++ b/arch/mips/lib/strnlen_user.S | |||
@@ -35,7 +35,11 @@ FEXPORT(__strnlen_\func\()_nocheck_asm) | |||
35 | move v0, a0 | 35 | move v0, a0 |
36 | PTR_ADDU a1, a0 # stop pointer | 36 | PTR_ADDU a1, a0 # stop pointer |
37 | 1: beq v0, a1, 1f # limit reached? | 37 | 1: beq v0, a1, 1f # limit reached? |
38 | .ifeqs "\func", "kernel" | ||
38 | EX(lb, t0, (v0), .Lfault\@) | 39 | EX(lb, t0, (v0), .Lfault\@) |
40 | .else | ||
41 | EX(lbe, t0, (v0), .Lfault\@) | ||
42 | .endif | ||
39 | PTR_ADDIU v0, 1 | 43 | PTR_ADDIU v0, 1 |
40 | bnez t0, 1b | 44 | bnez t0, 1b |
41 | 1: PTR_SUBU v0, a0 | 45 | 1: PTR_SUBU v0, a0 |
@@ -47,4 +51,20 @@ FEXPORT(__strnlen_\func\()_nocheck_asm) | |||
47 | jr ra | 51 | jr ra |
48 | .endm | 52 | .endm |
49 | 53 | ||
54 | #ifndef CONFIG_EVA | ||
55 | /* Set aliases */ | ||
56 | .global __strnlen_user_asm | ||
57 | .global __strnlen_user_nocheck_asm | ||
58 | .set __strnlen_user_asm, __strnlen_kernel_asm | ||
59 | .set __strnlen_user_nocheck_asm, __strnlen_kernel_nocheck_asm | ||
60 | #endif | ||
61 | |||
62 | __BUILD_STRNLEN_ASM kernel | ||
63 | |||
64 | #ifdef CONFIG_EVA | ||
65 | |||
66 | .set push | ||
67 | .set eva | ||
50 | __BUILD_STRNLEN_ASM user | 68 | __BUILD_STRNLEN_ASM user |
69 | .set pop | ||
70 | #endif | ||