diff options
Diffstat (limited to 'src/include/kernel')
| -rw-r--r-- | src/include/kernel/cpumgr.H | 4 | ||||
| -rw-r--r-- | src/include/kernel/hbterminatetypes.H | 9 | ||||
| -rw-r--r-- | src/include/kernel/misc.H | 2 | ||||
| -rw-r--r-- | src/include/kernel/terminate.H | 6 |
4 files changed, 14 insertions, 7 deletions
diff --git a/src/include/kernel/cpumgr.H b/src/include/kernel/cpumgr.H index fc562521d..c3c8387d9 100644 --- a/src/include/kernel/cpumgr.H +++ b/src/include/kernel/cpumgr.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2010,2016 */ +/* Contributors Listed Below - COPYRIGHT 2010,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -78,7 +78,7 @@ class CpuManager /** @fn requestShutdown * Requests that all CPUs shutdown */ - static void requestShutdown(uint64_t i_status); + static void requestShutdown(uint64_t i_status, uint32_t i_error_data=0); /** @fn isShutdownRequested * Returns if a shutdown of all CPUs was requested diff --git a/src/include/kernel/hbterminatetypes.H b/src/include/kernel/hbterminatetypes.H index 42bb16788..6aa97e023 100644 --- a/src/include/kernel/hbterminatetypes.H +++ b/src/include/kernel/hbterminatetypes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -78,7 +78,6 @@ struct HB_T_SRC_DataArea */ struct HB_TI_DataArea { - union{ struct { uint64_t type:16; /**< indicates either plid or src */ @@ -88,7 +87,11 @@ struct HB_TI_DataArea }; uint64_t flag; /**< Full word - flag */ }; - uint32_t reserved0; + + union{ + uint32_t error_data; /**< Error Data */ + uint32_t reserved0; + }; uint32_t plid; /**< Plid */ HB_T_SRC_DataArea src; /**< SRC */ }; diff --git a/src/include/kernel/misc.H b/src/include/kernel/misc.H index b1415089f..f08af361f 100644 --- a/src/include/kernel/misc.H +++ b/src/include/kernel/misc.H @@ -51,6 +51,8 @@ namespace KernelMisc extern uint64_t g_payload_data; /** @brief master host boot instance number (node) */ extern uint64_t g_masterHBInstance; + /** @brief master host boot additional error data (node) */ + extern uint32_t g_error_data; /** @brief Indicate whether HB is running or not */ enum HbRunning diff --git a/src/include/kernel/terminate.H b/src/include/kernel/terminate.H index 9d80f988d..c80304d93 100644 --- a/src/include/kernel/terminate.H +++ b/src/include/kernel/terminate.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2016 */ +/* Contributors Listed Below - COPYRIGHT 2012,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -49,11 +49,13 @@ void termWritePlid(uint16_t i_source, uint32_t plid); * @param[in] i_source: indicates what type of fail forced the TI * @param[in] i_reasoncode: reasoncode for the failure(assert or shutdown) * @param[in] i_failAddr: i_linkRegister() value (address of failure) + * @param[in] i_error_info: addt'l error info to add to TI data * @param[out] NONE: */ void termWriteSRC(uint16_t i_source, uint16_t i_reasoncode, - uint64_t i_failAddr = 0); + uint64_t i_failAddr = 0, + uint32_t i_error_info = 0); /** @fn termModifySRC * Modify an SRC and the TI data area for Bootloader |
