platforms: Use astbmc_exit

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>
Signed-off-by: Reza Arbab <arbab@linux.ibm.com>

12 files changed, 14 insertions, 12 deletions

diff --git a/platforms/astbmc/barreleye.c b/platforms/astbmc/barreleye.c
index f7542d6..ad51bd6 100644
--- a/platforms/astbmc/barreleye.c
+++ b/platforms/astbmc/barreleye.c
@@ -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,
 };
diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c
index 83ef70a..9ce22b3 100644
--- a/platforms/astbmc/common.c
+++ b/platforms/astbmc/common.c
@@ -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 = {
diff --git a/platforms/astbmc/firestone.c b/platforms/astbmc/firestone.c
index ae5603e..c29dee0 100644
--- a/platforms/astbmc/firestone.c
+++ b/platforms/astbmc/firestone.c
@@ -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,
 };
diff --git a/platforms/astbmc/garrison.c b/platforms/astbmc/garrison.c
index e698e2f..ddf1d74 100644
--- a/platforms/astbmc/garrison.c
+++ b/platforms/astbmc/garrison.c
@@ -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,
diff --git a/platforms/astbmc/habanero.c b/platforms/astbmc/habanero.c
index b98ff89..92788a6 100644
--- a/platforms/astbmc/habanero.c
+++ b/platforms/astbmc/habanero.c
@@ -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,
diff --git a/platforms/astbmc/mihawk.c b/platforms/astbmc/mihawk.c
index 54c2884..e12b21b 100644
--- a/platforms/astbmc/mihawk.c
+++ b/platforms/astbmc/mihawk.c
@@ -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,
diff --git a/platforms/astbmc/p8dnu.c b/platforms/astbmc/p8dnu.c
index e223d15..9d4a130 100644
--- a/platforms/astbmc/p8dnu.c
+++ b/platforms/astbmc/p8dnu.c
@@ -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,
diff --git a/platforms/astbmc/p8dtu.c b/platforms/astbmc/p8dtu.c
index a9d8dc0..e5703e3 100644
--- a/platforms/astbmc/p8dtu.c
+++ b/platforms/astbmc/p8dtu.c
@@ -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,
diff --git a/platforms/astbmc/p9dsu.c b/platforms/astbmc/p9dsu.c
index 5c9756e..554b940 100644
--- a/platforms/astbmc/p9dsu.c
+++ b/platforms/astbmc/p9dsu.c
@@ -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,
 };
diff --git a/platforms/astbmc/palmetto.c b/platforms/astbmc/palmetto.c
index 546d511..b0d4da2 100644
--- a/platforms/astbmc/palmetto.c
+++ b/platforms/astbmc/palmetto.c
@@ -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,
 };
diff --git a/platforms/astbmc/vesnin.c b/platforms/astbmc/vesnin.c
index f7e1844..9ad5dcc 100644
--- a/platforms/astbmc/vesnin.c
+++ b/platforms/astbmc/vesnin.c
@@ -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,
 };
diff --git a/platforms/astbmc/zaius.c b/platforms/astbmc/zaius.c
index f3807a0..a122c2d 100644
--- a/platforms/astbmc/zaius.c
+++ b/platforms/astbmc/zaius.c
@@ -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,