Erepair HWP p9_io_erepairAccessorHwpFuncs

- Added code when Erepair disabled shouldn't be treated as an error

Change-Id: I1173b32031fad90c985fbd91b05ca5cb96027f11
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50489
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/50492
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>

1 files changed, 16 insertions, 14 deletions

diff --git a/src/import/chips/p9/procedures/hwp/io/p9_io_erepairAccessorHwpFuncs.C b/src/import/chips/p9/procedures/hwp/io/p9_io_erepairAccessorHwpFuncs.C
index 6fce652b5..4646a3a92 100755
--- a/src/import/chips/p9/procedures/hwp/io/p9_io_erepairAccessorHwpFuncs.C
+++ b/src/import/chips/p9/procedures/hwp/io/p9_io_erepairAccessorHwpFuncs.C
@@ -274,13 +274,14 @@ fapi2::ReturnCode erepairGetRestoreLanes(
                     .set_TARGET2(l_endp2_tgtType),
                     "ERROR:erepairGetRestoreLanes: Invalid endpoint target pair");
 
-        // Fabric eRepair has been disabled using the
-        // Manufacturing policy flags
-        FAPI_ASSERT(!(l_mnfgModeIPL && l_disableFabricERepair),
-                    fapi2::P9_EREPAIR_RESTORE_FABRIC_DISABLED()
-                    .set_VALUE1(l_mnfgModeIPL)
-                    .set_VALUE2(l_disableFabricERepair),
-                    "ERROR:erepairGetRestoreLanes: Fabric eRepair is disabled");
+        // Check for enablement of Fabric eRepair
+        if(l_mnfgModeIPL && l_disableFabricERepair)
+        {
+            // Fabric eRepair has been disabled using the
+            // Manufacturing policy flags
+            FAPI_INF("erepairGetRestoreLanes: Fabric eRepair is disabled");
+            goto fapi_try_exit;
+        }
     }
     else if(l_endp1_tgtType == fapi2::TARGET_TYPE_MCS_CHIPLET ||
             l_endp1_tgtType == fapi2::TARGET_TYPE_MEMBUF_CHIP)
@@ -294,13 +295,14 @@ fapi2::ReturnCode erepairGetRestoreLanes(
                      .set_TARGET2(l_endp2_tgtType),
                      "ERROR:erepairGetRestoreLanes: Invalid endpoint target pair");
 
-        // Memory eRepair has been disabled using the
-        // Manufacturing policy flags
-        FAPI_ASSERT(!(l_mnfgModeIPL && l_disableMemoryERepair),
-                    fapi2::P9_EREPAIR_RESTORE_MEMORY_DISABLED()
-                    .set_VALUE1(l_mnfgModeIPL)
-                    .set_VALUE2(l_disableMemoryERepair),
-                    "ERROR:erepairGetRestoreLanes: Memory eRepair is disabled");
+        // Check for enablement of Memory eRepair
+        if(l_mnfgModeIPL && l_disableMemoryERepair)
+        {
+            // Memory eRepair has been disabled using the
+            // Manufacturing policy flags
+            FAPI_INF("erepairGetRestoreLanes: Memory eRepair is disabled");
+            goto fapi_try_exit;
+        }
     }
 
     if(l_mnfgModeIPL)