diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/runtime/generic_hbrt_fsp_message.H | 12 | ||||
| -rw-r--r-- | src/usr/isteps/pm/runtime/test/firmwareRequestTest.H | 8 | ||||
| -rw-r--r-- | src/usr/util/runtime/rt_fwnotify.C | 26 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/include/runtime/generic_hbrt_fsp_message.H b/src/include/runtime/generic_hbrt_fsp_message.H index 0f28b5640..102e2692b 100644 --- a/src/include/runtime/generic_hbrt_fsp_message.H +++ b/src/include/runtime/generic_hbrt_fsp_message.H @@ -65,12 +65,12 @@ struct TargetDeconfigHbrtFspData_t /** * A useful struct to access the PLID from GenericFspMboxMessage_t.data - * The PLID will be in the first 4 bytes followed by some other data. + * in the case where the FSP is requesting Hostboot to restart a SBE */ -struct HbrtFspData_t +struct SbeRetryReqData_t { + uint32_t huid; uint32_t plid; - uint32_t userData; } PACKED ; @@ -139,9 +139,9 @@ struct GenericFspMboxMessage_t MSG_TOD_TOPOLOGY_DATA = 0x0003, MSG_DECONFIG_TARGET = 0x0004, MSG_ATTR_SYNC_REQUEST = 0x000000A5, - MSG_SBE_ERROR = 0x000000E1, - MSG_SBE_RECOVERY_SUCCESS = 0x000000E2, - MSG_SBE_RECOVERY_FAILED = 0x000000E3, + MSG_SBE_ERROR = 0x000000D4, + MSG_SBE_RECOVERY_SUCCESS = 0x000000D5, + MSG_SBE_RECOVERY_FAILED = 0x000000D6, }; /** diff --git a/src/usr/isteps/pm/runtime/test/firmwareRequestTest.H b/src/usr/isteps/pm/runtime/test/firmwareRequestTest.H index 152b9f197..6c8aead3e 100644 --- a/src/usr/isteps/pm/runtime/test/firmwareRequestTest.H +++ b/src/usr/isteps/pm/runtime/test/firmwareRequestTest.H @@ -194,7 +194,7 @@ class FirmwareRequestTest : public CxxTest::TestSuite uint64_t l_req_fw_msg_size(0), l_resp_fw_msg_size(0); // Create the dynamic firmware messages - createGenericFspMsg(sizeof(HbrtFspData_t), + createGenericFspMsg(sizeof(SbeRetryReqData_t), l_fsp_data_size, l_req_fw_msg_size, l_req_fw_msg, @@ -208,11 +208,11 @@ class FirmwareRequestTest : public CxxTest::TestSuite // Create a useful struct to populate the generic_msg::data field // Setting the PLID and userData - HbrtFspData_t* l_fspData = - reinterpret_cast<HbrtFspData_t*> + SbeRetryReqData_t* l_fspData = + reinterpret_cast<SbeRetryReqData_t*> (&(l_req_fw_msg->generic_msg.data)); + l_fspData->huid = 0x700; l_fspData->plid = 0x600; - l_fspData->userData = 0x700; if (l_req_fw_msg->generic_msg.magic != GenericFspMboxMessage_t::MAGIC_NUMBER) diff --git a/src/usr/util/runtime/rt_fwnotify.C b/src/usr/util/runtime/rt_fwnotify.C index a0ec0f5e0..d1c404b2a 100644 --- a/src/usr/util/runtime/rt_fwnotify.C +++ b/src/usr/util/runtime/rt_fwnotify.C @@ -85,19 +85,19 @@ uint16_t SeqId_t::getCurrentSeqId() /** * @brief Attempt an SBE recovery after an SBE error - * @param[in] uint64_t i_data Contains a plid (in the first 4 bytes) - * and a HUID (in the last 4 bytes) + * @param[in] uint64_t i_data Contains a HUID (in the first 4 bytes) + * and a plid (in the last 4 bytes) * @platform FSP, OpenPOWER **/ void sbeAttemptRecovery(uint64_t i_data) { // Create a useful struct to get to the data - // The data is expected to be a plid (in the first 4 bytes) - // followed by a HUID (in the last 4 bytes). - HbrtFspData_t *l_hbrtFspData = reinterpret_cast<HbrtFspData_t*>(&i_data); + // The data is expected to be a HUID (in the first 4 bytes) + // followed by a PLID (in the last 4 bytes). + SbeRetryReqData_t *l_sbeRetryData = reinterpret_cast<SbeRetryReqData_t*>(&i_data); TRACFCOMP(g_trac_runtime, ENTER_MRK"sbeAttemptRecovery: plid:0x%X, " - "HUID:0x%X", l_hbrtFspData->plid, l_hbrtFspData->userData); + "HUID:0x%X", l_sbeRetryData->plid, l_sbeRetryData->huid); errlHndl_t l_err = nullptr; @@ -105,14 +105,14 @@ void sbeAttemptRecovery(uint64_t i_data) { // Extract the target from the given HUID TargetHandle_t l_target = - Target::getTargetFromHuid(l_hbrtFspData->userData); + Target::getTargetFromHuid(l_sbeRetryData->huid); // If HUID invalid, log error and quit if (nullptr == l_target) { TRACFCOMP(g_trac_runtime, ERR_MRK"sbeAttemptRecovery: " "No target associated with HUID:0x%.8X", - l_hbrtFspData->userData); + l_sbeRetryData->huid); /*@ * @errortype @@ -126,8 +126,8 @@ void sbeAttemptRecovery(uint64_t i_data) l_err = new ErrlEntry( ERRL_SEV_PREDICTIVE, MOD_RT_FIRMWARE_NOTIFY, RC_SBE_RT_INVALID_HUID, - l_hbrtFspData->userData, - l_hbrtFspData->plid, + l_sbeRetryData->huid, + l_sbeRetryData->plid, true); break; } @@ -135,7 +135,7 @@ void sbeAttemptRecovery(uint64_t i_data) // Get the SBE Retry Handler, propagating the supplied PLID SbeRetryHandler l_SBEobj = SbeRetryHandler(SbeRetryHandler:: SBE_MODE_OF_OPERATION::INFORMATIONAL_ONLY, - l_hbrtFspData->plid); + l_sbeRetryData->plid); // Retry the recovery of the SBE l_SBEobj.main_sbe_handler(l_target); @@ -161,8 +161,8 @@ void sbeAttemptRecovery(uint64_t i_data) l_err = new ErrlEntry( ERRL_SEV_PREDICTIVE, MOD_RT_FIRMWARE_NOTIFY, RC_FW_REQUEST_RT_NULL_PTR, - l_hbrtFspData->userData, - l_hbrtFspData->plid, + l_sbeRetryData->huid, + l_sbeRetryData->plid, true); break; |
