summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/usr/hwpf/istepreasoncodes.H88
-rw-r--r--src/include/usr/isteps/hwpisteperror.H4
-rw-r--r--src/include/usr/isteps/istep_reasoncodes.H33
-rw-r--r--src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C142
-rw-r--r--src/usr/initservice/istepdispatcher/istepdispatcher.C4
-rw-r--r--src/usr/isteps/hwpisteperror.C12
-rw-r--r--src/usr/isteps/istep16/call_host_activate_master.C12
-rw-r--r--src/usr/isteps/istep16/call_host_activate_slave_cores.C16
-rw-r--r--src/usr/isteps/istep21/call_host_runtime_setup.C4
-rw-r--r--src/usr/isteps/istep21/call_host_start_payload.C34
-rw-r--r--src/usr/isteps/istep21/call_host_verify_hdat.C4
11 files changed, 120 insertions, 233 deletions
diff --git a/src/include/usr/hwpf/istepreasoncodes.H b/src/include/usr/hwpf/istepreasoncodes.H
deleted file mode 100644
index 8dfe568ce..000000000
--- a/src/include/usr/hwpf/istepreasoncodes.H
+++ /dev/null
@@ -1,88 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: src/include/usr/hwpf/istepreasoncodes.H $ */
-/* */
-/* OpenPOWER HostBoot Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
-/* [+] International Business Machines Corp. */
-/* */
-/* */
-/* Licensed under the Apache License, Version 2.0 (the "License"); */
-/* you may not use this file except in compliance with the License. */
-/* You may obtain a copy of the License at */
-/* */
-/* http://www.apache.org/licenses/LICENSE-2.0 */
-/* */
-/* Unless required by applicable law or agreed to in writing, software */
-/* distributed under the License is distributed on an "AS IS" BASIS, */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
-/* implied. See the License for the specific language governing */
-/* permissions and limitations under the License. */
-/* */
-/* IBM_PROLOG_END_TAG */
-/**
- * @file istepreasoncodes.H
- *
- * @brief Reason codes and module ids for the isteps
- *
- */
-#ifndef __ISTEPREASONCODES_H
-#define __ISTEPREASONCODES_H
-// -----------------------------------------------
-// Includes
-// -----------------------------------------------
-#include <hbotcompid.H>
-
-namespace ISTEP
-{
-
-/**
-* @enum istepModuleid
-*
-* @brief Module Ids used in created errorlogs. Indicates which
-* functions an error log was created in.
-*
-*/
-enum istepModuleId
-{
- ISTEP_INVALID_MODULE = 0x00,
- ISTEP_REPORTING_ERROR = 0x01,
- ISTEP_START_PAYLOAD_CALL_SHUTDOWN = 0x02,
- ISTEP_HOST_ACTIVATE_SLAVE_CORES = 0x03,
- ISTEP_BUILD_WINKLE_IMAGES = 0x04,
- ISTEP_PROC_SET_PORE_BAR = 0x05,
- ISTEP_HOST_ACTIVATE_MASTER = 0x06,
- ISTEP_SBE_CENTAUR_INIT = 0x07,
- ISTEP_ENABLE_CORE_CHECKSTOPS = 0x08,
- ISTEP_DECONFIG_PHBS_BASED_ON_PCI_STATE = 0x09,
- ISTEP_COMPUTE_PCIE_CONFIG_ATTRS = 0x0A,
-};
-
-/**
- * @enum istepReasonCode
- *
- * @brief Reasoncodes used to describe what errors are being indicated.
- *
- */
-enum istepReasonCode
-{
- ISTEP_INVALID_REASONCODE = ISTEP_COMP_ID | 0x00,
- ISTEP_FAILURE = ISTEP_COMP_ID | 0x01,
- ISTEP_TARGET_NULL = ISTEP_COMP_ID | 0x02,
- ISTEP_BAD_RC = ISTEP_COMP_ID | 0x03,
- ISTEP_FAIL_MASTER_WINKLE_RC = ISTEP_COMP_ID | 0x04,
- ISTEP_MM_UNMAP_ERR = ISTEP_COMP_ID | 0x05,
- ISTEP_LOAD_SLW_FROM_PNOR_FAILED = ISTEP_COMP_ID | 0x06,
- ISTEP_REPAIR_LOADER_RETRY_OCCURED = ISTEP_COMP_ID | 0x07,
- ISTEP_MM_MAP_ERR = ISTEP_COMP_ID | 0x08,
- ISTEP_INCORRECT_TARGET_COUNT = ISTEP_COMP_ID | 0x09,
- ISTEP_INVALID_TARGET_TYPE = ISTEP_COMP_ID | 0x0A,
- ISTEP_INVALID_ATTR_VALUE = ISTEP_COMP_ID | 0x0B,
- ISTEP_INVALID_CONFIGURATION = ISTEP_COMP_ID | 0x0C,
- ISTEP_INVALID_PCIE_IOP_LANE_CONFIG = ISTEP_COMP_ID | 0x0D,
-}; // end ISTEP
-
-}
-#endif
diff --git a/src/include/usr/isteps/hwpisteperror.H b/src/include/usr/isteps/hwpisteperror.H
index 6a906e823..fee6e607f 100644
--- a/src/include/usr/isteps/hwpisteperror.H
+++ b/src/include/usr/isteps/hwpisteperror.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -34,7 +34,7 @@
*/
#include <errl/errlentry.H>
-#include <hwpf/istepreasoncodes.H>
+#include <isteps/istep_reasoncodes.H>
namespace ISTEP_ERROR
diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H
index d5132ac9b..70e8ac8e2 100644
--- a/src/include/usr/isteps/istep_reasoncodes.H
+++ b/src/include/usr/isteps/istep_reasoncodes.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015 */
+/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -33,7 +33,18 @@ namespace ISTEP
*/
enum istepModuleId
{
- MOD_EXIT_CACHE_CONTAINED = 0x01,
+ MOD_INVALID_MODULE = 0x00,
+ MOD_REPORTING_ERROR = 0x01,
+ MOD_START_PAYLOAD_CALL_SHUTDOWN = 0x02,
+ MOD_HOST_ACTIVATE_SLAVE_CORES = 0x03,
+ MOD_BUILD_HCODE_IMAGES = 0x04,
+ MOD_PROC_SET_PORE_BAR = 0x05,
+ MOD_HOST_ACTIVATE_MASTER = 0x06,
+ MOD_SBE_CENTAUR_INIT = 0x07,
+ MOD_ENABLE_CORE_CHECKSTOPS = 0x08,
+ MOD_DECONFIG_PHBS_BASED_ON_PCI_STATE = 0x09,
+ MOD_COMPUTE_PCIE_CONFIG_ATTRS = 0x0A,
+ MOD_EXIT_CACHE_CONTAINED = 0x0B,
};
/**
@@ -41,8 +52,22 @@ namespace ISTEP
*/
enum istepReasonCode
{
- RC_NO_MIRRORED_MEMORY = HWPF_COMP_ID | 0x01,
- RC_MM_EXTEND_FAILED = HWPF_COMP_ID | 0x02,
+ RC_NO_MIRRORED_MEMORY = ISTEP_COMP_ID | 0x01,
+ RC_MM_EXTEND_FAILED = ISTEP_COMP_ID | 0x02,
+ RC_INVALID_REASONCODE = ISTEP_COMP_ID | 0x00,
+ RC_FAILURE = ISTEP_COMP_ID | 0x01,
+ RC_TARGET_NULL = ISTEP_COMP_ID | 0x02,
+ RC_BAD_RC = ISTEP_COMP_ID | 0x03,
+ RC_FAIL_MASTER_WINKLE = ISTEP_COMP_ID | 0x04,
+ RC_MM_UNMAP_ERR = ISTEP_COMP_ID | 0x05,
+ RC_LOAD_HCODE_FROM_PNOR_FAILED = ISTEP_COMP_ID | 0x06,
+ RC_REPAIR_LOADER_RETRY_OCCURED = ISTEP_COMP_ID | 0x07,
+ RC_MM_MAP_ERR = ISTEP_COMP_ID | 0x08,
+ RC_INCORRECT_TARGET_COUNT = ISTEP_COMP_ID | 0x09,
+ RC_INVALID_TARGET_TYPE = ISTEP_COMP_ID | 0x0A,
+ RC_INVALID_ATTR_VALUE = ISTEP_COMP_ID | 0x0B,
+ RC_INVALID_CONFIGURATION = ISTEP_COMP_ID | 0x0C,
+ RC_INVALID_PCIE_IOP_LANE_CONFIG = ISTEP_COMP_ID | 0x0D,
};
};
diff --git a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
index 858c2bbcd..f07654b38 100644
--- a/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
+++ b/src/usr/hwpf/hwp/build_winkle_images/build_winkle_images.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -121,34 +121,21 @@ errlHndl_t loadPoreImage( char *& o_rporeAddr,
break;
}
- rc = sbe_xip_image_size(reinterpret_cast<void*>(l_info.vaddr),
- &o_rporeSize);
- if((rc !=0) || (o_rporeSize == 0) || o_rporeSize > l_info.size)
- {
- TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
- "ERROR: invalid WINK image rc[%d] slwSize[%d] part size[%d]",
- rc, o_rporeSize, l_info.size);
- /*@
- * @errortype
- * @reasoncode ISTEP_LOAD_SLW_FROM_PNOR_FAILED
- * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_BUILD_WINKLE_IMAGES
- * @userdata1 Hi 32 bits: return code from sbe_xip_image_size
- * Lo 32 bits: Size of memory requested
- * @userdata2 Size of WINK PNOR partition
- * @devdesc Image from PNOR WINK partition invalid, too small,
- * or too big
- * @custdesc A problem occurred during the IPL
- * of the system.
- */
- l_errl =
- new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
- ISTEP::ISTEP_LOAD_SLW_FROM_PNOR_FAILED,
- (rc<<32)|o_rporeSize,
- l_info.size );
- break;
- }
+// rc = sbe_xip_image_size(reinterpret_cast<void*>(l_info.vaddr),
+// &o_rporeSize);
+// if((rc !=0) || (o_rporeSize == 0) || o_rporeSize > l_info.size)
+// {
+// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+// "ERROR: invalid WINK image rc[%d] slwSize[%d] part size[%d]",
+// rc, o_rporeSize, l_info.size);
+// l_errl =
+// new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+// ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
+// ISTEP::ISTEP_LOAD_SLW_FROM_PNOR_FAILED,
+// (rc<<32)|o_rporeSize,
+// l_info.size );
+// break;
+// }
o_rporeAddr = reinterpret_cast<char*>(l_info.vaddr);
@@ -322,34 +309,19 @@ errlHndl_t applyPoreGenCpuRegs( TARGETING::Target *i_procChipTarg,
} // end for l_coreIds
- if ( l_rc ){
- TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
- "ERROR: p8_pore_gen api fail core=0x%x, thread=0x%x, l_rc=0x%x",
- l_coreId, l_threadId, l_rc );
- /*@
- * @errortype
- * @reasoncode ISTEP_BAD_RC
- * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_BUILD_WINKLE_IMAGES
- * @userdata1[00:31] return code from p8_pore_gen_xxx function
- * @userdata1[32:63] address being added to image
- * @userdata2[00:31] Failing Core Id
- * @userdata2[32:63] Failing Thread Id
- *
- * @devdesc p8_pore_gen_xxx returned an error when
- * attempting to change a reg value in the PORE image.
- * @custdesc A problem occurred during the IPL
- * of the system.
- */
- l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
- ISTEP::ISTEP_BAD_RC,
- TWO_UINT32_TO_UINT64(l_rc,l_failAddr),
- TWO_UINT32_TO_UINT64(l_coreId,l_threadId) );
- l_errl->collectTrace(FAPI_TRACE_NAME,256);
- l_errl->collectTrace(FAPI_IMP_TRACE_NAME,256);
- l_errl->collectTrace("ISTEPS_TRACE",256);
- }
+// if ( l_rc ){
+// TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
+// "ERROR: p8_pore_gen api fail core=0x%x, thread=0x%x, l_rc=0x%x",
+// l_coreId, l_threadId, l_rc );
+// l_errl = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+// ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
+// ISTEP::ISTEP_BAD_RC,
+// TWO_UINT32_TO_UINT64(l_rc,l_failAddr),
+// TWO_UINT32_TO_UINT64(l_coreId,l_threadId) );
+// l_errl->collectTrace(FAPI_TRACE_NAME,256);
+// l_errl->collectTrace(FAPI_IMP_TRACE_NAME,256);
+// l_errl->collectTrace("ISTEPS_TRACE",256);
+// }
return l_errl;
}
@@ -617,34 +589,23 @@ void* call_host_build_winkle( void *io_pArgs )
{
int rc = 0;
rc = mm_block_unmap(l_pVirtMemBase);
- if (rc != 0)
- {
- /*@
- * @errortype
- * @reasoncode ISTEP::ISTEP_MM_UNMAP_ERR
- * @moduleid ISTEP::ISTEP_BUILD_WINKLE_IMAGES
- * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @userdata1 Return Code
- * @userdata2 Unmap address
- * @devdesc mm_block_unmap() returns error
- * @custdesc A problem occurred during the IPL
- * of the system.
- */
- l_errl =
- new ERRORLOG::ErrlEntry(
- ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
- ISTEP::ISTEP_MM_UNMAP_ERR,
- rc,
- reinterpret_cast<uint64_t>
- (l_pVirtMemBase));
-
- // Create IStep error log and cross reference error that occurred
- l_StepError.addErrorDetails( l_errl );
-
- // Commit error
- errlCommit( l_errl, ISTEP_COMP_ID );
- }
+// if (rc != 0)
+// {
+// l_errl =
+// new ERRORLOG::ErrlEntry(
+// ERRORLOG::ERRL_SEV_UNRECOVERABLE,
+// ISTEP::ISTEP_BUILD_WINKLE_IMAGES,
+// ISTEP::ISTEP_MM_UNMAP_ERR,
+// rc,
+// reinterpret_cast<uint64_t>
+// (l_pVirtMemBase));
+//
+// // Create IStep error log and cross reference error that occurred
+// l_StepError.addErrorDetails( l_errl );
+//
+// // Commit error
+// errlCommit( l_errl, ISTEP_COMP_ID );
+// }
}
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
@@ -743,17 +704,6 @@ void* call_proc_set_pore_bar( void *io_pArgs )
// ignore it if something else
// happened.
{
- /*@
- * @errortype
- * @reasoncode ISTEP::ISTEP_MM_UNMAP_ERR
- * @moduleid ISTEP::ISTEP_PROC_SET_PORE_BAR
- * @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @userdata1 Return Code
- * @userdata2 Unmap address
- * @devdesc mm_block_unmap() returns error
- * @custdesc A problem occurred during the IPL
- * of the system.
- */
l_errl =
new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C
index c696faa11..5ec83e822 100644
--- a/src/usr/initservice/istepdispatcher/istepdispatcher.C
+++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C
@@ -58,7 +58,7 @@
#include "istep_mbox_msgs.H"
#include "splesscommon.H"
#include <diag/attn/attn.H>
-#include <hwpf/istepreasoncodes.H>
+#include <isteps/istep_reasoncodes.H>
#include <hwas/common/deconfigGard.H>
#include <hwas/common/hwas.H>
#include <hwas/hwasPlat.H>
@@ -438,7 +438,7 @@ errlHndl_t IStepDispatcher::executeAllISteps()
// the checkMinimumHardware error with the same
// plid that matches the real errors
const uint32_t l_plid = err->plid();
- if (ISTEP::ISTEP_FAILURE == err->reasonCode())
+ if (ISTEP::RC_FAILURE == err->reasonCode())
{
delete err;
}
diff --git a/src/usr/isteps/hwpisteperror.C b/src/usr/isteps/hwpisteperror.C
index afa9e9294..fd2d3708c 100644
--- a/src/usr/isteps/hwpisteperror.C
+++ b/src/usr/isteps/hwpisteperror.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -55,9 +55,9 @@ void ISTEP_ERROR::IStepError::addErrorDetails( const errlHndl_t i_err )
/*@
* @errortype
- * @reasoncode ISTEP_FAILURE
+ * @reasoncode RC_FAILURE
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_REPORTING_ERROR
+ * @moduleid MOD_REPORTING_ERROR
* @userdata1[0:31] eid of first error
* @userdata1[32:63] Reason code of first error
* @userdata2[0:31] Total number of elogs included
@@ -67,8 +67,8 @@ void ISTEP_ERROR::IStepError::addErrorDetails( const errlHndl_t i_err )
*
*/
iv_eHandle = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP_REPORTING_ERROR,
- ISTEP_FAILURE,
+ MOD_REPORTING_ERROR,
+ RC_FAILURE,
data1, data2);
// Set the PLID of this istep elog to match the first error
@@ -89,7 +89,7 @@ void ISTEP_ERROR::IStepError::addErrorDetails( const errlHndl_t i_err )
// grab the istep's trace and add to the input elog
i_err->collectTrace("ISTEPS_TRACE", 1024);
- // the istep error is causing the IPL to fail (UNRECOVERABLE), so
+ // the istep error is causing the IPL to fail (UNRECOVERABLE), so
// if this error was less severe than UNRECOVERABLE (ie, INFORMATIONAL,
// RECOVERED, PREDICTIVE) change to UNRECOVERABLE so that it is
// visible as well as the istep error log.
diff --git a/src/usr/isteps/istep16/call_host_activate_master.C b/src/usr/isteps/istep16/call_host_activate_master.C
index 64dd4d71e..2050cf163 100644
--- a/src/usr/isteps/istep16/call_host_activate_master.C
+++ b/src/usr/isteps/istep16/call_host_activate_master.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015 */
+/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -224,18 +224,18 @@ void* call_host_activate_master (void *io_pArgs)
l_rc );
/*@
* @errortype
- * @reasoncode ISTEP_FAIL_MASTER_WINKLE_RC
+ * @reasoncode RC_FAIL_MASTER_WINKLE
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_HOST_ACTIVATE_MASTER
+ * @moduleid MOD_HOST_ACTIVATE_MASTER
* @userdata1 return code from cpu_master_winkle
* @userdata2 Fused core indicator
*
- * @devdesc cpu_master_winkle returned an error
+ * @devdesc cpu_master_winkle returned an error
*/
l_errl =
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP_HOST_ACTIVATE_MASTER,
- ISTEP_FAIL_MASTER_WINKLE_RC,
+ MOD_HOST_ACTIVATE_MASTER,
+ RC_FAIL_MASTER_WINKLE,
l_rc, l_fusedCores );
break;
}
diff --git a/src/usr/isteps/istep16/call_host_activate_slave_cores.C b/src/usr/isteps/istep16/call_host_activate_slave_cores.C
index ebb51482c..b7018a86f 100644
--- a/src/usr/isteps/istep16/call_host_activate_slave_cores.C
+++ b/src/usr/isteps/istep16/call_host_activate_slave_cores.C
@@ -165,9 +165,9 @@ void* call_host_activate_slave_cores (void *io_pArgs)
pir);
/*@
* @errortype
- * @reasoncode ISTEP_BAD_RC
+ * @reasoncode RC_BAD_RC
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_HOST_ACTIVATE_SLAVE_CORES
+ * @moduleid MOD_HOST_ACTIVATE_SLAVE_CORES
* @userdata1 PIR of failing core.
* @userdata2 rc of cpu_start_core().
*
@@ -177,8 +177,8 @@ void* call_host_activate_slave_cores (void *io_pArgs)
errlHndl_t l_errl =
new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP_HOST_ACTIVATE_SLAVE_CORES,
- ISTEP_BAD_RC,
+ MOD_HOST_ACTIVATE_SLAVE_CORES,
+ RC_BAD_RC,
pir,
rc );
@@ -237,9 +237,9 @@ void* call_host_activate_slave_cores (void *io_pArgs)
"returned %d instead of 1", targetList.size() );
/*@
* @errortype
- * @reasoncode ISTEP_INCORRECT_TARGET_COUNT
+ * @reasoncode RC_INCORRECT_TARGET_COUNT
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_HOST_ACTIVATE_SLAVE_CORES
+ * @moduleid MOD_HOST_ACTIVATE_SLAVE_CORES
* @userdata1 PIR of failing core.
* @userdata2 number of targets returned
*
@@ -253,8 +253,8 @@ void* call_host_activate_slave_cores (void *io_pArgs)
*/
l_errl =
new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP_HOST_ACTIVATE_SLAVE_CORES,
- ISTEP_INCORRECT_TARGET_COUNT,
+ MOD_HOST_ACTIVATE_SLAVE_CORES,
+ RC_INCORRECT_TARGET_COUNT,
pir,
targetList.size(), true);
// Create IStep error log and cross ref error that occurred
diff --git a/src/usr/isteps/istep21/call_host_runtime_setup.C b/src/usr/isteps/istep21/call_host_runtime_setup.C
index 84473bdaa..1901525bc 100644
--- a/src/usr/isteps/istep21/call_host_runtime_setup.C
+++ b/src/usr/isteps/istep21/call_host_runtime_setup.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015 */
+/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -27,7 +27,7 @@
#include <errl/errlmanager.H>
#include <initservice/isteps_trace.H>
#include <isteps/hwpisteperror.H>
-#include <hwpf/istepreasoncodes.H>
+#include <isteps/istep_reasoncodes.H>
#include <initservice/initserviceif.H>
#include <initservice/istepdispatcherif.H>
#include <vfs/vfs.H>
diff --git a/src/usr/isteps/istep21/call_host_start_payload.C b/src/usr/isteps/istep21/call_host_start_payload.C
index 3b6a5a536..886a5b4f4 100644
--- a/src/usr/isteps/istep21/call_host_start_payload.C
+++ b/src/usr/isteps/istep21/call_host_start_payload.C
@@ -27,7 +27,7 @@
#include <errl/errlmanager.H>
#include <initservice/isteps_trace.H>
#include <isteps/hwpisteperror.H>
-#include <hwpf/istepreasoncodes.H>
+#include <isteps/istep_reasoncodes.H>
#include <initservice/initserviceif.H>
#include <initservice/istepdispatcherif.H>
#include <sys/task.h>
@@ -369,9 +369,9 @@ errlHndl_t callShutdown ( uint64_t i_masterInstance,
/*@
* @errortype
- * @reasoncode ISTEP_TARGET_NULL
+ * @reasoncode RC_TARGET_NULL
* @severity ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM
- * @moduleid ISTEP_START_PAYLOAD_CALL_SHUTDOWN
+ * @moduleid MOD_START_PAYLOAD_CALL_SHUTDOWN
* @userdata1 <UNUSED>
* @userdata2 <UNUSED>
* @devdesc System target was NULL!
@@ -379,8 +379,8 @@ errlHndl_t callShutdown ( uint64_t i_masterInstance,
* of the system.
*/
err = new ERRORLOG::ErrlEntry( ERRORLOG::ERRL_SEV_CRITICAL_SYS_TERM,
- ISTEP_START_PAYLOAD_CALL_SHUTDOWN,
- ISTEP_TARGET_NULL,
+ MOD_START_PAYLOAD_CALL_SHUTDOWN,
+ RC_TARGET_NULL,
0x0,
0x0 );
@@ -584,8 +584,8 @@ errlHndl_t enableCoreCheckstops()
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Error from mm_block_map : phys=%.16X", l_physAddr );
/*@
* @errortype
- * @reasoncode ISTEP::ISTEP_MM_MAP_ERR
- * @moduleid ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS
+ * @reasoncode RC_MM_MAP_ERR
+ * @moduleid MOD_ENABLE_CORE_CHECKSTOPS
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
* @userdata1 <unused>
* @userdata2 Physical address
@@ -596,8 +596,8 @@ errlHndl_t enableCoreCheckstops()
l_errl =
new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS,
- ISTEP::ISTEP_MM_MAP_ERR,
+ MOD_ENABLE_CORE_CHECKSTOPS,
+ RC_MM_MAP_ERR,
0,
l_physAddr);
}
@@ -645,9 +645,9 @@ errlHndl_t enableCoreCheckstops()
get_huid(l_pChipTarget), l_coreId, l_rc );
/*@
* @errortype
- * @reasoncode ISTEP_BAD_RC
+ * @reasoncode RC_BAD_RC
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
- * @moduleid ISTEP_ENABLE_CORE_CHECKSTOPS
+ * @moduleid MOD_ENABLE_CORE_CHECKSTOPS
* @userdata1[00:31] rc from p8_pore_gen_scom_fixed function
* @userdata1[32:63] address being added to image
* @userdata2[00:31] Failing Proc HUID
@@ -660,8 +660,8 @@ errlHndl_t enableCoreCheckstops()
*/
l_errl = new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS,
- ISTEP::ISTEP_BAD_RC,
+ MOD_ENABLE_CORE_CHECKSTOPS,
+ RC_BAD_RC,
TWO_UINT32_TO_UINT64(l_rc,
EX_CORE_FIR_ACTION1_0x10013107),
TWO_UINT32_TO_UINT64(
@@ -680,8 +680,8 @@ errlHndl_t enableCoreCheckstops()
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "Error from mm_block_unmap : rc=%d, ptr=%p", mm_rc, l_slwPtr );
/*@
* @errortype
- * @reasoncode ISTEP::ISTEP_MM_UNMAP_ERR
- * @moduleid ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS
+ * @reasoncode RC_MM_UNMAP_ERR
+ * @moduleid MOD_ENABLE_CORE_CHECKSTOPS
* @severity ERRORLOG::ERRL_SEV_UNRECOVERABLE
* @userdata1 Return Code
* @userdata2 Unmap address
@@ -692,8 +692,8 @@ errlHndl_t enableCoreCheckstops()
l_errl =
new ERRORLOG::ErrlEntry(
ERRORLOG::ERRL_SEV_UNRECOVERABLE,
- ISTEP::ISTEP_ENABLE_CORE_CHECKSTOPS,
- ISTEP::ISTEP_MM_UNMAP_ERR,
+ MOD_ENABLE_CORE_CHECKSTOPS,
+ RC_MM_UNMAP_ERR,
mm_rc,
reinterpret_cast<uint64_t>
(l_slwPtr));
diff --git a/src/usr/isteps/istep21/call_host_verify_hdat.C b/src/usr/isteps/istep21/call_host_verify_hdat.C
index 4c1b3b9fe..6a14ce794 100644
--- a/src/usr/isteps/istep21/call_host_verify_hdat.C
+++ b/src/usr/isteps/istep21/call_host_verify_hdat.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2015 */
+/* Contributors Listed Below - COPYRIGHT 2015,2016 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -27,7 +27,7 @@
#include <errl/errlmanager.H>
#include <initservice/isteps_trace.H>
#include <isteps/hwpisteperror.H>
-#include <hwpf/istepreasoncodes.H>
+#include <isteps/istep_reasoncodes.H>
#include <initservice/initserviceif.H>
#include <initservice/istepdispatcherif.H>
OpenPOWER on IntegriCloud