diff options
| author | Chris Smart <chris@distroguy.com> | 2016-07-21 17:09:47 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2016-07-22 17:08:54 +1000 |
| commit | 3f3326d6b3afdba8e0fa10525f7152b75e51b7ac (patch) | |
| tree | 96bd706959a8169473bbf2dd97e56a646bbbd525 /core/timer.c | |
| parent | f60ff06158e0e371d16ee251c46c625314f8be60 (diff) | |
| download | skiboot-3f3326d6b3afdba8e0fa10525f7152b75e51b7ac.zip skiboot-3f3326d6b3afdba8e0fa10525f7152b75e51b7ac.tar.gz skiboot-3f3326d6b3afdba8e0fa10525f7152b75e51b7ac.tar.bz2 | |
core/timer: Actually use default heartbeat value
HEARTBEAT_DEFAULT_MS sets the default heartbeat timeout, however this
was not actually used as the default. The default was ten times quicker
than this (HEARTBEAT_DEFAULT_MS / 10) while HEARTBEAT_DEFAULT_MS was
actually used as a special case for FSP machines or those with SLW
timer facility.
This patch makes the default use HEARTBEAT_DEFAULT_MS and changes FSP
or machines with SLW timer facility run 10 times slower
(HEARTBEAT_DEFAULT_MS * 10). This will also now match the existing
in-line comment.
Signed-off-by: Chris Smart <chris@distroguy.com>
Acked-by: Michael Neuling <mikey@neuling.org>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
Diffstat (limited to 'core/timer.c')
| -rw-r--r-- | core/timer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/timer.c b/core/timer.c index e97dc07..8bfba4a 100644 --- a/core/timer.c +++ b/core/timer.c @@ -13,7 +13,7 @@ #endif /* Heartbeat requested from Linux */ -#define HEARTBEAT_DEFAULT_MS 2000 +#define HEARTBEAT_DEFAULT_MS 200 static struct lock timer_lock = LOCK_UNLOCKED; static LIST_HEAD(timer_list); @@ -257,10 +257,10 @@ void late_init_timers(void) */ if (slw_timer_ok() || fsp_present()) { dt_add_property_cells(opal_node, "ibm,heartbeat-ms", - HEARTBEAT_DEFAULT_MS); + HEARTBEAT_DEFAULT_MS * 10); } else { dt_add_property_cells(opal_node, "ibm,heartbeat-ms", - HEARTBEAT_DEFAULT_MS / 10); + HEARTBEAT_DEFAULT_MS); } } #endif |