PRD: cleaned procedure callouts in prdfCalloutMap.H

zane131 · zane131 · commit 71b79daf2cb7 · 2017-03-07T15:37:30.000-05:00
Change-Id: I9b645205bc2efeb269a025d4077ea0cde003b046 RTC: 137911 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37308 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com> Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37602 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
diff --git a/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H b/src/usr/diag/prdf/common/framework/resolution/prdfCalloutMap.H
@@ -82,14 +82,14 @@ namespace PRDF
 
 PRDF_SYM_CALLOUT_MAP_BEGIN
 
-PRDF_SYM_CALLOUT_ALIAS( AllProcessors,              HWAS::EPUB_PRC_ALL_PROCS         )
-PRDF_SYM_CALLOUT_ALIAS( SP_CODE,                    HWAS::EPUB_PRC_SP_CODE           )
-PRDF_SYM_CALLOUT_ALIAS( SystemSW_Code_ENUM,         HWAS::EPUB_PRC_PHYP_CODE         )
-PRDF_SYM_CALLOUT_ALIAS( NextLevelSupport_ENUM,      HWAS::EPUB_PRC_LVL_SUPP          )
-PRDF_SYM_CALLOUT_ALIAS( PassiveFabric_OffNode_ENUM, HWAS::EPUB_PRC_PROC_AB_BUS       )
-PRDF_SYM_CALLOUT_ALIAS( ErrorCausedByMemUE_ENUM,    HWAS::EPUB_PRC_MEMORY_UE         )
-PRDF_SYM_CALLOUT_ALIAS( TODProcInterface_Enum,      HWAS::EPUB_PRC_TOD_CLOCK_ERR     )
-PRDF_SYM_CALLOUT_ALIAS( CoolingSystemError_ENUM,    HWAS::EPUB_PRC_COOLING_SYSTEM_ERR)
+PRDF_SYM_CALLOUT_ALIAS( SUE_PREV_ERR,       HWAS::EPUB_PRC_SUE_PREVERROR     )
+PRDF_SYM_CALLOUT_ALIAS( SP_CODE,            HWAS::EPUB_PRC_SP_CODE           )
+PRDF_SYM_CALLOUT_ALIAS( SYS_SW_CODE,        HWAS::EPUB_PRC_PHYP_CODE         )
+PRDF_SYM_CALLOUT_ALIAS( LEVEL2_SUPPORT,     HWAS::EPUB_PRC_LVL_SUPP          )
+PRDF_SYM_CALLOUT_ALIAS( FAB_BUS_OFF_NODE,   HWAS::EPUB_PRC_PROC_AB_BUS       )
+PRDF_SYM_CALLOUT_ALIAS( ERR_ROOT_IS_MEM_UE, HWAS::EPUB_PRC_MEMORY_UE         )
+PRDF_SYM_CALLOUT_ALIAS( TOD_CLOCK_ERR,      HWAS::EPUB_PRC_TOD_CLOCK_ERR     )
+PRDF_SYM_CALLOUT_ALIAS( COOLING_SYSTEM_ERR, HWAS::EPUB_PRC_COOLING_SYSTEM_ERR)
 
 PRDF_SYM_CALLOUT_MAP_END
 
diff --git a/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C b/src/usr/diag/prdf/common/framework/service/xspprdsdbug.C
@@ -177,8 +177,7 @@ uint32_t SYSTEM_DEBUG_CLASS::Reinitialize(const AttnList & i_attnList)
                               0,                          // user data word 3
                               0 );                        // user data word 4
 
-            PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED,
-                                        HWAS::EPUB_PRC_SP_CODE );
+            PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED, SP_CODE );
             l_rc = PRD_ATTN_DATA_ACCESS_FAILED;
 
             break;
@@ -330,7 +329,7 @@ void SYSTEM_DEBUG_CLASS::CalloutThoseAtAttention(
         capture.Add(PlatServices::getSystemTarget(),0,cbs);
     }
 
-    sdc->SetCallout(NextLevelSupport_ENUM, MRU_HIGH);
+    sdc->SetCallout(LEVEL2_SUPPORT, MRU_HIGH);
 }
 
 // -------------------------------------------------------------------
diff --git a/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule b/src/usr/diag/prdf/common/plat/p9/p9_common_actions.rule
@@ -126,10 +126,10 @@ actionclass calloutSelfLow  { callout(MRU_LOW);  };
 
 # 2nd Level Support
 actionclass callout2ndLvlMed
-{ callout(procedure(NextLevelSupport_ENUM), MRU_MED); };
+{ callout(procedure(LEVEL2_SUPPORT), MRU_MED); };
 
 actionclass callout2ndLvlLow
-{ callout(procedure(NextLevelSupport_ENUM), MRU_LOW); };
+{ callout(procedure(LEVEL2_SUPPORT), MRU_LOW); };
 
 /** Callout self with  medium priority but don't gard it */
 actionclass calloutSelfMedNoGard
diff --git a/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C b/src/usr/diag/prdf/common/plat/p9/prdfP9PllDomain.C
@@ -279,13 +279,13 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
     {
         PRDF_ERR( PRDF_FUNC "Unexpected PCI osc failover detected" );
         mskErrType |= PCI_OSC_FAILOVER;
-        serviceData.service_data->SetCallout( NextLevelSupport_ENUM, MRU_LOW );
+        serviceData.service_data->SetCallout( LEVEL2_SUPPORT, MRU_LOW );
     }
     if (sysRefFoList.size() > 0)
     {
         PRDF_ERR( PRDF_FUNC "Unexpected Sys osc failover detected" );
         mskErrType |= SYS_OSC_FAILOVER;
-        serviceData.service_data->SetCallout( NextLevelSupport_ENUM, MRU_LOW );
+        serviceData.service_data->SetCallout( LEVEL2_SUPPORT, MRU_LOW );
     }
 
     if (serviceData.service_data->IsAtThreshold())
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_ABUS.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2015
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -521,7 +521,7 @@ group gIoaFir filter singlebit,
 /** Callout the ABUS 0 interface */
 actionclass calloutAbus0Interface
 {
-    callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
+    callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);
     callout(connected(TYPE_ABUS, 0), MRU_MEDA);
     callout(connected_peer(TYPE_ABUS, 0), MRU_MEDA);
     funccall("calloutInterface_abus0");
@@ -530,7 +530,7 @@ actionclass calloutAbus0Interface
 /** Callout the ABUS 1 interface */
 actionclass calloutAbus1Interface
 {
-    callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
+    callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);
     callout(connected(TYPE_ABUS, 1), MRU_MEDA);
     callout(connected_peer(TYPE_ABUS, 1), MRU_MEDA);
     funccall("calloutInterface_abus1");
@@ -539,7 +539,7 @@ actionclass calloutAbus1Interface
 /** Callout the ABUS 2 interface */
 actionclass calloutAbus2Interface
 {
-    callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);
+    callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);
     callout(connected(TYPE_ABUS, 2), MRU_MEDA);
     callout(connected_peer(TYPE_ABUS, 2), MRU_MEDA);
     funccall("calloutInterface_abus2");
diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_TP.rule
@@ -5,7 +5,7 @@
 #
 # OpenPOWER HostBoot Project
 #
-# Contributors Listed Below - COPYRIGHT 2012,2016
+# Contributors Listed Below - COPYRIGHT 2012,2017
 # [+] International Business Machines Corp.
 #
 #
@@ -1314,7 +1314,7 @@ actionclass analyzePibError
 /** Callout the cooling system error procedure */
 actionclass coolingSystemError
 {
-    callout(procedure(CoolingSystemError_ENUM), MRU_MED);
+    callout(procedure(COOLING_SYSTEM_ERR), MRU_MED);
     threshold1;
 };
 
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCalloutUtil.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -48,7 +48,7 @@ namespace CalloutUtil
 
 void defaultError( STEP_CODE_DATA_STRUCT & i_sc )
 {
-    i_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_MED, NO_GARD );
+    i_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_MED, NO_GARD );
     i_sc.service_data->SetCallout( SP_CODE, MRU_MED, NO_GARD );
     i_sc.service_data->setServiceCall();
 }
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMbaTdCtlr_common.C
@@ -695,7 +695,7 @@ void CenMbaTdCtlrCommon::badPathErrorHandling( STEP_CODE_DATA_STRUCT & io_sc )
     io_sc.service_data->setServiceCall();
 
     // There may have been a code bug, callout 2nd level support.
-    io_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_HIGH );
+    io_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_HIGH );
 
     // Callout the rank if no other callouts have been made (besides 2nd
     // Level Support). Note that iv_mark is not always guaranteed to be
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C b/src/usr/diag/prdf/common/plat/pegasus/prdfCenMembuf.C
@@ -1155,7 +1155,7 @@ int32_t internalTimeout( ExtensibleChip * i_mbChip,
             else
             {
                 // Make the callout of the external timeout error.
-                i_sc.service_data->SetCallout( NextLevelSupport_ENUM,
+                i_sc.service_data->SetCallout( LEVEL2_SUPPORT,
                                                MRU_MED, NO_GARD );
             }
         }
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C b/src/usr/diag/prdf/common/plat/pegasus/prdfP8Proc.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2016                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -912,8 +912,7 @@ int32_t calloutPhb( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & io_sc,
 
     // If no PHBs called out, callout 2nd level support.
     if ( (SUCCESS != l_rc) || (0 == io_sc.service_data->getMruListSize()) )
-        io_sc.service_data->SetCallout( NextLevelSupport_ENUM,
-                                        MRU_MED, NO_GARD );
+        io_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_MED, NO_GARD );
 
     return SUCCESS; // Intentionally returns SUCCESS so rule code does not get
                     // confused by undefined error code.
diff --git a/src/usr/diag/prdf/common/plat/pegasus/prdfPciOscSwitchDomain.C b/src/usr/diag/prdf/common/plat/pegasus/prdfPciOscSwitchDomain.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -305,8 +305,7 @@ void PciOscSwitchDomain::addHwCalloutAndSignature( STEP_CODE_DATA_STRUCT & i_sc,
         if( 0 == listSize )
         {
             PRDF_ERR( PRDF_FUNC "PCI Osc Switch Over: Analysis failed");
-            i_sc.service_data->SetCallout( NextLevelSupport_ENUM,
-                                           MRU_MED, NO_GARD );
+            i_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_MED, NO_GARD );
             signature = PRDFSIG_PCI_OSC_ANL_FAILED;
             break;
         }
@@ -331,8 +330,7 @@ void PciOscSwitchDomain::addHwCalloutAndSignature( STEP_CODE_DATA_STRUCT & i_sc,
             {
                 PRDF_ERR( PRDF_FUNC "Multiple pci Osc failures detected");
                 signature = PRDFSIG_PCI_MULTIPLE_OSC_FO;
-                i_sc.service_data->SetCallout( NextLevelSupport_ENUM,
-                                               MRU_MED, NO_GARD );
+                i_sc.service_data->SetCallout(LEVEL2_SUPPORT, MRU_MED, NO_GARD);
             }
 
             i_sc.service_data->SetCallout( it->pciOscCard, MRU_HIGH );
diff --git a/src/usr/diag/prdf/common/plat/prdfRasServices_common.C b/src/usr/diag/prdf/common/plat/prdfRasServices_common.C
@@ -169,8 +169,8 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
 
         if ( PRDcalloutData::TYPE_SYMFRU == thiscallout.getType() )
         {
-            if ( (HWAS::EPUB_PRC_SP_CODE   == thiscallout.flatten()) ||
-                 (HWAS::EPUB_PRC_PHYP_CODE == thiscallout.flatten()) )
+            if ( (SP_CODE     == thiscallout.flatten()) ||
+                 (SYS_SW_CODE == thiscallout.flatten()) )
             {
                 SW = true;
 
@@ -184,7 +184,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                     SW_High = true;
                 }
             }
-            else if ( HWAS::EPUB_PRC_LVL_SUPP == thiscallout.flatten())
+            else if ( LEVEL2_SUPPORT == thiscallout.flatten())
             {
                 SecondLevel = true;
 
@@ -322,10 +322,7 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
     // attention.
     if ( io_sdc.IsSUE() )
     {
-        PRDF_HW_ADD_PROC_CALLOUT(HWAS::EPUB_PRC_SUE_PREVERROR,
-                                 MRU_HIGH,
-                                 iv_errl,
-                                 errlSev);
+        PRDF_HW_ADD_PROC_CALLOUT( SUE_PREV_ERR, MRU_HIGH, iv_errl, errlSev );
     }
 
     //--------------------------------------------------------------------------
@@ -510,17 +507,16 @@ errlHndl_t ErrDataService::GenerateSrcPfa( ATTENTION_TYPE i_attnType,
                                      iv_errl,
                                      errlSev);
 
-            // Use the flags set earlier to determine if the callout is just Software (SP code or Phyp Code).
-            // Add a Second Level Support procedure callout Low, for this case.
+            // Use the flags set earlier to determine if the callout is just
+            // Software (SP code or Phyp Code). Add a Second Level Support
+            // procedure callout Low, for this case.
             if (HW == false && SW == true && SecondLevel == false)
             {
                 PRDF_DTRAC( PRDF_FUNC "thisProcedureID= %x, thispriority=%x, "
-                            "errlSev=%x", HWAS::EPUB_PRC_LVL_SUPP, MRU_LOW, errlSev );
+                            "errlSev=%x", LEVEL2_SUPPORT, MRU_LOW, errlSev );
 
-                PRDF_HW_ADD_PROC_CALLOUT(HWAS::EPUB_PRC_LVL_SUPP,
-                                         MRU_LOW,
-                                         iv_errl,
-                                         errlSev);
+                PRDF_HW_ADD_PROC_CALLOUT( LEVEL2_SUPPORT, MRU_LOW, iv_errl,
+                                          errlSev );
 
                 SecondLevel = true;
             }
diff --git a/src/usr/diag/prdf/common/prdfMain_common.C b/src/usr/diag/prdf/common/prdfMain_common.C
@@ -241,7 +241,7 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
         // we are not going to do an analysis - so fill out the Service Data
         (serviceData.GetErrorSignature())->setSigId(rc);
         serviceData.SetCallout(SP_CODE);
-        serviceData.SetCallout( NextLevelSupport_ENUM, MRU_LOW );
+        serviceData.SetCallout( LEVEL2_SUPPORT, MRU_LOW );
         serviceData.SetThresholdMaskId(0); // Sets AT_THRESHOLD, DEGRADED,
                                            // SERVICE_CALL
     }
@@ -313,7 +313,7 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
             (serviceData.GetErrorSignature())->setErrCode(
                                                     (uint16_t)analyzeRc );
             serviceData.SetCallout(SP_CODE);
-            serviceData.SetCallout( NextLevelSupport_ENUM, MRU_LOW );
+            serviceData.SetCallout( LEVEL2_SUPPORT, MRU_LOW );
             serviceData.setServiceCall();
             // We don't want to gard unless we have a good
             // return code
@@ -324,14 +324,12 @@ errlHndl_t main( ATTENTION_VALUE_TYPE i_attentionType,
     if(g_prd_errlHndl != NULL)
     {
         PRDF_INF("PRDTRACE: PrdMain: g_prd_errlHndl != NULL");
-        PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED,
-                                    HWAS::EPUB_PRC_SP_CODE );
+        PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED, SP_CODE );
         // This is a precautionary step. There is a possibilty that if
         // severity for g_prd_errlHndl is Predictve and there is only
-        // EPUB_PRC_SP_CODE callout than it will be changed to tracing event.
-        // So adding EPUB_PRC_LVL_SUPP to avoid this.
-        PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_LOW,
-                                    HWAS::EPUB_PRC_LVL_SUPP );
+        // SP_CODE callout than it will be changed to tracing event.
+        // So adding LEVEL2_SUPPORT to avoid this.
+        PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_LOW, LEVEL2_SUPPORT );
 
         // This forces any previous errls to be committed
         g_prd_errlHndl = NULL;
diff --git a/src/usr/diag/prdf/common/util/prdfAssert.C b/src/usr/diag/prdf/common/util/prdfAssert.C
@@ -85,7 +85,7 @@ void prdfAssert( const char * i_exp, const char * i_file, int i_line )
                      0,                           // user data word 3
                      PRD_ASSERT);                 // user data word 4
 
-    PRDF_ADD_PROCEDURE_CALLOUT(errl, MRU_MED, HWAS::EPUB_PRC_SP_CODE);
+    PRDF_ADD_PROCEDURE_CALLOUT(errl, MRU_MED, SP_CODE);
     PRDF_SET_RC(errl, PRD_ASSERT);
     PRDF_COLLECT_TRACE(errl, 256);
     PRDF_SET_TERM_STATE( errl );
diff --git a/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C b/src/usr/diag/prdf/common/util/prdfErrlSmartPtr.C
@@ -40,7 +40,7 @@ void ErrlSmartPtr::add_src()
     if (iv_errl)
     {
         PRDF_ADD_SW_ERR( iv_errl, 0, PRDF_ERRLSMARTPTR, __LINE__ );
-        PRDF_ADD_PROCEDURE_CALLOUT( iv_errl, MRU_MED, HWAS::EPUB_PRC_SP_CODE );
+        PRDF_ADD_PROCEDURE_CALLOUT( iv_errl, MRU_MED, SP_CODE );
     }
 }
 
diff --git a/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C b/src/usr/diag/prdf/plat/mem/prdfMemTdCtlr.C
@@ -138,7 +138,7 @@ uint32_t MemTdCtlr<T>::handleCmdComplete( STEP_CODE_DATA_STRUCT & io_sc )
                                           PRDFSIG_CmdComplete_ERROR );
 
         // Something definitely failed, so callout 2nd level support.
-        io_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_HIGH );
+        io_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_HIGH );
         io_sc.service_data->setServiceCall();
 
         #ifndef __HOSTBOOT_RUNTIME // IPL only
diff --git a/src/usr/diag/prdf/plat/mem/prdfP9Mcbist.C b/src/usr/diag/prdf/plat/mem/prdfP9Mcbist.C
@@ -220,7 +220,7 @@ int32_t CmdCompleteDd1Workaround( ExtensibleChip * i_mcbChip,
         io_sc.service_data->SetErrorSig( PRDFSIG_CmdComplete_ERROR );
 
         // Something definitely failed, so callout 2nd level support.
-        io_sc.service_data->SetCallout( NextLevelSupport_ENUM, MRU_HIGH );
+        io_sc.service_data->SetCallout( LEVEL2_SUPPORT, MRU_HIGH );
         io_sc.service_data->setServiceCall();
 
         // Tell MDIA to skip further analysis on this target.
diff --git a/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C b/src/usr/diag/prdf/plat/pegasus/prdfDramRepairs.C
@@ -100,7 +100,7 @@ void commitSoftError( uint32_t i_reasonCode, TargetHandle_t i_mba,
     if ( i_analysisErrors )
     {
         errlHndl_t errl = createErrl( i_reasonCode, i_mba, i_signature );
-        errl->addProcedureCallout( HWAS::EPUB_PRC_LVL_SUPP, MRU_HIGH);
+        errl->addProcedureCallout( LEVEL2_SUPPORT, MRU_HIGH);
         commitErrl( errl, i_mba );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -177,8 +177,7 @@ uint32_t SYSTEM_DEBUG_CLASS::Reinitialize(const AttnList & i_attnList)`
`177`	`177`	`0, // user data word 3`
`178`	`178`	`0 ); // user data word 4`
`179`	`179`
`180`		`- PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED,`
`181`		`- HWAS::EPUB_PRC_SP_CODE );`
	`180`	`+ PRDF_ADD_PROCEDURE_CALLOUT( g_prd_errlHndl, MRU_MED, SP_CODE );`
`182`	`181`	`l_rc = PRD_ATTN_DATA_ACCESS_FAILED;`
`183`	`182`
`184`	`183`	`break;`
`@@ -330,7 +329,7 @@ void SYSTEM_DEBUG_CLASS::CalloutThoseAtAttention(`
`330`	`329`	`capture.Add(PlatServices::getSystemTarget(),0,cbs);`
`331`	`330`	`}`
`332`	`331`
`333`		`- sdc->SetCallout(NextLevelSupport_ENUM, MRU_HIGH);`
	`332`	`+ sdc->SetCallout(LEVEL2_SUPPORT, MRU_HIGH);`
`334`	`333`	`}`
`335`	`334`
`336`	`335`	`// -------------------------------------------------------------------`
Original file line number	Diff line number	Diff line change
`@@ -279,13 +279,13 @@ int32_t PllDomain::Analyze(STEP_CODE_DATA_STRUCT & serviceData,`
`279`	`279`	`{`
`280`	`280`	`PRDF_ERR( PRDF_FUNC "Unexpected PCI osc failover detected" );`
`281`	`281`	`mskErrType \|= PCI_OSC_FAILOVER;`
`282`		`- serviceData.service_data->SetCallout( NextLevelSupport_ENUM, MRU_LOW );`
	`282`	`+ serviceData.service_data->SetCallout( LEVEL2_SUPPORT, MRU_LOW );`
`283`	`283`	`}`
`284`	`284`	`if (sysRefFoList.size() > 0)`
`285`	`285`	`{`
`286`	`286`	`PRDF_ERR( PRDF_FUNC "Unexpected Sys osc failover detected" );`
`287`	`287`	`mskErrType \|= SYS_OSC_FAILOVER;`
`288`		`- serviceData.service_data->SetCallout( NextLevelSupport_ENUM, MRU_LOW );`
	`288`	`+ serviceData.service_data->SetCallout( LEVEL2_SUPPORT, MRU_LOW );`
`289`	`289`	`}`
`290`	`290`
`291`	`291`	`if (serviceData.service_data->IsAtThreshold())`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#`
`6`	`6`	`# OpenPOWER HostBoot Project`
`7`	`7`	`#`
`8`		`-# Contributors Listed Below - COPYRIGHT 2012,2015`
	`8`	`+# Contributors Listed Below - COPYRIGHT 2012,2017`
`9`	`9`	`# [+] International Business Machines Corp.`
`10`	`10`	`#`
`11`	`11`	`#`
`@@ -521,7 +521,7 @@ group gIoaFir filter singlebit,`
`521`	`521`	`/** Callout the ABUS 0 interface */`
`522`	`522`	`actionclass calloutAbus0Interface`
`523`	`523`	`{`
`524`		`- callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);`
	`524`	`+ callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);`
`525`	`525`	`callout(connected(TYPE_ABUS, 0), MRU_MEDA);`
`526`	`526`	`callout(connected_peer(TYPE_ABUS, 0), MRU_MEDA);`
`527`	`527`	`funccall("calloutInterface_abus0");`
`@@ -530,7 +530,7 @@ actionclass calloutAbus0Interface`
`530`	`530`	`/** Callout the ABUS 1 interface */`
`531`	`531`	`actionclass calloutAbus1Interface`
`532`	`532`	`{`
`533`		`- callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);`
	`533`	`+ callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);`
`534`	`534`	`callout(connected(TYPE_ABUS, 1), MRU_MEDA);`
`535`	`535`	`callout(connected_peer(TYPE_ABUS, 1), MRU_MEDA);`
`536`	`536`	`funccall("calloutInterface_abus1");`
`@@ -539,7 +539,7 @@ actionclass calloutAbus1Interface`
`539`	`539`	`/** Callout the ABUS 2 interface */`
`540`	`540`	`actionclass calloutAbus2Interface`
`541`	`541`	`{`
`542`		`- callout(procedure(PassiveFabric_OffNode_ENUM), MRU_MED);`
	`542`	`+ callout(procedure(FAB_BUS_OFF_NODE), MRU_MED);`
`543`	`543`	`callout(connected(TYPE_ABUS, 2), MRU_MEDA);`
`544`	`544`	`callout(connected_peer(TYPE_ABUS, 2), MRU_MEDA);`
`545`	`545`	`funccall("calloutInterface_abus2");`
Original file line number	Diff line number	Diff line change
`@@ -1155,7 +1155,7 @@ int32_t internalTimeout( ExtensibleChip * i_mbChip,`
`1155`	`1155`	`else`
`1156`	`1156`	`{`
`1157`	`1157`	`// Make the callout of the external timeout error.`
`1158`		`- i_sc.service_data->SetCallout( NextLevelSupport_ENUM,`
	`1158`	`+ i_sc.service_data->SetCallout( LEVEL2_SUPPORT,`
`1159`	`1159`	`MRU_MED, NO_GARD );`
`1160`	`1160`	`}`
`1161`	`1161`	`}`