INITPROC: Hostboot - from defect SW223818 - High Priority week 9/10

Change-Id: Ia25ff3f1a518fb9b4333c4cec1dd6a6ef0797e2d
CQ:SW223818
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/6260
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 11 insertions, 11 deletions

diff --git a/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_draminit_training_advanced.C b/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_draminit_training_advanced.C
index fdd424e2a..c6372259a 100644
--- a/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_draminit_training_advanced.C
+++ b/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_draminit_training_advanced.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_draminit_training_advanced.C,v 1.36 2013/08/23 13:09:34 sasethur Exp $
+// $Id: mss_draminit_training_advanced.C,v 1.37 2013/09/04 08:50:49 lapietra Exp $
 /* File is created by SARAVANAN SETHURAMAN on Thur 29 Sept 2011. */
 
 //------------------------------------------------------------------------------
@@ -31,7 +31,7 @@
 // *! TITLE :mss_draminit_training_advanced.C
 // *! DESCRIPTION : Tools for centaur procedures
 // *! OWNER NAME : Saravanan Sethuraman          email ID:saravanans@in.ibm.com
-// *! BACKUP NAME: Mark D Bellows	 			 email ID:bellows@us.ibm.com
+// *! BACKUP NAME: Mark D Bellows	 	 email ID:bellows@us.ibm.com
 // #! ADDITIONAL COMMENTS :
 //
 // General purpose funcs
@@ -74,8 +74,9 @@
 //  1.32   | sasethur |04-Jun-13| Fixed for PortD cnfg, vref print for min setup, hold, fixed rdvref print, added set/reset mcbist attr
 //  1.33   | sasethur |12-Jun-13| Updated mcbist setup attribute 
 //  1.34   | sasethur |20-Jun-13| Fixed read_vref print, setup attribute
-//  1.35   | sasethur |08-Aug-13| Fixed fw comment.
+//  1.35   | sasethur |08-Aug-13| Fixed fw comment
 //  1.36   | sasethur |23-Aug-13| Ability to run MCBIST is enabled.
+//  1.37   | sasethur |04-Sep-13| Fixed fw review comment
 
 
 // This procedure Schmoo's DRV_IMP, SLEW, VREF (DDR, CEN), RCV_IMP based on attribute from effective config procedure
@@ -84,7 +85,7 @@
 // Internal Vref controlled by this function & external vref platform to provide function we return value
 
 // Not supported
-// DDR4, DIMM Types 
+// DDR4, DIMM Types
 //----------------------------------------------------------------------
 //  Includes - FAPI
 //----------------------------------------------------------------------
@@ -1053,8 +1054,7 @@ fapi::ReturnCode set_attribute(const fapi::Target & i_target_mba)
 {
    fapi::ReturnCode rc;
    uint8_t l_mcbist_setup_multiple_set = 1;  //Hard coded it wont change
-   FAPI_ATTR_SET(ATTR_SCHMOO_MULTIPLE_SETUP_CALL, &i_target_mba, l_mcbist_setup_multiple_set);
-   if (rc) return rc;
+   rc =  FAPI_ATTR_SET(ATTR_SCHMOO_MULTIPLE_SETUP_CALL, &i_target_mba, l_mcbist_setup_multiple_set);
    return rc;
 }
 
@@ -1067,8 +1067,7 @@ fapi::ReturnCode reset_attribute(const fapi::Target & i_target_mba)
 {
    fapi::ReturnCode rc;
    uint8_t l_mcbist_setup_multiple_reset = 0; //Hard coded it wont change
-   FAPI_ATTR_SET(ATTR_SCHMOO_MULTIPLE_SETUP_CALL, &i_target_mba, l_mcbist_setup_multiple_reset);
-   if (rc) return rc;
+   rc = FAPI_ATTR_SET(ATTR_SCHMOO_MULTIPLE_SETUP_CALL, &i_target_mba, l_mcbist_setup_multiple_reset);
    return rc;
 }
 
diff --git a/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_generic_shmoo.C b/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_generic_shmoo.C
index 028486e1c..182452a34 100644
--- a/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_generic_shmoo.C
+++ b/src/usr/hwpf/hwp/dram_training/mss_draminit_trainadv/mss_generic_shmoo.C
@@ -21,7 +21,7 @@
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
 
-// $Id: mss_generic_shmoo.C,v 1.66 2013/08/12 10:07:23 sasethur Exp $
+// $Id: mss_generic_shmoo.C,v 1.67 2013/09/04 09:21:33 sasethur Exp $
 // *!***************************************************************************
 // *! (C) Copyright International Business Machines Corp. 1997, 1998
 // *!           All Rights Reserved -- Property of IBM
@@ -40,6 +40,7 @@
 //------------------------------------------------------------------------------
 // Version:|Author: | Date:   | Comment:
 // --------|--------|---------|--------------------------------------------------
+//   1.67  |abhijit	|4-sep-13 | fixed fw comments for the host boot  
 //   1.65  |abhijit	|8-aug-13 | added binary schmoo first phase and modified training call 
 //   1.64  |abhijit	|17-jul-13| added rd dqs phase 2 
 //   1.63  |abhijit	|19-jun-13| fixed warnings in schmoo  
@@ -237,7 +238,7 @@ fapi::ReturnCode generic_shmoo::shmoo_save_rest(const fapi::Target & i_target,ui
 	if(i_mode == 0)
 	{
 		FAPI_INF(" Saving DP18 data bit direction register contents");
-		for(l_index = 0;l_index<9;l_index++)
+		for(l_index = 0;l_index<10;l_index++)
 		{ 	
 			l_value = l_Databitdir[l_index];
 			rc = fapiGetScom(i_target,l_value,l_shmoo1ab); if(rc) return rc;
@@ -252,7 +253,7 @@ fapi::ReturnCode generic_shmoo::shmoo_save_rest(const fapi::Target & i_target,ui
 	else if(i_mode == 1)
 	{
 		FAPI_INF(" Restoring DP18 data bit direction register contents");	
-		for(l_index = 0;l_index<9;l_index++)
+		for(l_index = 0;l_index<10;l_index++)
 		{ 	
 			l_val_u64 = i_content_array[l_index];
 			l_value = l_Databitdir[l_index];