diff options
| -rw-r--r-- | src/include/usr/hwas/common/hwasCommon.H | 13 | ||||
| -rw-r--r-- | src/usr/hwas/common/hwas.C | 273 | ||||
| -rw-r--r-- | src/usr/hwas/hwasPlat.C | 15 |
3 files changed, 176 insertions, 125 deletions
diff --git a/src/include/usr/hwas/common/hwasCommon.H b/src/include/usr/hwas/common/hwasCommon.H index e7e1ff384..9a3b6f70f 100644 --- a/src/include/usr/hwas/common/hwasCommon.H +++ b/src/include/usr/hwas/common/hwasCommon.H @@ -60,6 +60,19 @@ namespace HWAS bool platSystemIsAtRuntime(); /** + * @brief platform specific code to determine if minimum hardware + * check is allowed. + * + * @param[out] o_minHwCheckingAllowed boolean: + * TRUE if minimum hardware checking is allowed + * FALSE if minimum hardware checking is not allowed + * + * @return errlHndl_t valid errlHndl_t handle if there was an error + * NULL if no errors; + */ +errlHndl_t platIsMinHwCheckingAllowed(bool &o_minHwCheckingAllowed); + +/** * @brief platform specific code to determine if the targets in the * input list are present or not. If a target is NOT present, it is erased * from the list diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C index 89f95c387..fda7d9326 100644 --- a/src/usr/hwas/common/hwas.C +++ b/src/usr/hwas/common/hwas.C @@ -623,140 +623,163 @@ errlHndl_t restrictEXunits( errlHndl_t checkMinimumHardware() { errlHndl_t l_errl = NULL; - uint32_t l_reasonCode = 0; - uint32_t l_commonPlid = 0; - - //***********************************************************************/ - // Common present and functional hardware checks. - //***********************************************************************/ - - // check for functional cores - TargetHandleList l_cores; - getAllChiplets(l_cores, TYPE_CORE, true ); - HWAS_DBG( "platCheckMinimumHardware: %d functional cores", - l_cores.size() ); - if ( l_cores.empty() ) - { - TargetHandleList l_presentCores; - getAllChiplets(l_presentCores, TYPE_CORE, false ); - HWAS_ERR( "Insufficient HW to continue IPL: (func Cores)" - ", %d cores are present", - l_presentCores.size() ); - /*@ - * @errortype - * @severity ERRL_SEV_UNRECOVERABLE - * @moduleid MOD_SYS_AVAIL_SVC - * @reasoncode RC_SYSAVAIL_NO_CORES_FUNC - * @devdesc checkSystem availability check found no functional - * processor cores. - * @userdata1 Number of present, nonfunctional cores. - * @userdata2 0 - */ - l_reasonCode = RC_SYSAVAIL_NO_CORES_FUNC; - l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, - MOD_SYS_AVAIL_SVC, - l_reasonCode, - l_presentCores.size(), - 0 ); - // call out the procedure to find the deconfigured part. - hwasErrorAddProcedureCallout( l_errl, - EPUB_PRC_FIND_DECONFIGURED_PART, - SRCI_PRIORITY_HIGH ); - // if we already have an error, link this one to the earlier plid. - // if not, set the common plid - hwasErrorUpdatePlid( l_errl, - l_commonPlid ); - - // finally, commit the log. - errlCommit(l_errl, HWAS_COMP_ID); - // errl is now NULL - } - + HWAS_INF("checkMinimumHardware entry"); - // check here for functional dimms - TargetHandleList l_dimms; - getAllLogicalCards(l_dimms, TYPE_DIMM, true ); - HWAS_DBG( "platCheckMinimumHardware: %d functional dimms", - l_dimms.size() ); - if ( l_dimms.empty() ) + do { - TargetHandleList l_presentDimms; - getAllLogicalCards(l_presentDimms, TYPE_DIMM, false ); - HWAS_ERR( "Insufficient hardware to continue IPL (func DIMM)" - ", %d dimms present", - l_presentDimms.size() ); - /*@ - * @errortype - * @severity ERRL_SEV_UNRECOVERABLE - * @moduleid MOD_SYS_AVAIL_SVC - * @reasoncode RC_SYSAVAIL_NO_MEMORY_FUNC - * @devdesc checkSystem availability check found no - * functional dimm cards. - * @userdata1 Number of present, nonfunctional dimms - * @userdata2 0 - */ - l_reasonCode = RC_SYSAVAIL_NO_MEMORY_FUNC; - l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, - MOD_SYS_AVAIL_SVC, - l_reasonCode, - l_presentDimms.size(), - 0 ); - // call out the procedure to find the deconfigured part. - hwasErrorAddProcedureCallout( l_errl, - EPUB_PRC_FIND_DECONFIGURED_PART, - SRCI_PRIORITY_HIGH ); - // if we already have an error, link this one to the earlier plid. - // if not, set the common plid - hwasErrorUpdatePlid( l_errl, - l_commonPlid ); - - errlCommit(l_errl, HWAS_COMP_ID); - // errl is now NULL - } + uint32_t l_reasonCode = 0; + uint32_t l_commonPlid = 0; - // ------------------------------------------------------------ - // Check for Mirrored memory - - // If the user requests mirrored memory and we do not have it, - // post an errorlog but do not return a terminating error. - // ------------------------------------------------------------ - // Need to read an attribute set by PHYP? + // before we check, confirm that we're allowed to check right now. + bool l_minHwCheckingAllowed = false; + l_errl = platIsMinHwCheckingAllowed(l_minHwCheckingAllowed); + if (l_errl) + { + HWAS_ERR("platIsMinHwCheckingAllowed returned error - skipping"); + break; + } - // check for minimum hardware that is specific to HostBoot. - // if it exists, create and commit an error, and tie it to the - // the rest of them with the common plid. - platCheckMinimumHardware( l_commonPlid ); + if (!l_minHwCheckingAllowed) + { + HWAS_INF("platIsMinHwCheckingAllowed returned false - skipping"); + break; + } - // --------------------------------------------------------------- - // if the common plid got set anywhere above, we have an error. - // --------------------------------------------------------------- - if ( l_commonPlid ) - { + //*********************************************************************/ + // Common present and functional hardware checks. + //*********************************************************************/ + + // check for functional cores + TargetHandleList l_cores; + getAllChiplets(l_cores, TYPE_CORE, true ); + HWAS_DBG( "platCheckMinimumHardware: %d functional cores", + l_cores.size() ); + if ( l_cores.empty() ) + { + TargetHandleList l_presentCores; + getAllChiplets(l_presentCores, TYPE_CORE, false ); + HWAS_ERR( "Insufficient HW to continue IPL: (func Cores)" + ", %d cores are present", + l_presentCores.size() ); + /*@ + * @errortype + * @severity ERRL_SEV_UNRECOVERABLE + * @moduleid MOD_SYS_AVAIL_SVC + * @reasoncode RC_SYSAVAIL_NO_CORES_FUNC + * @devdesc checkSystem availability check found no functional + * processor cores. + * @userdata1 Number of present, nonfunctional cores. + * @userdata2 0 + */ + l_reasonCode = RC_SYSAVAIL_NO_CORES_FUNC; + l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, + MOD_SYS_AVAIL_SVC, + l_reasonCode, + l_presentCores.size(), + 0 ); + // call out the procedure to find the deconfigured part. + hwasErrorAddProcedureCallout( l_errl, + EPUB_PRC_FIND_DECONFIGURED_PART, + SRCI_PRIORITY_HIGH ); + // if we already have an error, link this one to the earlier plid. + // if not, set the common plid + hwasErrorUpdatePlid( l_errl, + l_commonPlid ); + + // finally, commit the log. + errlCommit(l_errl, HWAS_COMP_ID); + // errl is now NULL + } // if no cores + + // check here for functional dimms + TargetHandleList l_dimms; + getAllLogicalCards(l_dimms, TYPE_DIMM, true ); + HWAS_DBG( "platCheckMinimumHardware: %d functional dimms", + l_dimms.size() ); + if ( l_dimms.empty() ) + { + TargetHandleList l_presentDimms; + getAllLogicalCards(l_presentDimms, TYPE_DIMM, false ); + HWAS_ERR( "Insufficient hardware to continue IPL (func DIMM)" + ", %d dimms present", + l_presentDimms.size() ); + /*@ + * @errortype + * @severity ERRL_SEV_UNRECOVERABLE + * @moduleid MOD_SYS_AVAIL_SVC + * @reasoncode RC_SYSAVAIL_NO_MEMORY_FUNC + * @devdesc checkSystem availability check found no + * functional dimm cards. + * @userdata1 Number of present, nonfunctional dimms + * @userdata2 0 + */ + l_reasonCode = RC_SYSAVAIL_NO_MEMORY_FUNC; + l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, + MOD_SYS_AVAIL_SVC, + l_reasonCode, + l_presentDimms.size(), + 0 ); + // call out the procedure to find the deconfigured part. + hwasErrorAddProcedureCallout( l_errl, + EPUB_PRC_FIND_DECONFIGURED_PART, + SRCI_PRIORITY_HIGH ); + // if we already have an error, link this one to the earlier plid. + // if not, set the common plid + hwasErrorUpdatePlid( l_errl, + l_commonPlid ); + + errlCommit(l_errl, HWAS_COMP_ID); + // errl is now NULL + } // if no dimms + + // ------------------------------------------------------------ + // Check for Mirrored memory - + // If the user requests mirrored memory and we do not have it, + // post an errorlog but do not return a terminating error. + // ------------------------------------------------------------ + // Need to read an attribute set by PHYP? + + + // check for minimum hardware that is specific to HostBoot. + // if it exists, create and commit an error, and tie it to the + // the rest of them with the common plid. + platCheckMinimumHardware( l_commonPlid ); + + // --------------------------------------------------------------- + // if the common plid got set anywhere above, we have an error. + // --------------------------------------------------------------- + if ( l_commonPlid ) + { - /*@ - * @errortype - * @severity ERRL_SEV_UNRECOVERABLE - * @moduleid MOD_SYS_AVAIL_SVC - * @reasoncode RC_SYSAVAIL_INSUFFICIENT_HW - * @devdesc Insufficient hardware to continue. - * @userdata1 0 - * @userdata2 0 - */ - l_reasonCode = RC_SYSAVAIL_INSUFFICIENT_HW; - l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, - MOD_SYS_AVAIL_SVC, - l_reasonCode, - 0, - 0 ); - // call out the procedure to find the deconfigured part. - hwasErrorAddProcedureCallout( l_errl, - EPUB_PRC_FIND_DECONFIGURED_PART, - SRCI_PRIORITY_HIGH ); - // if we already have an error, link this one to the earlier plid. - hwasErrorUpdatePlid( l_errl, - l_commonPlid ); + /*@ + * @errortype + * @severity ERRL_SEV_UNRECOVERABLE + * @moduleid MOD_SYS_AVAIL_SVC + * @reasoncode RC_SYSAVAIL_INSUFFICIENT_HW + * @devdesc Insufficient hardware to continue. + * @userdata1 0 + * @userdata2 0 + */ + l_reasonCode = RC_SYSAVAIL_INSUFFICIENT_HW; + l_errl = hwasError( ERRL_SEV_UNRECOVERABLE, + MOD_SYS_AVAIL_SVC, + l_reasonCode, + 0, + 0 ); + // call out the procedure to find the deconfigured part. + hwasErrorAddProcedureCallout( l_errl, + EPUB_PRC_FIND_DECONFIGURED_PART, + SRCI_PRIORITY_HIGH ); + // if we already have an error, link this one to the earlier plid. + hwasErrorUpdatePlid( l_errl, + l_commonPlid ); + } } + while (0); + HWAS_INF("checkMinimumHardware exit - minimum hardware %s", + (l_errl == NULL) ? "available" : "NOT available"); return l_errl ; } diff --git a/src/usr/hwas/hwasPlat.C b/src/usr/hwas/hwasPlat.C index 7896bcec0..2095277ec 100644 --- a/src/usr/hwas/hwasPlat.C +++ b/src/usr/hwas/hwasPlat.C @@ -134,6 +134,21 @@ bool platSystemIsAtRuntime() } //****************************************************************************** +// platIsMinHwCheckingAllowed function +// Description: This function will return false always because when Hostboot +// is running then System cannot be at runtime +//****************************************************************************** +errlHndl_t platIsMinHwCheckingAllowed(bool &o_minHwCheckingAllowed) +{ + errlHndl_t errl = NULL; + + // for hostboot, minimum hardware checkign is always allowed + o_minHwCheckingAllowed = true; + + return errl; +} + +//****************************************************************************** // platReadPartialGood function //****************************************************************************** errlHndl_t platReadPartialGood(const TargetHandle_t &i_target, |
