Skip to content

Commit

Permalink
ipmi-watchdog: don't run by default yet
Browse files Browse the repository at this point in the history
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
  • Loading branch information
stewartsmith committed Jun 4, 2018
1 parent c9f3632 commit 5b70462
Showing 1 changed file with 11 additions and 3 deletions.
14 changes: 11 additions & 3 deletions hw/ipmi/ipmi-watchdog.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@

/* Copyright 2013-2014 IBM Corp.
/* Copyright 2013-2018 IBM Corp.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -128,11 +127,20 @@ void ipmi_wdt_final_reset(void)
wdt_ticking = false;
cancel_timer(&wdt_timer);

/*
* We're going to wait a little while before requiring
* BOOTKERNEL to have IPMI watchdog support so that people
* can catch up in their development environments.
* If you still read this after 2018, send a patch!
*/
#if 0
/* Configure the watchdog and make sure it is still enabled */
set_wdt(WDT_RESET_ACTION | WDT_PRETIMEOUT_SMI, WDT_TIMEOUT,
WDT_MARGIN/10, true);
sync_reset_wdt();

#else
set_wdt(WDT_NO_ACTION, 100, 0, false);
#endif
ipmi_set_boot_count();
}

Expand Down

0 comments on commit 5b70462

Please sign in to comment.