Centaur VPD Attributes: Version, 2N_Mode_Enabled, and Address Mirroring

ATTR_VPD_VERSION - add attribute and hwp accessor to return Record VINI
Keyword VZ
ATTR_VPD_DRAM_2N_MODE_ENABLED - add attribute and new HWP accessor using
MR hwp accessor to retrieve DRAM_2N_MODE.
ATTR_VPD_DRAM_ADDRESS_MIRRORING - Change from DIMM to MBA target

Change-Id: I05875c5e89966906a928d3c82925e33507962db9
RTC: 89859
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/6949
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

1 files changed, 11 insertions, 23 deletions

diff --git a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
index da1c3b5bd..365986955 100644
--- a/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
+++ b/src/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.C
@@ -20,7 +20,7 @@
 /* Origin: 30                                                             */
 /*                                                                        */
 /* IBM_PROLOG_END_TAG                                                     */
-// $Id: getMBvpdTermData.C,v 1.4 2013/10/21 18:55:40 whs Exp $
+// $Id: getMBvpdTermData.C,v 1.6 2013/10/31 18:03:28 whs Exp $
 /**
  *  @file getMBvpdTermData.C
  *
@@ -35,6 +35,7 @@
 #include    <fapiUtil.H>
 #include    <getMBvpdTermData.H>
 #include    <getMBvpdPhaseRotatorData.H>
+#include    <getMBvpdVersion.H>
 
 // Used to ensure attribute enums are equal at compile time
 class Error_ConstantsDoNotMatch;
@@ -256,36 +257,23 @@ fapi::ReturnCode getMBvpdTermData(
         // Check if the old vpd layout is different for this attr
         if (TERM_DATA_CHK60 & i_attr) // need to check vpd version for this attr
         {
-            uint16_t l_vpdVersion = 0;
-            uint32_t l_bufSize = sizeof(l_vpdVersion);
-            const uint16_t VPD_VERSION_V60=0x3130; // Version 6.0 is ascii "10"
+            uint32_t l_vpdVersion = 0;
+            const uint32_t VPD_VERSION_V60=0x3130; // Version 6.0 is ascii "10"
+
+            // get vpd version
+            FAPI_EXEC_HWP(l_fapirc,
+                          getMBvpdVersion,
+                          i_mbaTarget,
+                          l_vpdVersion);
 
-            // get vpd version from record VINI keyword VZ
-            l_fapirc = fapiGetMBvpdField(fapi::MBVPD_RECORD_VINI,
-                                     fapi::MBVPD_KEYWORD_VZ,
-                                     l_mbTarget,
-                                     reinterpret_cast<uint8_t *>(&l_vpdVersion),
-                                     l_bufSize);
             if (l_fapirc)
             {
-                FAPI_ERR("getMBvpdTermData: Read of VZ keyword failed");
+                FAPI_ERR("getMBvpdTermData: getMBvpdVersion failed");
                 break;  //  break out with fapirc
             }
             FAPI_DBG("getMBvpdTermData: vpd version=0x%08x",
                 l_vpdVersion);
 
-            // Check that sufficient size was returned.
-            if (l_bufSize < sizeof(l_vpdVersion) )
-            {
-                FAPI_ERR("getMBvpdTermData:"
-                     " less keyword data returned than expected %d < %d",
-                       l_bufSize, sizeof(l_vpdVersion));
-                const uint32_t & KEYWORD = sizeof(l_vpdVersion);
-                const uint32_t & RETURNED_SIZE = l_bufSize;
-                FAPI_SET_HWP_ERROR(l_fapirc,RC_MBVPD_INSUFFICIENT_VPD_RETURNED);
-                break;  //  break out with fapirc
-            }
-
             // Check if work around needed
             if (l_vpdVersion < VPD_VERSION_V60)
             {