Update OCC,PBA,CME FIR handling based on the recent RAS specification

Change-Id: I4950c75c65563229c7a6831c63e375a9c4823f2f
RTC: 158180
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27978
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Brian T. Vanderpool <vanderp@us.ibm.com>
Reviewed-by: Gregory S. Still <stillgs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27980
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

3 files changed, 132 insertions, 133 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_cme_firinit.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_cme_firinit.C
index d84293d1f..c741b9a12 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_cme_firinit.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_cme_firinit.C
@@ -72,8 +72,8 @@ enum CME_FIRS
     PPE_DBGTRG,          // 6
     CME_SRAM_UE,         // 7
     CME_SRAM_CE,         // 8
-    BCE_ERR,             // 9
-    SRAM_SCRUB_ERR,      // 10
+    SRAM_SCRUB_ERR,      // 9
+    BCE_ERR,             // 10
     CME_SPARE_11,        // 11
     CME_SPARE_12,        // 12
     C0_iVRM_DPOUT,       // 13
@@ -158,6 +158,9 @@ fapi2::ReturnCode pm_cme_fir_init(
     {
         p9pmFIR::PMFir <p9pmFIR::FIRTYPE_CME_LFIR> l_cmeFir(l_ex_chplt);
 
+        FAPI_TRY(l_cmeFir.get(p9pmFIR::REG_ALL),
+                 "ERROR: Failed to get the CME FIR values");
+
         /* Clear the FIR and action buffers */
         FAPI_TRY(l_cmeFir.clearAllRegBits(p9pmFIR::REG_FIR),
                  "ERROR: Failed to clear CME FIR");
@@ -167,38 +170,40 @@ fapi2::ReturnCode pm_cme_fir_init(
                  "ERROR: Failed to clear CME FIR");
 
         /*  Set the action and mask for the CME LFIR bits */
-        FAPI_TRY(l_cmeFir.setRecvIntr(PPE_INT_ERR),
-                 "ERROR: Failed to set recovery on interrupt");
-        FAPI_TRY(l_cmeFir.setRecvIntr(PPE_EXT_ERR),
-                 "ERROR: Failed to set recovery on interrupt");
-        FAPI_TRY(l_cmeFir.setRecvIntr(PPE_PROG_ERR),
-                 "ERROR: Failed to set recovery on interrupt");
-        FAPI_TRY(l_cmeFir.setRecvIntr(PPE_BRKPT_ERR),
-                 "ERROR: Failed to set recovery on interrupt");
+        FAPI_TRY(l_cmeFir.mask(PPE_INT_ERR), "ERROR: Failed to mask");
+        FAPI_TRY(l_cmeFir.mask(PPE_EXT_ERR), "ERROR: Failed to mask");
+        FAPI_TRY(l_cmeFir.mask(PPE_PROG_ERR), "ERROR: Failed to mask");
+        FAPI_TRY(l_cmeFir.mask(PPE_BRKPT_ERR), "ERROR: Failed to mask");
         FAPI_TRY(l_cmeFir.mask(PPE_WATCHDOG), "ERROR: Failed to mask");
         FAPI_TRY(l_cmeFir.mask(PPE_HALT), "ERROR: Failed to mask");
         FAPI_TRY(l_cmeFir.mask(PPE_DBGTRG), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.setRecvIntr(CME_SRAM_UE),
-                 "ERROR: Failed to set recovery on interrupt");
-        FAPI_TRY(l_cmeFir.mask(CME_SRAM_CE), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.setRecvIntr(BCE_ERR),
+        FAPI_TRY(l_cmeFir.setRecvAttn(CME_SRAM_UE),
                  "ERROR: Failed to set recovery on interrupt");
+        FAPI_TRY(l_cmeFir.setRecvAttn(CME_SRAM_CE),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(SRAM_SCRUB_ERR),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.mask(BCE_ERR), "ERROR: Failed to mask");
         FAPI_TRY(l_cmeFir.mask(CME_SPARE_11), "ERROR: Failed to mask");
         FAPI_TRY(l_cmeFir.mask(CME_SPARE_12), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.setRecvAttn(CME_FIR_PAR_ERR_DUP),
-                 "ERROR: Failed to set the attention as recoverable");
-        FAPI_TRY(l_cmeFir.setRecvAttn(CME_FIR_PAR_ERR),
-                 "ERROR: Failed to set the attention as recoverable");
+        FAPI_TRY(l_cmeFir.setRecvAttn(C0_iVRM_DPOUT),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(C1_iVRM_DPOUT),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(CACHE_iVRM_DPOUT),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(EXTRM_DROOP_ERR),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(LARGE_DROOP_ERR),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(SMALL_DROOP_ERR),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.setRecvAttn(UNEXP_DROOP_ENCODE),
+                 "ERROR: Failed to set recoverable error");
+        FAPI_TRY(l_cmeFir.mask(CME_FIR_PAR_ERR_DUP), "ERROR: Failed to mask");
+        FAPI_TRY(l_cmeFir.mask(CME_FIR_PAR_ERR), "ERROR: Failed to mask");
 
         //todo: Yet to confirm on the action for the following bits
-        FAPI_TRY(l_cmeFir.mask(SRAM_SCRUB_ERR), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(C0_iVRM_DPOUT), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(C1_iVRM_DPOUT), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(CACHE_iVRM_DPOUT), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(EXTRM_DROOP_ERR), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(LARGE_DROOP_ERR), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(SMALL_DROOP_ERR), "ERROR: Failed to mask");
-        FAPI_TRY(l_cmeFir.mask(UNEXP_DROOP_ENCODE), "ERROR: Failed to mask");
 
         if (l_firinit_done_flag)
         {
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_occ_firinit.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_occ_firinit.C
index c26cfaff9..a811008b8 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_occ_firinit.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_occ_firinit.C
@@ -232,7 +232,7 @@ fapi2::ReturnCode pm_occ_fir_init(
     FAPI_TRY(l_occFir.setMalfAlert(CME_ERR_NOTIFY),
              "ERROR: Failed to set Malf alert");
     FAPI_TRY(l_occFir.setRecvAttn(STOP_RCV_NOTIFY_PRD),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setMalfAlert(OCC_HB_NOTIFY),
              "ERROR: Failed to set Malf alert");
     FAPI_TRY(l_occFir.mask(GPE0_WD_TIMEOUT),
@@ -243,32 +243,32 @@ fapi2::ReturnCode pm_occ_fir_init(
              "ERROR: Failed to set Malf alert");
     FAPI_TRY(l_occFir.mask(GPE3_WD_TIMEOUT),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(GPE0_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(GPE1_ERR),
-             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_occFir.setRecvAttn(GPE0_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(GPE1_ERR),
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvIntr(GPE2_ERR),
-             "ERROR: Failed to set recovery interrupt");
+             "ERROR: Failed to set recovery on interrupt");
     FAPI_TRY(l_occFir.setMalfAlert(GPE3_ERR),
              "ERROR: Failed to set Malf alert");
     FAPI_TRY(l_occFir.mask(OCB_ERR),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_UE),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_CE),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_READ_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_WRITE_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_DATAOUT_PERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_OCI_WDATA_PARITY),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_OCI_BE_PARITY_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRT_OCI_ADDR_PARITY_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.mask(GPE0_HALTED),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_occFir.mask(GPE1_HALTED),
@@ -289,76 +289,70 @@ fapi2::ReturnCode pm_occ_fir_init(
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_occFir.mask(PPC405_DBGSTOPACK),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_DB_OCI_TIMEOUT),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_DB_OCI_RDATA_PARITY),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_DB_OCI_SLVERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_PIB_ADDR_PARITY_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_DB_PIB_DATA_PARITY_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_IDC0_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_IDC1_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_IDC2_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(OCB_IDC3_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(SRT_FSM_ERR),
-             "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(JTAGACC_ERR),
-             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_DB_OCI_TIMEOUT),
+             "ERROR: Failed to set recoverable atention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_DB_OCI_RDATA_PARITY),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_DB_OCI_SLVERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_PIB_ADDR_PARITY_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_DB_PIB_DATA_PARITY_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_IDC0_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_IDC1_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_IDC2_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(OCB_IDC3_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(SRT_FSM_ERR),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(JTAGACC_ERR),
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.mask(SPARE_ERR_38),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_occFir.setRecvAttn(C405_ECC_UE),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_occFir.mask(C405_ECC_CE),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.mask(C405_OCI_MC_CHK),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_occFir.setRecvAttn(C405_ECC_UE),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(C405_ECC_CE),
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(C405_OCI_MC_CHK),
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRAM_SPARE_DIRERR0),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRAM_SPARE_DIRERR1),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRAM_SPARE_DIRERR2),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(SRAM_SPARE_DIRERR3),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(GPE0_OCISLV_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(GPE1_OCISLV_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(GPE2_OCISLV_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(GPE3_OCISLV_ERR),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(C405ICU_M_TIMEOUT),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
+    FAPI_TRY(l_occFir.setRecvAttn(C405DCU_M_TIMEOUT),
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(OCC_CMPLX_FAULT),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_occFir.mask(OCC_CMPLX_NOTIFY),
-             "ERROR: Failed to mask bit");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.setRecvAttn(OCC_CMPLX_NOTIFY),
-             "ERROR: Failed to set recovery attention");
+             "ERROR: Failed to set recoverable attention");
     FAPI_TRY(l_occFir.mask(SPARE_59),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.setRecvAttn(SPARE_59),
-             "ERROR: Failed to set recovery attention");
     FAPI_TRY(l_occFir.mask(SPARE_60),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.setRecvAttn(SPARE_60),
-             "ERROR: Failed to set recovery attention");
     FAPI_TRY(l_occFir.mask(SPARE_61),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_occFir.setRecvAttn(SPARE_61),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_occFir.setRecvAttn(FIR_PARITY_ERR_DUP),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_occFir.setRecvAttn(FIR_PARITY_ERR),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_occFir.mask(FIR_PARITY_ERR_DUP),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_occFir.mask(FIR_PARITY_ERR),
+             "ERROR: Failed to mask bit");
 
     if (firinit_done_flag)
     {
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_firinit.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_firinit.C
index 5acaab16e..b01e33b0a 100644
--- a/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_firinit.C
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_pba_firinit.C
@@ -201,38 +201,38 @@ fapi2::ReturnCode pm_pba_fir_init(
              "ERROR: Failed to clear PBA FIR");
 
     /*  Set the action and mask for the PBA LFIR bits */
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_OCI_APAR_ERR),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_RDADRERR_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_RDDATATO_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_SUE_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_UE_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_CE_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_OCI_SLAVE_INIT),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_OCI_WRPAR_ERR),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_OCI_APAR_ERR),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_RDADRERR_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_RDDATATO_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_SUE_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_UE_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_CE_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_OCI_SLAVE_INIT),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_OCI_WRPAR_ERR),
+             "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_OCI_REREQTO),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_UNEXPCRESP),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_UNEXPDATA),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_PARITY_ERR),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_WRADRERR_FW),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_BADCRESP),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_ACKDEAD_FW_RD),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_CRESPTO),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_UNEXPCRESP),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_UNEXPDATA),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_PARITY_ERR),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_WRADRERR_FW),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_BADCRESP),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_ACKDEAD_FW_RD),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_CRESPTO),
+             "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_BCUE_SETUP_ERR),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_BCUE_PB_ACK_DEAD),
@@ -257,12 +257,12 @@ fapi2::ReturnCode pm_pba_fir_init(
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_BCDE_OCI_DATERR),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_INTERNAL_ERR),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_ILLEGAL_CACHE_OP),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_OCI_BAD_REG_ADDR),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_INTERNAL_ERR),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_ILLEGAL_CACHE_OP),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_OCI_BAD_REG_ADDR),
+             "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_AXPUSH_WRERR),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_AXRCV_DLO_ERR),
@@ -281,18 +281,18 @@ fapi2::ReturnCode pm_pba_fir_init(
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_AXSND_RSVERR),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_PB_ACKDEAD_FW_WR),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_PB_ACKDEAD_FW_WR),
+             "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_RESERVED_41),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_RESERVED_42),
              "ERROR: Failed to mask bit");
     FAPI_TRY(l_pbaFir.mask(PBAFIR_RESERVED_43),
              "ERROR: Failed to mask bit");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_FIR_PARITY_ERR2),
-             "ERROR: Failed to set recovery attention");
-    FAPI_TRY(l_pbaFir.setRecvAttn(PBAFIR_FIR_PARITY_ERR),
-             "ERROR: Failed to set recovery attention");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_FIR_PARITY_ERR2),
+             "ERROR: Failed to mask bit");
+    FAPI_TRY(l_pbaFir.mask(PBAFIR_FIR_PARITY_ERR),
+             "ERROR: Failed to mask bit");
 
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PM_FIRINIT_DONE_ONCE_FLAG,
                            i_target, firinit_done_flag),