summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/usr/hwpf/hwp/occ/occ_common.H2
-rw-r--r--src/include/usr/isteps/istep06list.H2
-rw-r--r--src/include/usr/isteps/istep08list.H2
-rw-r--r--src/include/usr/isteps/istep10list.H2
-rw-r--r--src/include/usr/isteps/istep14list.H2
-rw-r--r--src/include/usr/isteps/istep16list.H2
-rw-r--r--src/usr/diag/HBconfig6
-rw-r--r--src/usr/hwas/hostbootIstep.C4
-rw-r--r--src/usr/hwpf/hwp/core_activate/core_activate.C4
-rw-r--r--src/usr/hwpf/hwp/dram_initialization/dram_initialization.C4
-rw-r--r--src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C4
-rw-r--r--src/usr/hwpf/hwp/occ/occ.C2
-rw-r--r--src/usr/hwpf/hwp/occ/occ_common.C8
13 files changed, 25 insertions, 19 deletions
diff --git a/src/include/usr/hwpf/hwp/occ/occ_common.H b/src/include/usr/hwpf/hwp/occ/occ_common.H
index 4dd83cbec..1c4209a60 100644
--- a/src/include/usr/hwpf/hwp/occ/occ_common.H
+++ b/src/include/usr/hwpf/hwp/occ/occ_common.H
@@ -103,7 +103,7 @@ namespace HBOCC
errlHndl_t loadHostDataToHomer(TARGETING::Target* i_proc,
void* i_occHostDataVirtAddr);
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
/**
* @brief Sets up OCC Host data in SRAM
*
diff --git a/src/include/usr/isteps/istep06list.H b/src/include/usr/isteps/istep06list.H
index 761b1f662..2070a2f56 100644
--- a/src/include/usr/isteps/istep06list.H
+++ b/src/include/usr/isteps/istep06list.H
@@ -162,7 +162,7 @@ const DepModInfo g_istep06Dependancies = {
DEP_LIB(libpstates.so),
DEP_LIB(libcore_activate.so),
DEP_LIB(libsecure_boot.so),
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
DEP_LIB(libocc.so),
#endif
NULL
diff --git a/src/include/usr/isteps/istep08list.H b/src/include/usr/isteps/istep08list.H
index 90f91f8d5..d949ccdb7 100644
--- a/src/include/usr/isteps/istep08list.H
+++ b/src/include/usr/isteps/istep08list.H
@@ -122,7 +122,7 @@ const DepModInfo g_istep08Dependancies = {
DEP_LIB(libslave_sbe.so),
DEP_LIB(libsbe.so),
DEP_LIB(libbuild_winkle_images.so),
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
DEP_LIB(libocc.so),
#endif
NULL
diff --git a/src/include/usr/isteps/istep10list.H b/src/include/usr/isteps/istep10list.H
index 86f12366f..e47139915 100644
--- a/src/include/usr/isteps/istep10list.H
+++ b/src/include/usr/isteps/istep10list.H
@@ -170,7 +170,7 @@ const DepModInfo g_istep10Dependancies = {
DEP_LIB(libsbe.so),
DEP_LIB(libproc_hwreconfig.so),
DEP_LIB(libslave_sbe.so),
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
DEP_LIB(libocc.so),
#endif
#endif
diff --git a/src/include/usr/isteps/istep14list.H b/src/include/usr/isteps/istep14list.H
index b8da1fab3..010836077 100644
--- a/src/include/usr/isteps/istep14list.H
+++ b/src/include/usr/isteps/istep14list.H
@@ -129,7 +129,7 @@ const DepModInfo g_istep14Dependancies = {
DEP_LIB(libdram_training.so),
DEP_LIB(libdump.so),
DEP_LIB(libnest_chiplets.so),
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
DEP_LIB(libocc.so),
#endif
#endif
diff --git a/src/include/usr/isteps/istep16list.H b/src/include/usr/isteps/istep16list.H
index bde62884e..dffb279b4 100644
--- a/src/include/usr/isteps/istep16list.H
+++ b/src/include/usr/isteps/istep16list.H
@@ -91,7 +91,7 @@ const DepModInfo g_istep16Dependancies = {
DEP_LIB(libcore_activate.so),
DEP_LIB(libbuild_winkle_images.so),
DEP_LIB(libnest_chiplets.so),
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
DEP_LIB(libocc.so),
#endif
NULL
diff --git a/src/usr/diag/HBconfig b/src/usr/diag/HBconfig
index 973cecd2d..1d00bdc6b 100644
--- a/src/usr/diag/HBconfig
+++ b/src/usr/diag/HBconfig
@@ -8,3 +8,9 @@ config ENABLE_CHECKSTOP_ANALYSIS
help
Enable collection of FIR data by OCC for checkstops and
post-checkstop analysis by PRD on system reboot
+
+config IPLTIME_CHECKSTOP_ANALYSIS
+ default n
+ help
+ Enable collection of FIR data by the OCC for checkstops
+ during the IPL.
diff --git a/src/usr/hwas/hostbootIstep.C b/src/usr/hwas/hostbootIstep.C
index b3f510a3d..31362a8ad 100644
--- a/src/usr/hwas/hostbootIstep.C
+++ b/src/usr/hwas/hostbootIstep.C
@@ -360,7 +360,7 @@ void* host_cancontinue_clear( void *io_pArgs )
"host_cancontinue_clear entry" );
errlHndl_t errl = NULL;
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
// TODO RTC 115587: current place; could change
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"host_cancontinue_clear: calling activateOCCs" );
@@ -465,7 +465,7 @@ void* host_prd_hwreconfig( void *io_pArgs )
"MCS target HUID %.8X", l_currMcsHuid);
} // for
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
// update firdata inputs for OCC
TARGETING::Target* masterproc = NULL;
TARGETING::targetService().masterProcChipTargetHandle(masterproc);
diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C
index 8fc317327..e9c729b5f 100644
--- a/src/usr/hwpf/hwp/core_activate/core_activate.C
+++ b/src/usr/hwpf/hwp/core_activate/core_activate.C
@@ -85,7 +85,7 @@
#include <diag/prdf/prdfMain.H>
#include <util/misc.H>
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#include <occ/occ_common.H>
#endif
@@ -641,7 +641,7 @@ void* call_host_activate_slave_cores( void *io_pArgs )
// @@@@@ END CUSTOM BLOCK: @@@@@
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
if( l_stepError.isNull() )
{
// update firdata inputs for OCC
diff --git a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
index 53cde0d53..70f402f31 100644
--- a/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
+++ b/src/usr/hwpf/hwp/dram_initialization/dram_initialization.C
@@ -82,7 +82,7 @@
#include <dump/dumpif.H>
#include <vfs/vfs.H>
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#include <occ/occ_common.H>
#endif
@@ -137,7 +137,7 @@ void* call_host_startprd_dram( void *io_pArgs )
// @@@@@ END CUSTOM BLOCK: @@@@@
#endif
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
// update firdata inputs for OCC
TARGETING::Target* masterproc = NULL;
TARGETING::targetService().masterProcChipTargetHandle(masterproc);
diff --git a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
index c02d91985..98a398a1e 100644
--- a/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
+++ b/src/usr/hwpf/hwp/edi_ei_initialization/edi_ei_initialization.C
@@ -85,7 +85,7 @@
// eRepair Restore
#include <erepairAccessorHwpFuncs.H>
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#include <occ/occ_common.H>
#endif
@@ -713,7 +713,7 @@ void* call_host_startprd_pbus( void *io_pArgs )
break;
}
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
// update firdata inputs for OCC
TARGETING::Target* masterproc = NULL;
TARGETING::targetService().masterProcChipTargetHandle(masterproc);
diff --git a/src/usr/hwpf/hwp/occ/occ.C b/src/usr/hwpf/hwp/occ/occ.C
index 2b062cd87..faa64b3cb 100644
--- a/src/usr/hwpf/hwp/occ/occ.C
+++ b/src/usr/hwpf/hwp/occ/occ.C
@@ -160,7 +160,7 @@ namespace HBOCC
break;
}
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#ifndef __HOSTBOOT_RUNTIME
if (i_useSRAM)
{
diff --git a/src/usr/hwpf/hwp/occ/occ_common.C b/src/usr/hwpf/hwp/occ/occ_common.C
index 1075f3773..eb18ecef5 100644
--- a/src/usr/hwpf/hwp/occ/occ_common.C
+++ b/src/usr/hwpf/hwp/occ/occ_common.C
@@ -122,7 +122,7 @@ namespace HBOCC
return l_errl;
}
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
errlHndl_t loadOCCImageDuringIpl( TARGETING::Target* i_target,
void* i_occVirtAddr)
{
@@ -289,7 +289,7 @@ namespace HBOCC
return l_errl;
} // loadHostDataToHomer
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
#ifndef __HOSTBOOT_RUNTIME
/**
* @brief Sets up OCC Host data in SRAM
@@ -485,7 +485,7 @@ namespace HBOCC
break;
}
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
if (i_useSRAM)
{
void* occVirt = reinterpret_cast<void *>(i_occImgVaddr);
@@ -504,7 +504,7 @@ namespace HBOCC
//Load the OCC HOMER image
//==============================
-#ifdef CONFIG_ENABLE_CHECKSTOP_ANALYSIS
+#ifdef CONFIG_IPLTIME_CHECKSTOP_ANALYSIS
// clear (up to and including) the IPL Flag
const uint32_t l_SramAddrApp = OCC_SRAM_ADDRESS;
ecmdDataBufferBase l_occAppData((OCC_OFFSET_IPL_FLAG + 6) * 8 /* bits */);
OpenPOWER on IntegriCloud