PRD: Disable garding for checkstops caused by OPAL

Change-Id: Ic062ca7d64a24caeed89bdfed2df58043b3c92c0
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19154
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: BENJAMIN J. WEISENBECK <bweisenb@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19573
Tested-by: Jenkins OP Build CI
Tested-by: Jenkins OP HW

1 files changed, 15 insertions, 3 deletions

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 96d0bea3d..a8f06cf63 100644
--- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
+++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C
@@ -490,11 +490,23 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
     // software generated the attention. This will be determined if there is a
     // software callout with higher priority than a hardware callout.
     if ( sappSwNoGardReq && sappHwNoGardReq &&          // Gard requirements met
-         isHyprConfigOpal() && isHyprRunning() &&       // OPAL is running
+         isHyprConfigOpal() &&                          // OPAL is used
          !isMfgAvpEnabled() && !isMfgHdatAvpEnabled() ) // No AVPs running
     {
-        gardErrType = HWAS::GARD_NULL;
-        prdGardErrType = GardAction::NoGard;
+        #ifdef __HOSTBOOT_MODULE
+        // TODO RTC 119791: With the current implementation, we know the
+        // checkstop occured at runtime if we are doing checkstop analysis.
+        // Eventually we will add checkstop handling during the IPL. In this
+        // case, we will need to add a flag to the FIRDATA indicating when the
+        // FIRDATA was collected.
+        if ( isHyprRunning() || (MACHINE_CHECK == i_attnType) )
+        #else
+        if ( isHyprRunning() )
+        #endif
+        {
+            gardErrType    = HWAS::GARD_NULL;
+            prdGardErrType = GardAction::NoGard;
+        }
     }
 
     for ( SDC_MRU_LIST::const_iterator it = mruList.begin();