summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--hw/xscom.c26
1 files changed, 2 insertions, 24 deletions
diff --git a/hw/xscom.c b/hw/xscom.c
index 37f0705d..bf634d91 100644
--- a/hw/xscom.c
+++ b/hw/xscom.c
@@ -833,30 +833,8 @@ int64_t xscom_trigger_xstop(void)
int rc = OPAL_UNSUPPORTED;
bool xstop_disabled = false;
- /*
- * Workaround until we iron out all checkstop issues at present.
- *
- * For p9:
- * By default do not trigger sw checkstop unless explicitly enabled
- * through nvram option 'opal-sw-xstop=enable'.
- *
- * For p8:
- * Keep it enabled by default unless explicitly disabled.
- *
- * NOTE: Once all checkstop issues are resolved/stabilized reverse
- * the logic to enable sw checkstop by default on p9.
- */
- switch (proc_gen) {
- case proc_gen_p8:
- if (nvram_query_eq("opal-sw-xstop", "disable"))
- xstop_disabled = true;
- break;
- case proc_gen_p9:
- default:
- if (!nvram_query_eq("opal-sw-xstop", "enable"))
- xstop_disabled = true;
- break;
- }
+ if (nvram_query_eq("opal-sw-xstop", "disable"))
+ xstop_disabled = true;
if (xstop_disabled) {
prlog(PR_NOTICE, "Software initiated checkstop disabled.\n");
OpenPOWER on IntegriCloud