UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

s390/lib,uaccess: get rid of register asm 

Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
This commit is contained in:
Heiko Carstens 2021-06-21 13:38:45 +02:00 committed by Vasily Gorbik
parent 8f45db5555
commit d1e18efa8f
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/s390/lib/uaccess.c
View File

@ -61,11 +61,11 @@ static inline int copy_with_mvcos(void)
static inline unsigned long copy_from_user_mvcos(void *x, const void __user *ptr, static inline unsigned long copy_from_user_mvcos(void *x, const void __user *ptr,
unsigned long size) unsigned long size)
{ {
register unsigned long reg0 asm("0") = 0x81UL;
unsigned long tmp1, tmp2; unsigned long tmp1, tmp2;
tmp1 = -4096UL; tmp1 = -4096UL;
asm volatile( asm volatile(
" lghi 0,%[spec]\n"
"0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n" "0: .insn ss,0xc80000000000,0(%0,%2),0(%1),0\n"
"6: jz 4f\n" "6: jz 4f\n"
"1: algr %0,%3\n" "1: algr %0,%3\n"
@ -84,7 +84,8 @@ static inline unsigned long copy_from_user_mvcos(void *x, const void __user *ptr
"5:\n" "5:\n"
EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b) EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b)
: "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
: "d" (reg0) : "cc", "memory"); : [spec] "K" (0x81UL)
: "cc", "memory", "0");
return size; return size;
} }
@ -133,11 +134,11 @@ EXPORT_SYMBOL(raw_copy_from_user);
static inline unsigned long copy_to_user_mvcos(void __user *ptr, const void *x, static inline unsigned long copy_to_user_mvcos(void __user *ptr, const void *x,
unsigned long size) unsigned long size)
{ {
register unsigned long reg0 asm("0") = 0x810000UL;
unsigned long tmp1, tmp2; unsigned long tmp1, tmp2;
tmp1 = -4096UL; tmp1 = -4096UL;
asm volatile( asm volatile(
" llilh 0,%[spec]\n"
"0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n" "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n"
"6: jz 4f\n" "6: jz 4f\n"
"1: algr %0,%3\n" "1: algr %0,%3\n"
@ -156,7 +157,8 @@ static inline unsigned long copy_to_user_mvcos(void __user *ptr, const void *x,
"5:\n" "5:\n"
EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b) EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(6b,2b) EX_TABLE(7b,5b)
: "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2) : "+a" (size), "+a" (ptr), "+a" (x), "+a" (tmp1), "=a" (tmp2)
: "d" (reg0) : "cc", "memory"); : [spec] "K" (0x81UL)
: "cc", "memory", "0");
return size; return size;
} }
@ -205,12 +207,12 @@ EXPORT_SYMBOL(raw_copy_to_user);
static inline unsigned long copy_in_user_mvcos(void __user *to, const void __user *from, static inline unsigned long copy_in_user_mvcos(void __user *to, const void __user *from,
unsigned long size) unsigned long size)
{ {
register unsigned long reg0 asm("0") = 0x810081UL;
unsigned long tmp1, tmp2; unsigned long tmp1, tmp2;
tmp1 = -4096UL; tmp1 = -4096UL;
/* FIXME: copy with reduced length. */ /* FIXME: copy with reduced length. */
asm volatile( asm volatile(
" lgr 0,%[spec]\n"
"0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n" "0: .insn ss,0xc80000000000,0(%0,%1),0(%2),0\n"
" jz 2f\n" " jz 2f\n"
"1: algr %0,%3\n" "1: algr %0,%3\n"
@ -221,7 +223,8 @@ static inline unsigned long copy_in_user_mvcos(void __user *to, const void __use
"3: \n" "3: \n"
EX_TABLE(0b,3b) EX_TABLE(0b,3b)
: "+a" (size), "+a" (to), "+a" (from), "+a" (tmp1), "=a" (tmp2) : "+a" (size), "+a" (to), "+a" (from), "+a" (tmp1), "=a" (tmp2)
: "d" (reg0) : "cc", "memory"); : [spec] "d" (0x810081UL)
: "cc", "memory");
return size; return size;
} }
@ -266,11 +269,11 @@ EXPORT_SYMBOL(raw_copy_in_user);
static inline unsigned long clear_user_mvcos(void __user *to, unsigned long size) static inline unsigned long clear_user_mvcos(void __user *to, unsigned long size)
{ {
register unsigned long reg0 asm("0") = 0x810000UL;
unsigned long tmp1, tmp2; unsigned long tmp1, tmp2;
tmp1 = -4096UL; tmp1 = -4096UL;
asm volatile( asm volatile(
" llilh 0,%[spec]\n"
"0: .insn ss,0xc80000000000,0(%0,%1),0(%4),0\n" "0: .insn ss,0xc80000000000,0(%0,%1),0(%4),0\n"
" jz 4f\n" " jz 4f\n"
"1: algr %0,%2\n" "1: algr %0,%2\n"
@ -288,7 +291,8 @@ static inline unsigned long clear_user_mvcos(void __user *to, unsigned long size
"5:\n" "5:\n"
EX_TABLE(0b,2b) EX_TABLE(3b,5b) EX_TABLE(0b,2b) EX_TABLE(3b,5b)
: "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2) : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2)
: "a" (empty_zero_page), "d" (reg0) : "cc", "memory"); : "a" (empty_zero_page), [spec] "K" (0x81UL)
: "cc", "memory", "0");
return size; return size;
} }
@ -338,10 +342,10 @@ EXPORT_SYMBOL(__clear_user);
static inline unsigned long strnlen_user_srst(const char __user *src, static inline unsigned long strnlen_user_srst(const char __user *src,
unsigned long size) unsigned long size)
{ {
register unsigned long reg0 asm("0") = 0;
unsigned long tmp1, tmp2; unsigned long tmp1, tmp2;
asm volatile( asm volatile(
" lghi 0,0\n"
" la %2,0(%1)\n" " la %2,0(%1)\n"
" la %3,0(%0,%1)\n" " la %3,0(%0,%1)\n"
" slgr %0,%0\n" " slgr %0,%0\n"
@ -353,7 +357,8 @@ static inline unsigned long strnlen_user_srst(const char __user *src,
"1: sacf 768\n" "1: sacf 768\n"
EX_TABLE(0b,1b) EX_TABLE(0b,1b)
: "+a" (size), "+a" (src), "=a" (tmp1), "=a" (tmp2) : "+a" (size), "+a" (src), "=a" (tmp1), "=a" (tmp2)
: "d" (reg0) : "cc", "memory"); :
: "cc", "memory", "0");
return size; return size;
} }