diff options
-rw-r--r-- | src/include/usr/hwas/common/hwasCallout.H | 1 | ||||
-rw-r--r-- | src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C | 12 | ||||
-rw-r--r-- | src/usr/errl/plugins/errludcallout.H | 1 | ||||
-rw-r--r-- | src/usr/hwas/common/deconfigGard.C | 18 | ||||
-rw-r--r-- | src/usr/hwas/test/hwasGardTest.H | 56 | ||||
-rw-r--r-- | src/usr/targeting/common/xmltohb/attribute_types.xml | 16 |
6 files changed, 11 insertions, 93 deletions
diff --git a/src/include/usr/hwas/common/hwasCallout.H b/src/include/usr/hwas/common/hwasCallout.H index f54c31fc2..c22713329 100644 --- a/src/include/usr/hwas/common/hwasCallout.H +++ b/src/include/usr/hwas/common/hwasCallout.H @@ -53,7 +53,6 @@ typedef enum { GARD_Unrecoverable = 0xE2, //TODO:RTC-76814 GARD_Fatal = 0xE3, //IPL Failures, and others. GARD_Predictive = 0xE6, //Policy flag to disable. - GARD_Func = 0xE7, //Policy flag to disable. GARD_Power = 0xE9, //Needed since EID is NOT passed in. GARD_PHYP = 0xEA, //Needed since EID is NOT passed in. GARD_Void = 0xFF diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C index 984258f94..01d3c4668 100644 --- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C @@ -295,7 +295,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, sdc = sdcBuffer; // Add secondary signature sdc.AddSignatureList( secSig ); - gardErrType = HWAS::GARD_Func; + gardErrType = HWAS::GARD_Fatal; causeAttnPreviouslyReported = true; } } @@ -313,7 +313,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, sdc = sdcBuffer; // Add secondary signature sdc.AddSignatureList( secSig ); - gardErrType = HWAS::GARD_Func; + gardErrType = HWAS::GARD_Fatal; causeAttnPreviouslyReported = true; } } @@ -406,7 +406,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, // If gardErrType was determined during UE/SUE processing for Check Stop, // use that and not determine gardErrType from the sdc values. - if (gardErrType != HWAS::GARD_Func) + if (gardErrType != HWAS::GARD_Fatal) { prdGardErrType = sdc.QueryGard(); switch (prdGardErrType) @@ -419,12 +419,12 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, gardErrType = HWAS::GARD_Predictive; break; case GardAction::Fatal: - gardErrType = HWAS::GARD_Func; + gardErrType = HWAS::GARD_Fatal; break; case GardAction::CheckStopOnlyGard: if (MACHINE_CHECK == i_attnType) { - gardErrType = HWAS::GARD_Func; + gardErrType = HWAS::GARD_Fatal; } else { @@ -445,7 +445,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType, } else { - // gardErrType is GARD_Func, set in UE/SUE processing for Check Stop. + // gardErrType is GARD_Fatal, set in UE/SUE processing for Check Stop. // If NoGard was specified in this switched sdc, then keep the NoGard if ( sdc.QueryGard() == GardAction::NoGard ) { diff --git a/src/usr/errl/plugins/errludcallout.H b/src/usr/errl/plugins/errludcallout.H index 01d9000fd..4ee6f3262 100644 --- a/src/usr/errl/plugins/errludcallout.H +++ b/src/usr/errl/plugins/errludcallout.H @@ -153,7 +153,6 @@ case HWAS::_type: i_parser.PrintString( "GARD Error Type", #_type); break; case_GARD_ERROR_TYPE(GARD_Unrecoverable) case_GARD_ERROR_TYPE(GARD_Fatal) case_GARD_ERROR_TYPE(GARD_Predictive) - case_GARD_ERROR_TYPE(GARD_Func) case_GARD_ERROR_TYPE(GARD_Power) case_GARD_ERROR_TYPE(GARD_PHYP) case_GARD_ERROR_TYPE(GARD_Void) diff --git a/src/usr/hwas/common/deconfigGard.C b/src/usr/hwas/common/deconfigGard.C index 5467410f3..a2aa67110 100644 --- a/src/usr/hwas/common/deconfigGard.C +++ b/src/usr/hwas/common/deconfigGard.C @@ -270,15 +270,6 @@ errlHndl_t DeconfigGard::deconfigureTargetsFromGardRecordsForIpl( continue; } - if ((l_sys_policy & CDM_POLICIES_FUNCTIONAL_DISABLED) && - (l_gardRecord.iv_errorType == GARD_Func)) - { - // functional records are disabled AND gard record is Functional - // - don't process - HWAS_INF("Functional policy: disabled - skipping GARD Record"); - continue; - } - // Find the associated Target Target * l_pTarget = targetService().toTarget(l_gardRecord.iv_targetId); @@ -519,15 +510,6 @@ errlHndl_t DeconfigGard::createGardRecord(const Target * const i_pTarget, break; } - if ((l_sys_policy & CDM_POLICIES_FUNCTIONAL_DISABLED) && - (i_errorType == GARD_Func)) - { - // functional records are disabled AND gard record is Functional - // - don't process - HWAS_INF("Functional policy: disabled - skipping GARD Record create"); - break; - } - l_pErr = platCreateGardRecord(i_pTarget, i_errlEid, i_errorType); } while (0); diff --git a/src/usr/hwas/test/hwasGardTest.H b/src/usr/hwas/test/hwasGardTest.H index 7b66bf888..487c28df3 100644 --- a/src/usr/hwas/test/hwasGardTest.H +++ b/src/usr/hwas/test/hwasGardTest.H @@ -1559,37 +1559,6 @@ public: break; } - // set Functional policy to disabled - // test that gard record isn't created - l_policies = CDM_POLICIES_FUNCTIONAL_DISABLED; - pSys->setAttr<ATTR_CDM_POLICIES>(l_policies); - - // (try to) Create a GARD Record for the target. - l_pErr = theDeconfigGard(). - createGardRecord(l_pTarget, 0x12, GARD_Func); - - if (l_pErr) - { - TS_FAIL("testGard9: Error from createGardRecord"); - break; - } - - // Get the GARD Records for the target - shouldn't be any - l_pErr = theDeconfigGard().getGardRecords(l_pTarget, l_records); - - if (l_pErr) - { - TS_FAIL("testGard9: Error from getGardRecords (2)"); - break; - } - - if (l_records.size() != 0) - { - TS_FAIL("testGard9: %d records for target, expected 0", - l_records.size()); - break; - } - // restore l_policies = 0; pSys->setAttr<ATTR_CDM_POLICIES>(l_policies); @@ -1731,7 +1700,7 @@ public: l_pErr = theDeconfigGard().clearGardRecords(NULL); if (l_pErr) { - TS_FAIL("testGard7: Error from clearGardRecords(NULL)"); + TS_FAIL("testGard10: Error from clearGardRecords(NULL)"); break; } @@ -1752,7 +1721,7 @@ public: // create GARD record, set Policy, call 'doGard' step and confirm // target is NOT deconfigured l_pErr = theDeconfigGard(). - createGardRecord(l_target, 0x12, GARD_Func); + createGardRecord(l_target, 0x12, GARD_Predictive); if (l_pErr) { TS_FAIL("testGard10: Error from createGardRecord"); @@ -1773,30 +1742,11 @@ public: break; } - // set Functional policy to disabled, - // test that gard record is not created - l_policies = CDM_POLICIES_FUNCTIONAL_DISABLED; - pSys->setAttr<ATTR_CDM_POLICIES>(l_policies); - - l_pErr = collectGard(); - if (l_pErr) - { - TS_FAIL("testGard10: Error from collectGard"); - break; - } - - l_state = l_target->getAttr<ATTR_HWAS_STATE>(); - if (!l_state.functional) - { - TS_FAIL("testGard10: target NOT functional"); - break; - } - // Clear all GARD Records l_pErr = theDeconfigGard().clearGardRecords(NULL); if (l_pErr) { - TS_FAIL("testGard7: Error from clearGardRecords(NULL)"); + TS_FAIL("testGard10: Error from clearGardRecords(NULL)"); break; } diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml index 21b69ca5e..42942dd1c 100644 --- a/src/usr/targeting/common/xmltohb/attribute_types.xml +++ b/src/usr/targeting/common/xmltohb/attribute_types.xml @@ -11565,18 +11565,6 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript <description>Enumeration of CDM_POLICIES flags</description> <enumerator> <description> - Functional_Guard policy: - Used in Field or development to prevent and disable the following: - . Storing or creation of new Guard records from diagnostics or other - faults through error logs with the error_type of Functional. - . Using an already stored System Guard record with error_type of - Functional from deconfiguring resources. - </description> - <name>FUNCTIONAL_DISABLED</name> - <value>0x01</value> - </enumerator> - <enumerator> - <description> MFG_Guard policy: Used in MFG only to prevent and disable the following: . Storing or creation of new Guard records from Diagnostic or other @@ -11589,7 +11577,7 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript processor/memory, VPD, FSP, etc. </description> <name>MANUFACTURING_DISABLED</name> - <value>0x02</value> + <value>0x01</value> </enumerator> <enumerator> <description> @@ -11601,7 +11589,7 @@ firmware notes: Platforms should initialize this attribute to AUTO (0)</descript Predictive from deconfiguring resources. </description> <name>PREDICTIVE_DISABLED</name> - <value>0x04</value> + <value>0x02</value> </enumerator> </enumerationType> |