aboutsummaryrefslogtreecommitdiff
path: root/platforms
diff options
context:
space:
mode:
authorAndrew Jeffery <andrew@aj.id.au>2018-10-09 00:32:33 -0700
committerStewart Smith <stewart@linux.ibm.com>2018-10-11 01:26:19 -0500
commit1a1ff0ab2c78f9257bb77301191df38242d11f0d (patch)
treec5265fc8ecee7fe1b7f7689e3563e59ff0d80657 /platforms
parentb5edb1692b7f6af1a60758f4f63f52f795b5dba0 (diff)
downloadskiboot-1a1ff0ab2c78f9257bb77301191df38242d11f0d.zip
skiboot-1a1ff0ab2c78f9257bb77301191df38242d11f0d.tar.gz
skiboot-1a1ff0ab2c78f9257bb77301191df38242d11f0d.tar.bz2
astbmc: Remove coordinated isolation support
Signed-off-by: Andrew Jeffery <andrew@aj.id.au> Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'platforms')
-rw-r--r--platforms/astbmc/common.c47
1 files changed, 6 insertions, 41 deletions
diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c
index f3b7e74..0cf70e2 100644
--- a/platforms/astbmc/common.c
+++ b/platforms/astbmc/common.c
@@ -406,23 +406,15 @@ void astbmc_early_init(void)
psi_set_external_irq_policy(EXTERNAL_IRQ_POLICY_SKIBOOT);
if (ast_sio_init()) {
- if (!ast_can_isolate_sp()) {
- /*
- * BMCs claiming support for isolation must have
- * correctly configured the UART and BT for host
- * firmware. If not, let's apply some fixups for broken
- * BMC firmwares.
- */
- if (ast_io_init()) {
- astbmc_fixup_uart();
- ast_setup_ibt(BT_IO_BASE, BT_LPC_IRQ);
- } else
- prerror("PLAT: AST IO initialisation failed!\n");
- }
+ if (ast_io_init()) {
+ astbmc_fixup_uart();
+ ast_setup_ibt(BT_IO_BASE, BT_LPC_IRQ);
+ } else
+ prerror("PLAT: AST IO initialisation failed!\n");
ast_setup_sio_mbox(MBOX_IO_BASE, MBOX_LPC_IRQ);
} else
- prerror("PLAT: AST SIO initialisation failed!\n");
+ prlog(PR_WARNING, "PLAT: AST SIO unavailable!\n");
/* Setup UART and use it as console */
uart_init();
@@ -430,35 +422,8 @@ void astbmc_early_init(void)
prd_init();
}
-static bool astbmc_isolate_via_io(void)
-{
- return ast_sio_disable();
-}
-
-static bool astbmc_isolate_via_ipmi(void)
-{
- return false;
-}
-
-static void astbmc_isolate(void)
-{
- bool isolated;
-
- isolated = ast_io_is_rw() ? astbmc_isolate_via_io()
- : astbmc_isolate_via_ipmi();
-
- if (!isolated) {
- prlog(PR_EMERG, "PLAT: BMC isolation failed\n");
- abort();
- }
-
- prlog(PR_INFO, "PLAT: Isolated BMC\n");
-}
-
void astbmc_exit(void)
{
- if (ast_can_isolate_sp())
- astbmc_isolate();
ipmi_wdt_final_reset();
}