diff options
| author | wim.coekaerts@oracle.com <wim.coekaerts@oracle.com> | 2016-01-29 09:39:38 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-31 11:06:24 -0800 |
| commit | ca0bb0798022732773752fee97bb633c6f3623d2 (patch) | |
| tree | 7907fe04c0285a41145b76fbd5669ec18e627857 /arch/sparc/kernel | |
| parent | 1a40b95374f680625318ab61d81958e949e0afe3 (diff) | |
| download | op-kernel-dev-ca0bb0798022732773752fee97bb633c6f3623d2.zip op-kernel-dev-ca0bb0798022732773752fee97bb633c6f3623d2.tar.gz | |
Add sun4v_wdt watchdog driver
This driver adds sparc hypervisor watchdog support. The default
timeout is 60 seconds and the range is between 1 and
31536000 seconds. Both watchdog-resolution and
watchdog-max-timeout MD properties settings are supported.
Signed-off-by: Wim Coekaerts <wim.coekaerts@oracle.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/hvcalls.S | 3 | ||||
| -rw-r--r-- | arch/sparc/kernel/sparc_ksyms_64.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/hvcalls.S b/arch/sparc/kernel/hvcalls.S index afbaba5..d127130 100644 --- a/arch/sparc/kernel/hvcalls.S +++ b/arch/sparc/kernel/hvcalls.S @@ -338,8 +338,9 @@ ENTRY(sun4v_mach_set_watchdog) mov %o1, %o4 mov HV_FAST_MACH_SET_WATCHDOG, %o5 ta HV_FAST_TRAP + brnz,a,pn %o4, 0f stx %o1, [%o4] - retl +0: retl nop ENDPROC(sun4v_mach_set_watchdog) diff --git a/arch/sparc/kernel/sparc_ksyms_64.c b/arch/sparc/kernel/sparc_ksyms_64.c index a92d5d2..9e034f2 100644 --- a/arch/sparc/kernel/sparc_ksyms_64.c +++ b/arch/sparc/kernel/sparc_ksyms_64.c @@ -37,6 +37,7 @@ EXPORT_SYMBOL(sun4v_niagara_getperf); EXPORT_SYMBOL(sun4v_niagara_setperf); EXPORT_SYMBOL(sun4v_niagara2_getperf); EXPORT_SYMBOL(sun4v_niagara2_setperf); +EXPORT_SYMBOL(sun4v_mach_set_watchdog); /* from hweight.S */ EXPORT_SYMBOL(__arch_hweight8); |
