leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

s390/uaccess: get rid of register asm

Browse Source 
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-14 21:07:37 +02:00
committed by Vasily Gorbik
parent 5fe29839de
commit dbb8864b28
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
arch/s390/include/asm/uaccess.h
View File

@@ -49,52 +49,51 @@ int __get_user_bad(void) __attribute__((noreturn));
#ifdef CONFIG_HAVE_MARCH_Z10_FEATURES #ifdef CONFIG_HAVE_MARCH_Z10_FEATURES
#define __put_get_user_asm(to, from, size, spec) \ #define __put_get_user_asm(to, from, size, insn) \
({ \ ({ \
register unsigned long __reg0 asm("0") = spec; \
int __rc; \ int __rc; \
\ \
asm volatile( \ asm volatile( \
"0: mvcos %1,%3,%2\n" \ insn " 0,%[spec]\n" \
"1: xr %0,%0\n" \ "0: mvcos %[_to],%[_from],%[_size]\n" \
"1: xr %[rc],%[rc]\n" \
"2:\n" \ "2:\n" \
".pushsection .fixup, \"ax\"\n" \ ".pushsection .fixup, \"ax\"\n" \
"3: lhi %0,%5\n" \ "3: lhi %[rc],%[retval]\n" \
" jg 2b\n" \ " jg 2b\n" \
".popsection\n" \ ".popsection\n" \
EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ EX_TABLE(0b,3b) EX_TABLE(1b,3b) \
: "=d" (__rc), "+Q" (*(to)) \ : [rc] "=&d" (__rc), [_to] "+Q" (*(to)) \
: "d" (size), "Q" (*(from)), \ : [_size] "d" (size), [_from] "Q" (*(from)), \
"d" (__reg0), "K" (-EFAULT) \ [retval] "K" (-EFAULT), [spec] "K" (0x81UL) \
: "cc"); \ : "cc", "0"); \
__rc; \ __rc; \
}) })
static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size) static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned long size)
{ {
unsigned long spec = 0x810000UL;
int rc; int rc;
switch (size) { switch (size) {
case 1: case 1:
rc = __put_get_user_asm((unsigned char __user *)ptr, rc = __put_get_user_asm((unsigned char __user *)ptr,
(unsigned char *)x, (unsigned char *)x,
size, spec); size, "llilh");
break; break;
case 2: case 2:
rc = __put_get_user_asm((unsigned short __user *)ptr, rc = __put_get_user_asm((unsigned short __user *)ptr,
(unsigned short *)x, (unsigned short *)x,
size, spec); size, "llilh");
break; break;
case 4: case 4:
rc = __put_get_user_asm((unsigned int __user *)ptr, rc = __put_get_user_asm((unsigned int __user *)ptr,
(unsigned int *)x, (unsigned int *)x,
size, spec); size, "llilh");
break; break;
case 8: case 8:
rc = __put_get_user_asm((unsigned long __user *)ptr, rc = __put_get_user_asm((unsigned long __user *)ptr,
(unsigned long *)x, (unsigned long *)x,
size, spec); size, "llilh");
break; break;
default: default:
__put_user_bad(); __put_user_bad();
@@ -105,29 +104,28 @@ static __always_inline int __put_user_fn(void *x, void __user *ptr, unsigned lon
static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size) static __always_inline int __get_user_fn(void *x, const void __user *ptr, unsigned long size)
{ {
unsigned long spec = 0x81UL;
int rc; int rc;
switch (size) { switch (size) {
case 1: case 1:
rc = __put_get_user_asm((unsigned char *)x, rc = __put_get_user_asm((unsigned char *)x,
(unsigned char __user *)ptr, (unsigned char __user *)ptr,
size, spec); size, "lghi");
break; break;
case 2: case 2:
rc = __put_get_user_asm((unsigned short *)x, rc = __put_get_user_asm((unsigned short *)x,
(unsigned short __user *)ptr, (unsigned short __user *)ptr,
size, spec); size, "lghi");
break; break;
case 4: case 4:
rc = __put_get_user_asm((unsigned int *)x, rc = __put_get_user_asm((unsigned int *)x,
(unsigned int __user *)ptr, (unsigned int __user *)ptr,
size, spec); size, "lghi");
break; break;
case 8: case 8:
rc = __put_get_user_asm((unsigned long *)x, rc = __put_get_user_asm((unsigned long *)x,
(unsigned long __user *)ptr, (unsigned long __user *)ptr,
size, spec); size, "lghi");
break; break;
default: default:
__get_user_bad(); __get_user_bad();