]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
s390/boot: Convert tprot() to extable
authorHeiko Carstens <hca@linux.ibm.com>
Mon, 24 Feb 2025 14:59:08 +0000 (15:59 +0100)
committerVasily Gorbik <gor@linux.ibm.com>
Tue, 4 Mar 2025 16:34:02 +0000 (17:34 +0100)
Shorten tprot() and use regular EX_TABLE program check handling.

Acked-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
arch/s390/boot/physmem_info.c

index 72be6453d08c21cc3664df8d25547351f8bea63f..99f17efbf7d3e2f665a1e8288d30646dccdee0ed 100644 (file)
@@ -137,31 +137,17 @@ static int diag500_storage_limit(unsigned long *max_physmem_end)
 
 static int tprot(unsigned long addr)
 {
-       unsigned long reg1, reg2;
        int cc, exception;
-       psw_t old;
 
        exception = 1;
        asm volatile(
-               "       mvc     0(16,%[psw_old]),0(%[psw_pgm])\n"
-               "       epsw    %[reg1],%[reg2]\n"
-               "       st      %[reg1],0(%[psw_pgm])\n"
-               "       st      %[reg2],4(%[psw_pgm])\n"
-               "       larl    %[reg1],1f\n"
-               "       stg     %[reg1],8(%[psw_pgm])\n"
                "       tprot   0(%[addr]),0\n"
-               "       lhi     %[exc],0\n"
-               "1:     mvc     0(16,%[psw_pgm]),0(%[psw_old])\n"
+               "0:     lhi     %[exc],0\n"
+               "1:\n"
                CC_IPM(cc)
-               : CC_OUT(cc, cc),
-                 [exc] "+d" (exception),
-                 [reg1] "=&d" (reg1),
-                 [reg2] "=&a" (reg2),
-                 "=Q" (get_lowcore()->program_new_psw.addr),
-                 "=Q" (old)
-               : [psw_old] "a" (&old),
-                 [psw_pgm] "a" (&get_lowcore()->program_new_psw),
-                 [addr] "a" (addr)
+               EX_TABLE(0b, 1b)
+               : CC_OUT(cc, cc), [exc] "+d" (exception)
+               : [addr] "a" (addr)
                : CC_CLOBBER_LIST("memory"));
        cc = exception ? -EFAULT : CC_TRANSFORM(cc);
        return cc;