SW291385: MPV:STC830:Alpine-IPL Power BUS erepair fails to restore vpd

CQ:SW291385
Change-Id: I9b3be33e74981ba319d73d8a8a041642a30bf66c
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16272
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/16351
Tested-by: Jenkins Server
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 7 insertions, 8 deletions

diff --git a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
index 33ec195a1..8fc24cc61 100644
--- a/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
+++ b/src/usr/hwpf/hwp/bus_training/erepairGetFailedLanesHwp.C
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: erepairGetFailedLanesHwp.C,v 1.4 2014/08/05 15:04:38 kahnevan Exp $
+// $Id: erepairGetFailedLanesHwp.C,v 1.10 2015/03/13 05:14:40 bilicon Exp $
 /**
  *  @file erepairGetFailedLanesHwp.C
  *
@@ -490,19 +490,14 @@ fapi::ReturnCode determineRepairLanes(const fapi::Target   &i_tgtHandle,
                                                 i_tgtHandle,
                                                 l_mcsTarget,
                                                 fapi::TARGET_STATE_FUNCTIONAL);
-
                 if(l_rc)
                 {
                     FAPI_ERR("determineRepairLanes: Unable to get the connected"
                              " MCS target");
                     break;
                 }
-
                 l_tgtHandle = l_mcsTarget;
-            }
 
-            if(l_tgtType == fapi::TARGET_TYPE_MEMBUF_CHIP)
-            {
                 // Check whether we have Memory on a CDIMM
                 l_rc = getDimmType(i_tgtHandle, l_customDimm);
 
@@ -543,7 +538,8 @@ fapi::ReturnCode determineRepairLanes(const fapi::Target   &i_tgtHandle,
                 // only for systems with ISDIMM because in the ISDIMM systems
                 // the Lane eRepair data for multiple Centaurs is maintained in
                 // a common VPD.
-                if((l_customDimm != fapi::ENUM_ATTR_SPD_CUSTOM_YES) &&
+                if((l_tgtType == fapi::TARGET_TYPE_MEMBUF_CHIP)     &&
+                   (l_customDimm != fapi::ENUM_ATTR_SPD_CUSTOM_YES) &&
                    (l_chipPosition != l_memBus->device.proc_centaur_id))
                 {
                     continue;
@@ -618,11 +614,14 @@ fapi::ReturnCode getDimmType(const fapi::Target &i_tgtHandle,
 
     do
     {
+        o_customDimm = fapi::ENUM_ATTR_SPD_CUSTOM_NO;
+
         // Get the connected MBA chiplet and determine whether we have CDIMM
         l_rc = fapiGetChildChiplets(i_tgtHandle,
                                     fapi::TARGET_TYPE_MBA_CHIPLET,
                                     l_mbaChiplets,
                                     fapi::TARGET_STATE_FUNCTIONAL);
+
         if(l_rc || (0 == l_mbaChiplets.size()))
         {
             FAPI_ERR("Error (0x%x) during get child MBA targets",
diff --git a/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C b/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
index b0724f903..ad5af4beb 100755
--- a/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
+++ b/src/usr/hwpf/hwp/bus_training/erepairSetFailedLanesHwp.C
@@ -22,7 +22,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 $
+// $Id: erepairSetFailedLanesHwp.C,v 1.5 2015/02/23 16:46:15 bilicon Exp $
 /**
  *  @file erepairSetFailedLanesHwp.C
  *