@@ -200,7 +200,6 @@ void ipmi_wdt_final_reset(void)
#else
set_wdt(WDT_NO_ACTION, 100, 0, false, false);
#endif
- ipmi_set_boot_count();
}
void ipmi_wdt_init(void)
@@ -159,7 +159,7 @@ DECLARE_PLATFORM(barreleye) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.op_display = op_display_lpc,
};
@@ -502,6 +502,8 @@ void astbmc_early_init(void)
void astbmc_exit(void)
{
ipmi_wdt_final_reset();
+
+ ipmi_set_boot_count();
}
static const struct bmc_sw_config bmc_sw_ami = {
@@ -143,7 +143,7 @@ DECLARE_PLATFORM(firestone) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.op_display = op_display_lpc,
};
@@ -278,7 +278,7 @@ DECLARE_PLATFORM(garrison) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.seeprom_update = astbmc_seeprom_update,
.op_display = op_display_lpc,
@@ -133,7 +133,7 @@ DECLARE_PLATFORM(habanero) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.seeprom_update = astbmc_seeprom_update,
.op_display = op_display_lpc,
@@ -560,7 +560,7 @@ DECLARE_PLATFORM(mihawk) = {
.cec_power_down = astbmc_ipmi_power_down,
.cec_reboot = astbmc_ipmi_reboot,
.elog_commit = ipmi_elog_commit,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.ocapi = &mihawk_ocapi,
.npu2_device_detect = npu2_i2c_presence_detect,
@@ -337,7 +337,7 @@ DECLARE_PLATFORM(p8dnu) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.seeprom_update = astbmc_seeprom_update,
.op_display = op_display_lpc,
@@ -249,7 +249,7 @@ DECLARE_PLATFORM(p8dtu1u) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.seeprom_update = astbmc_seeprom_update,
.op_display = op_display_lpc,
@@ -268,7 +268,7 @@ DECLARE_PLATFORM(p8dtu2u) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.seeprom_update = astbmc_seeprom_update,
.op_display = op_display_lpc,
@@ -719,7 +719,7 @@ DECLARE_PLATFORM(p9dsu1u) = {
.cec_power_down = astbmc_ipmi_power_down,
.cec_reboot = astbmc_ipmi_reboot,
.elog_commit = ipmi_elog_commit,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.op_display = op_display_lpc,
};
@@ -117,7 +117,7 @@ DECLARE_PLATFORM(palmetto) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.op_display = op_display_lpc,
};
@@ -340,7 +340,7 @@ DECLARE_PLATFORM(vesnin) = {
.elog_commit = ipmi_elog_commit,
.start_preload_resource = flash_start_preload_resource,
.resource_loaded = flash_resource_loaded,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.op_display = op_display_lpc,
};
@@ -250,7 +250,7 @@ DECLARE_PLATFORM(zaius) = {
.cec_power_down = astbmc_ipmi_power_down,
.cec_reboot = astbmc_ipmi_reboot,
.elog_commit = ipmi_elog_commit,
- .exit = ipmi_wdt_final_reset,
+ .exit = astbmc_exit,
.terminate = ipmi_terminate,
.ocapi = &zaius_ocapi,
.npu2_device_detect = npu2_i2c_presence_detect,
Move all platforms using astbmc_init() to use astbmc_exit(). Move ipmi_set_boot_count() to astbmc_exit from ipmi_wdt_final_reset(). Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- hw/ipmi/ipmi-watchdog.c | 1 - platforms/astbmc/barreleye.c | 2 +- platforms/astbmc/common.c | 2 ++ platforms/astbmc/firestone.c | 2 +- platforms/astbmc/garrison.c | 2 +- platforms/astbmc/habanero.c | 2 +- platforms/astbmc/mihawk.c | 2 +- platforms/astbmc/p8dnu.c | 2 +- platforms/astbmc/p8dtu.c | 4 ++-- platforms/astbmc/p9dsu.c | 2 +- platforms/astbmc/palmetto.c | 2 +- platforms/astbmc/vesnin.c | 2 +- platforms/astbmc/zaius.c | 2 +- 13 files changed, 14 insertions(+), 13 deletions(-)