SW258709: Sync erepair FAPI code across FSP/eKB/Hostboot

Change-Id: I1de6583ec14c66dc894b67143eeb4b50a6ea7eea
CQ:SW258709
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11301
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Tested-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/11304
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 16 insertions, 10 deletions

diff --git a/src/usr/hwpf/hwp/bus_training/erepairAccessorHwpFuncs.C b/src/usr/hwpf/hwp/bus_training/erepairAccessorHwpFuncs.C
index 7c266035f..349d9817e 100644
--- a/src/usr/hwpf/hwp/bus_training/erepairAccessorHwpFuncs.C
+++ b/src/usr/hwpf/hwp/bus_training/erepairAccessorHwpFuncs.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -20,6 +20,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: erepairAccessorHwpFuncs.C,v 1.2 2014/04/29 11:58:49 bilicon Exp $
 /**
  *  @file erepairAccessorHwpFuncs.C
  *
@@ -483,7 +484,7 @@ fapi::ReturnCode erepairGetRestoreLanes(const fapi::Target &i_endp1_target,
         if(o_endp1_txFaillanes.size() > l_threshold)
         {
             l_thresholdExceed = true;
-            l_numTxFailLanes  = o_endp1_txFaillanes.size();
+            l_numTxFailLanes = o_endp1_txFaillanes.size();
 
             FAPI_ERR("erepairGetRestoreLanes: eRepair threshold exceed error"
                      " seen in Tx of endp1 target. No.of lanes: %d",
@@ -494,7 +495,7 @@ fapi::ReturnCode erepairGetRestoreLanes(const fapi::Target &i_endp1_target,
         if(o_endp1_rxFaillanes.size() > l_threshold)
         {
             l_thresholdExceed = true;
-            l_numRxFailLanes  = o_endp1_rxFaillanes.size();
+            l_numRxFailLanes = o_endp1_rxFaillanes.size();
 
             FAPI_ERR("erepairGetRestoreLanes: eRepair threshold exceed error"
                      " seen in Rx of endp1 target. No.of lanes: %d",
@@ -505,7 +506,7 @@ fapi::ReturnCode erepairGetRestoreLanes(const fapi::Target &i_endp1_target,
         if(o_endp2_txFaillanes.size() > l_threshold)
         {
             l_thresholdExceed = true;
-            l_numTxFailLanes  = o_endp2_txFaillanes.size();
+            l_numTxFailLanes = o_endp2_txFaillanes.size();
 
             FAPI_ERR("erepairGetRestoreLanes: eRepair threshold exceed error"
                      " seen in Tx of endp2 target. No.of lanes: %d",
@@ -516,7 +517,7 @@ fapi::ReturnCode erepairGetRestoreLanes(const fapi::Target &i_endp1_target,
         if(o_endp2_rxFaillanes.size() > l_threshold)
         {
             l_thresholdExceed = true;
-            l_numRxFailLanes  = o_endp2_rxFaillanes.size();
+            l_numRxFailLanes = o_endp2_rxFaillanes.size();
 
             FAPI_ERR("erepairGetRestoreLanes: eRepair threshold exceed error"
                      " seen in Rx of endp2 target. No.of lanes: %d",
diff --git a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
index 161c89af4..00302e06d 100644
--- a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
+++ b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* COPYRIGHT International Business Machines Corp. 2012,2014              */
+/* COPYRIGHT International Business Machines Corp. 2013,2014              */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
 /* you may not use this file except in compliance with the License.       */
@@ -20,6 +20,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: erepairGetFailedLanesHwp.C,v 1.3 2014/04/29 11:59:48 bilicon Exp $
 /**
  *  @file erepairGetFailedLanesHwp.C
  *
diff --git a/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C b/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
index dbd53b13a..575b09282 100755
--- a/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
+++ b/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
@@ -20,6 +20,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
+// $Id: erepairSetFailedLanesHwp.C,v 1.2 2014/04/30 09:45:40 bilicon Exp $
 /**
  *  @file erepairSetFailedLanesHwp.C
  *
@@ -296,7 +297,7 @@ ReturnCode writeRepairDataToVPD(const Target               &i_tgtHandle,
                ((i_vpdType == EREPAIR_VPD_FIELD) &&
                 (l_bufSize > EREPAIR_P8_MODULE_VPD_FIELD_SIZE)) ||
                ((i_vpdType == EREPAIR_VPD_MNFG) &&
-                 (l_bufSize > EREPAIR_P8_MODULE_VPD_MNFG_SIZE)))
+                (l_bufSize > EREPAIR_P8_MODULE_VPD_MNFG_SIZE)))
             {
                 FAPI_SET_HWP_ERROR(l_rc,
                                    RC_ACCESSOR_HWP_INVALID_FABRIC_VPD_SIZE);
@@ -384,7 +385,8 @@ ReturnCode writeRepairLanesToBuf(const Target               &i_tgtHandle,
 
             if(l_rc)
             {
-                FAPI_ERR("Error (0x%x), from updateRepairLanesToBuf(DRIVE)");
+                FAPI_ERR("Error (0x%x), from updateRepairLanesToBuf(DRIVE)",
+                          static_cast<uint32_t>(l_rc));
                 break;
             }
         }
@@ -400,7 +402,8 @@ ReturnCode writeRepairLanesToBuf(const Target               &i_tgtHandle,
 
             if(l_rc)
             {
-                FAPI_ERR("Error (0x%x), from updateRepairLanesToBuf(RECEIVE)");
+                FAPI_ERR("Error (0x%x), from updateRepairLanesToBuf(RECEIVE)",
+                          static_cast<uint32_t>(l_rc));
                 break;
             }
         }
@@ -431,7 +434,7 @@ ReturnCode updateRepairLanesToBuf(const Target               &i_tgtHandle,
     TargetType       l_tgtType              = TARGET_TYPE_NONE;
     Target           l_mcsTarget;
     Target           l_tgtHandle;
-    std::vector<const uint8_t>::iterator l_it;
+    std::vector<uint8_t>::const_iterator l_it;
     ATTR_CHIP_UNIT_POS_Type l_busNum;
 
     FAPI_DBG(">> updateRepairLanesToBuf, interface: %s",
diff --git a/src/usr/hwpf/hwp/bus_training/erepair_errors.xml b/src/usr/hwpf/hwp/bus_training/erepair_errors.xml
index f544773ee..43f39bd62 100644
--- a/src/usr/hwpf/hwp/bus_training/erepair_errors.xml
+++ b/src/usr/hwpf/hwp/bus_training/erepair_errors.xml
@@ -20,6 +20,7 @@
 <!-- permissions and limitations under the License.                         -->
 <!--                                                                        -->
 <!-- IBM_PROLOG_END_TAG                                                     -->
+<!-- $Id: erepair_errors.xml,v 1.3 2014/04/29 12:00:37 bilicon Exp $ -->
 <hwpErrors>
   <!-- ********************************************************************* -->
   <hwpError>