Commit c24def73 authored by Alexander Egorenkov's avatar Alexander Egorenkov Committed by Heiko Carstens

watchdog: diag288_wdt: get rid of register asm

Using register asm statements has been proven to be very error prone,
especially when using code instrumentation where gcc may add function
calls, which clobbers register contents in an unexpected way.

Therefore, get rid of register asm statements in watchdog code, and make
sure this bug class cannot happen.

Moreover, remove the register r1 from the clobber list because this
register is not changed by DIAG 288.
Reviewed-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Signed-off-by: default avatarAlexander Egorenkov <egorenar@linux.ibm.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20230203073958.1585738-2-egorenar@linux.ibm.comSigned-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 83089c8f
...@@ -73,20 +73,19 @@ MODULE_ALIAS("vmwatchdog"); ...@@ -73,20 +73,19 @@ MODULE_ALIAS("vmwatchdog");
static int __diag288(unsigned int func, unsigned int timeout, static int __diag288(unsigned int func, unsigned int timeout,
unsigned long action, unsigned int len) unsigned long action, unsigned int len)
{ {
register unsigned long __func asm("2") = func; union register_pair r1 = { .even = func, .odd = timeout, };
register unsigned long __timeout asm("3") = timeout; union register_pair r3 = { .even = action, .odd = len, };
register unsigned long __action asm("4") = action;
register unsigned long __len asm("5") = len;
int err; int err;
err = -EINVAL; err = -EINVAL;
asm volatile( asm volatile(
" diag %1, %3, 0x288\n" " diag %[r1],%[r3],0x288\n"
"0: la %0, 0\n" "0: la %[err],0\n"
"1:\n" "1:\n"
EX_TABLE(0b, 1b) EX_TABLE(0b, 1b)
: "+d" (err) : "d"(__func), "d"(__timeout), : [err] "+d" (err)
"d"(__action), "d"(__len) : "1", "cc", "memory"); : [r1] "d" (r1.pair), [r3] "d" (r3.pair)
: "cc", "memory");
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment