summaryrefslogtreecommitdiffstats
path: root/src/include/usr/isteps
diff options
context:
space:
mode:
authorTsung Yeung <tyeung@us.ibm.com>2019-02-12 16:37:15 -0600
committerDaniel M. Crowell <dcrowell@us.ibm.com>2019-02-19 12:30:35 -0600
commit85e03b6c3d2e06f7e5c83daa989facf8704c8c4b (patch)
treec704b47e2c69127acc580cc614efbf040c57405b /src/include/usr/isteps
parentcbc7571007852b87d2d3144d2aa58406f4167fcb (diff)
downloadtalos-hostboot-85e03b6c3d2e06f7e5c83daa989facf8704c8c4b.tar.gz
talos-hostboot-85e03b6c3d2e06f7e5c83daa989facf8704c8c4b.zip
Enable mss_scrub on MPIPL if NVDIMM is configured
NVDIMM restore blows away the scrub settings so it needs to be reinitialized during MPIPL Change-Id: I67f74c71e98b8907351eb7477bf197a941aefb8d Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71786 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: TSUNG K. YEUNG <tyeung@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/usr/isteps')
-rw-r--r--src/include/usr/isteps/istep16list.H6
-rw-r--r--src/include/usr/isteps/istep_reasoncodes.H1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index a6a5f7df7..37cc26ed4 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2018 */
+/* Contributors Listed Below - COPYRIGHT 2012,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -141,7 +141,11 @@ namespace INITSERVICE
// Hostboot PRD should no longer be called after this step.
ISTEPNAME(16,04,"mss_scrub"),
ISTEP_16::call_mss_scrub,
+#ifdef CONFIG_NVDIMM
+ { START_FN, EXT_IMAGE, NORMAL_IPL_OP | MPIPL_OP, false }
+#else
{ START_FN, EXT_IMAGE, NORMAL_IPL_OP, false }
+#endif
},
{
ISTEPNAME(16,05,"host_load_io_ppe"),
diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H
index 4aa6a78a0..09b12abdc 100644
--- a/src/include/usr/isteps/istep_reasoncodes.H
+++ b/src/include/usr/isteps/istep_reasoncodes.H
@@ -65,6 +65,7 @@ namespace ISTEP
MOD_SMP_WRAP_PROC_IOVALID = 0x22,
MOD_APPLY_HCODE_GEN_CPU_REGS = 0x23,
MOD_GET_LANEMASK_FROM_HX_KEYWORD = 0x24,
+ MOD_MSS_SCRUB = 0x25,
};
/**
OpenPOWER on IntegriCloud