SW293869: HWP: mss_get_cen_ecid.C and mss_get_cen_ecid_decode.C DD2 display bug

Change-Id: I21c20b2650c849ff88142d3f6c982a66a375286b
CQ:SW293869
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15983
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Tested-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16311
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 17 insertions, 8 deletions

diff --git a/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid.C b/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid.C
index dd699ab2e..3b32a46a5 100644
--- a/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid.C
+++ b/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_get_cen_ecid.C,v 1.37 2014/11/03 17:40:02 jprispol Exp $
+// $Id: mss_get_cen_ecid.C,v 1.41 2015/02/11 15:26:08 janssens Exp $
 //------------------------------------------------------------------------------
 // *|
 // *! (C) Copyright International Business Machines Corp. 2012
@@ -41,6 +41,10 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//   1.41  | janssens |11-FEB-15| Fixed compile bug
+//   1.40  | sglancy  |11-FEB-15| Fixed Firmware compile bug
+//   1.39  | sglancy  |10-FEB-15| Removed hardcoding of centaur version and removed erroneous FAPI_ERR statement
+//   1.38  | sglancy  |03-FEB-15| Fixed bugs surrounding the ATTR_CENTAUR_BLUEWATERFALL_NWELL_BROKEN_CHECK_FLAG update
 //   1.37  | jprispol |03-NOV-14| Moved bluewaterfall/nwell variable declarations
 //   1.36  | jprispol |28-OCT-14| Updated bluewaterfall/nwell broken attribute name
 //   1.34  | jprispol |24-OCT-14| Replaced privileged fapi attribute call
@@ -123,6 +127,10 @@ using namespace fapi;
         return rc;
     }
 
+    if(l_bluewaterfall_nwell_broken) ecid_struct.io_ec = 0x10;
+    else ecid_struct.io_ec = 0x20;
+    FAPI_INF("Centaur EC version 0x%02x",ecid_struct.io_ec);
+    
     if(ecid_struct.valid) {
 
       rc = mss_parse_ecid(ecid_struct.io_ecid,
@@ -244,7 +252,7 @@ using namespace fapi;
       FAPI_ERR("mss_get_cen_ecid: could not set ATTR_MSS_NWELL_MISPLACEMENT" );
       return rc;
     }
-
+    
    // mark HWP exit
     FAPI_IMP("Exiting mss_get_cen_ecid....");
     return rc;
diff --git a/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid_decode.C b/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid_decode.C
index 38d885778..8b34a8e1e 100644
--- a/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid_decode.C
+++ b/src/usr/hwpf/hwp/dmi_training/mss_getecid/mss_get_cen_ecid_decode.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2013,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2013,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -22,7 +22,7 @@
 /* permissions and limitations under the License.                         */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: mss_get_cen_ecid_decode.C,v 1.9 2014/02/19 13:41:29 bellows Exp $
+// $Id: mss_get_cen_ecid_decode.C,v 1.10 2015/02/03 15:08:48 sglancy Exp $
 //------------------------------------------------------------------------------
 // *|
 // *! (C) Copyright International Business Machines Corp. 2013
@@ -41,6 +41,7 @@
 //------------------------------------------------------------------------------
 // Version:|  Author: |  Date:  | Comment:
 //---------|----------|---------|-----------------------------------------------
+//   1.10  | sglancy  |03-FEB-15| Fixed bugs surrounding the ATTR_CENTAUR_BLUEWATERFALL_NWELL_BROKEN_CHECK_FLAG update
 //   1.9   | bellows  |17-FEB-14| RAS Review Comments
 //   1.8   | bellows  |14-OCT-13| One more sprintf update to make this hostboot/cronus agnostic
 //   1.7   | bellows  |08-OCT-13| Made update so it compiles with cronus + hostboot
@@ -128,12 +129,12 @@ extern "C" {
 
     if(i_user_info.io_ec < 0x20)
     {
-
       if(!i_user_info.o_nwell_misplacement) chip_version = 1.01;
       if(!i_user_info.o_bluewaterfall_broken) chip_version=1.10;
-
     }
-
+    else {
+       chip_version=2.00;
+    }
 
     if(!(i_user_info.i_user_defined & CSV))
     {