From 1a6584dc8d8e064c0fd2152cd9135e7ddf07de8a Mon Sep 17 00:00:00 2001
From: Abhishek Agarwal <abagarw8@in.ibm.com>
Date: Tue, 29 Nov 2016 10:56:41 +0100
Subject: getecid update for DD fix level

Change-Id: I3361fb49591e733b765f92b357abcb9247ae9530
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33097
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Soma Bhanutej <soma.bhanu@in.ibm.com>
Reviewed-by: SRINIVAS V. POLISETTY <srinivan@in.ibm.com>
Reviewed-by: PARVATHI RACHAKONDA <prachako@in.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/33101
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/import/chips/p9/procedures/hwp/perv/p9_getecid.C | 17 ++++++++++-------
 src/import/chips/p9/procedures/hwp/perv/p9_getecid.H |  4 ++++
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'src/import/chips/p9')

diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_getecid.C b/src/import/chips/p9/procedures/hwp/perv/p9_getecid.C
index 880ff2e50..f293525c8 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_getecid.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_getecid.C
@@ -36,13 +36,8 @@
 //------------------------------------------------------------------------------
 
 
-//## auto_generated
 #include "p9_getecid.H"
-//## auto_generated
-#include "p9_const_common.H"
 
-#include <p9_perv_scom_addresses.H>
-#include <p9_perv_scom_addresses_fld.H>
 #include <p9_misc_scom_addresses.H>
 #include <p9_misc_scom_addresses_fld.H>
 #include <p9_const_common.H>
@@ -54,22 +49,30 @@ fapi2::ReturnCode p9_getecid(const
     uint64_t attr_data[2];
     fapi2::buffer<uint64_t> l_ecid_part0_data64 = 0;
     fapi2::buffer<uint64_t> l_ecid_part1_data64 = 0;
+    fapi2::buffer<uint64_t> l_ecid_part2_data64 = 0;
+    fapi2::variable_buffer l_fuseString(fuseString_len);
     FAPI_INF("Entering ...");
 
 
     FAPI_DBG("extract and manipulate ECID data");
     FAPI_TRY(fapi2::getScom(i_target_chip, PU_OTPROM0_ECID_PART0_REGISTER, l_ecid_part0_data64));
     FAPI_TRY(fapi2::getScom(i_target_chip, PU_OTPROM0_ECID_PART1_REGISTER, l_ecid_part1_data64));
+    FAPI_TRY(fapi2::getScom(i_target_chip, PU_OTPROM0_ECID_PART2_REGISTER, l_ecid_part2_data64));
 
     l_ecid_part0_data64.reverse();
     l_ecid_part1_data64.reverse();
+    l_ecid_part2_data64.reverse();
 
     attr_data[0] = l_ecid_part0_data64();
     attr_data[1] = l_ecid_part1_data64();
 
-    FAPI_TRY(o_fuseString.insert(l_ecid_part0_data64(), 0, 64));
+    FAPI_TRY(l_fuseString.insert(l_ecid_part0_data64(), 0, 64));
 
-    FAPI_TRY(o_fuseString.insert(l_ecid_part1_data64(), 64, 48));
+    FAPI_TRY(l_fuseString.insert(l_ecid_part1_data64(), 64, 64));
+
+    FAPI_TRY(l_fuseString.insert(l_ecid_part2_data64(), 128, 48));
+
+    o_fuseString = l_fuseString;
 
     FAPI_DBG("push fuse string into attribute");
 
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_getecid.H b/src/import/chips/p9/procedures/hwp/perv/p9_getecid.H
index b746e80e2..a1471ca91 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_getecid.H
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_getecid.H
@@ -42,6 +42,10 @@
 
 #include <fapi2.H>
 
+enum P9_GETECID_Private_Constants
+{
+    fuseString_len = 176 // fuse string length
+};
 
 typedef fapi2::ReturnCode (*p9_getecid_FP_t)(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
         fapi2::variable_buffer& fuseString);
-- 
cgit v1.2.1