summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/usr/hwas/common/hwas_reasoncodes.H1
-rw-r--r--src/include/usr/isteps/istep_reasoncodes.H1
-rw-r--r--src/usr/hwas/common/hwas.C60
-rw-r--r--src/usr/isteps/istep07/call_mss_attr_update.C52
4 files changed, 0 insertions, 114 deletions
diff --git a/src/include/usr/hwas/common/hwas_reasoncodes.H b/src/include/usr/hwas/common/hwas_reasoncodes.H
index 1c3a78946..729743162 100644
--- a/src/include/usr/hwas/common/hwas_reasoncodes.H
+++ b/src/include/usr/hwas/common/hwas_reasoncodes.H
@@ -54,7 +54,6 @@ namespace HWAS
RC_RESOURCE_RECOVERED = HWAS_COMP_ID | 0x0A,
RC_SYSAVAIL_MISSING_CRITICAL_RESOURCE = HWAS_COMP_ID | 0x0B,
RC_SYSAVAIL_NO_MCAS_FUNC = HWAS_COMP_ID | 0x0C,
- RC_SYSAVAIL_NO_MEMORY_FUNC_MASTER = HWAS_COMP_ID | 0x0D,
RC_SYSAVAIL_NO_NX_FUNC = HWAS_COMP_ID | 0x0E,
};
};
diff --git a/src/include/usr/isteps/istep_reasoncodes.H b/src/include/usr/isteps/istep_reasoncodes.H
index bdf4c9386..48139a517 100644
--- a/src/include/usr/isteps/istep_reasoncodes.H
+++ b/src/include/usr/isteps/istep_reasoncodes.H
@@ -60,7 +60,6 @@ namespace ISTEP
MOD_SBE_EXTRACT_RC_HANDLER = 0x18,
MOD_HANDLE_SBE_REG_VALUE = 0x19,
MOD_SBE_PERFORM_UPDATE_CHECK = 0x1A,
- MOD_MSS_ATTR_UPDATE = 0x1B, /* @TODO-RTC:149250-Remove */
MOD_SBE_GET_FFDC_HANDLER = 0x1C,
};
diff --git a/src/usr/hwas/common/hwas.C b/src/usr/hwas/common/hwas.C
index 76a4c4916..c2636baf7 100644
--- a/src/usr/hwas/common/hwas.C
+++ b/src/usr/hwas/common/hwas.C
@@ -1765,66 +1765,6 @@ errlHndl_t checkMinimumHardware(const TARGETING::ConstTargetHandle_t i_nodeOrSys
// errl is now NULL
} // if no dimms
- //@fixme-RTC:149250-Remove when we have XOR Mask Support
- // check here for functional dimms behind the master proc
- targetService().getAssociated(l_dimms, l_pMasterProc,
- TargetService::CHILD_BY_AFFINITY, TargetService::ALL,
- &l_checkExprFunctional);
- HWAS_DBG( "checkMinimumHardware: %d functional dimms behind master proc %.8X",
- l_dimms.size(), get_huid(l_pMasterProc) );
-
- if (l_dimms.empty())
- {
- HWAS_ERR( "Insufficient hardware to continue IPL (func DIMM behind master proc)");
-
- if(o_bootable)
- {
- *o_bootable = false;
- break;
- }
- // determine some numbers to help figure out what's up..
- TargetHandleList l_plist;
- PredicatePostfixExpr l_checkExprPresent;
- l_checkExprPresent.push(&l_dimm).push(&l_present).And();
- targetService().getAssociated(l_plist, l_pMasterProc,
- TargetService::CHILD_BY_AFFINITY, TargetService::ALL,
- &l_checkExprPresent);
- uint32_t dimms_present = l_plist.size();
-
- /*@
- * @errortype
- * @severity ERRL_SEV_UNRECOVERABLE
- * @moduleid MOD_CHECK_MIN_HW
- * @reasoncode RC_SYSAVAIL_NO_MEMORY_FUNC_MASTER
- * @devdesc checkMinimumHardware found no
- * functional dimms behind proc0
- * @custdesc A problem occurred during the IPL of the
- * system: Found no functional dimm cards.
- * @userdata1[00:31] HUID of master proc
- * @userdata2[00:31] number of present, non-functional dimms
- */
- const uint64_t userdata1 =
- (static_cast<uint64_t>(get_huid(l_pMasterProc)) << 32);
- const uint64_t userdata2 =
- (static_cast<uint64_t>(dimms_present) << 32);
- l_errl = hwasError(ERRL_SEV_UNRECOVERABLE,
- MOD_CHECK_MIN_HW,
- RC_SYSAVAIL_NO_MEMORY_FUNC,
- userdata1, userdata2);
-
- // 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;
- // if not, set the common plid
- hwasErrorUpdatePlid( l_errl, l_commonPlid );
- errlCommit(l_errl, HWAS_COMP_ID);
- // errl is now NULL
- } // if no dimms
- //END section to remove
-
// There needs to be either functional MCS/MCAs (NIMBUS) or MCS/MBAs
// (CUMULUS). Check for MCAs first.
PredicateCTM l_mca(CLASS_UNIT, TYPE_MCA);
diff --git a/src/usr/isteps/istep07/call_mss_attr_update.C b/src/usr/isteps/istep07/call_mss_attr_update.C
index d548fff84..3cd28a17f 100644
--- a/src/usr/isteps/istep07/call_mss_attr_update.C
+++ b/src/usr/isteps/istep07/call_mss_attr_update.C
@@ -45,8 +45,6 @@
#include <initservice/isteps_trace.H>
#include <initservice/initserviceif.H>
-#include <hwas/common/hwasCallout.H> //@fixme-RTC:149250-Remove
-
// SBE
#include <sbeif.H>
@@ -202,54 +200,6 @@ errlHndl_t check_proc0_memory_config(IStepError & io_istepErr)
"dimms behind it",
get_huid(l_procIds[l_proc0].proc) );
- //@fixme-RTC:149250-Remove when we have XOR Mask Support
- do
- {
- // determine some numbers to help figure out what's up..
- PredicateHwas l_present;
- l_present.present(true);
- TargetHandleList l_plist;
- PredicatePostfixExpr l_checkExprPresent;
- l_checkExprPresent.push(&l_dimm).push(&l_present).And();
- targetService().getAssociated(l_plist, l_procIds[l_proc0].proc,
- TargetService::CHILD_BY_AFFINITY, TargetService::ALL,
- &l_checkExprPresent);
- uint32_t dimms_present = l_plist.size();
-
- /*@
- * @errortype
- * @severity ERRL_SEV_UNRECOVERABLE
- * @moduleid MOD_MSS_ATTR_UPDATE
- * @reasoncode RC_MIN_HW_CHECK_FAILED
- * @devdesc check_proc0_memory_config found no
- * functional dimms behind proc0
- * @custdesc A problem occurred during the IPL of the
- * system: Found no functional dimm cards.
- * @userdata1[00:31] HUID of proc0
- * @userdata2[00:31] number of present, non-functional dimms
- */
- const uint64_t userdata1 =
- (static_cast<uint64_t>(get_huid(l_procIds[l_proc0].proc)) << 32);
- const uint64_t userdata2 =
- (static_cast<uint64_t>(dimms_present) << 32);
- l_err = new ErrlEntry(ERRL_SEV_UNRECOVERABLE,
- MOD_MSS_ATTR_UPDATE,
- RC_MIN_HW_CHECK_FAILED,
- userdata1,
- userdata2);
-
- // call out the procedure to find the deconfigured part.
- l_err->addProcedureCallout( HWAS::EPUB_PRC_FIND_DECONFIGURED_PART,
- HWAS::SRCI_PRIORITY_HIGH );
-
- // link this one to the istep and commit
- io_istepErr.addErrorDetails(l_err);
- errlCommit(l_err, HWPF_COMP_ID);
- // errl is now NULL
-
- break;
- //@fixme-RTC:149250-Remove when we have XOR Mask Support
-
// Loop through all procs to find ones for memory remap
for (i = 0; i < l_procsList.size(); i++)
{
@@ -306,8 +256,6 @@ errlHndl_t check_proc0_memory_config(IStepError & io_istepErr)
// Check that a victim was found
assert( l_victim < l_procsList.size(), "No swap match found" );
-
- } while(0); //@fixme-RTC:149250-Remove when we have XOR Mask Support
}
// Loop through all procs detecting that IDs are set correctly
OpenPOWER on IntegriCloud