Changes for Brazos 2z/3z Support

This commit has the hostboot changes for Brazos 2z/3z support along with
some attributes that Hostboot and HWSV share.  It also contains memory
XML and HWP changes from SW305517 and SW305518.

Change-Id: I71896dfac6946624bed3e216fe7823bd73e8e6bc
RTC: 125037
CQ:SW305518
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19306
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Michael D. Pardeik <pardeik@us.ibm.com>
Reviewed-by: Michael Baiocchi <baiocchi@us.ibm.com>
Tested-by: Michael Baiocchi <baiocchi@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/19375
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Reviewed-by: WILLIAM G. HOFFA <wghoffa@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Tested-by: Jenkins OP HW
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 93 insertions, 2 deletions

diff --git a/src/include/usr/hwpf/hwpf_reasoncodes.H b/src/include/usr/hwpf/hwpf_reasoncodes.H
index f3d66de6c..e1a00da4a 100644
--- a/src/include/usr/hwpf/hwpf_reasoncodes.H
+++ b/src/include/usr/hwpf/hwpf_reasoncodes.H
@@ -79,6 +79,7 @@ namespace fapi
         MOD_GET_VER_ONE_VOLTAGE_BUCKET_DATA        = 0x25,
         MOD_PLAT_MVPD_GET_VLTG_BUCKET_ATTR         = 0x26,
         MOD_PLAT_ATTR_SVC_CEN_DQ_TO_DIMM_CONN_DQ   = 0x27,
+        MOD_PLAT_ATTR_SVC_GET_MEM_ATTR_DATA        = 0x28,
 
     };
 
@@ -137,6 +138,7 @@ namespace fapi
         RC_INVALID_PARAM              = HWPF_COMP_ID | 0x37,
         RC_DATA_MISMATCH              = HWPF_COMP_ID | 0x38,
         RC_DATA_NOT_SUPPORTED         = HWPF_COMP_ID | 0x39,
+        RC_NO_SINGLE_NODE             = HWPF_COMP_ID | 0x3A,
     };
 
     /**
diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
index 58efade6f..38ea06355 100644
--- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
+++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
@@ -795,6 +795,20 @@ fapi::ReturnCode fapiPlatGetTpVitlSpyLengthAttr(
 fapi::ReturnCode fapiPlatGetTpVitlSpyOffsetAttr(
                                const fapi::Target * i_pProcTarget,
                                uint32_t (&o_data)[SPY_OFFSET_SIZE]);
+/*
+ * @brief This function is called by the FAPI_ATTR_GET macro when getting
+ * certain memory attributes
+ * It should not be called directly.
+ *
+ *  @param[in]  i_pTarget   Target Centaur pointer
+ *  @param[in]  i_attr      Attribute Id
+ *  @param[out] o_val       Attribute Value
+ *  @return     ReturnCode. Zero on success, else platform specified error
+ */
+fapi::ReturnCode fapiPlatGetMemAttrData (
+                                const fapi::Target * i_pTarget,
+                                const TARGETING::ATTRIBUTE_ID i_attr,
+                                uint32_t & o_val);
 
 } // namespace platAttrSvc
 
@@ -2748,4 +2762,78 @@ fapi::ReturnCode fapiPlatGetTpVitlSpyOffsetAttr(
     fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? fapi::FAPI_RC_SUCCESS : \
     fapi::platAttrSvc::fapiPlatGetTpVitlSpyOffsetAttr(PTARGET, VAL)
 
+//------------------------------------------------------------------------------
+//  MACROS to support Memory Attributes at node level
+//------------------------------------------------------------------------------
+#define ATTR_MSS_VDD_SLOPE_ACTIVE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+              PTARGET, TARGETING::ATTR_MSS_CENT_VDD_SLOPE_ACTIVE, VAL)
+#define ATTR_MSS_VDD_SLOPE_INACTIVE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_CENT_VDD_SLOPE_INACTIVE, VAL)
+#define ATTR_MSS_VDD_SLOPE_INTERCEPT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_CENT_VDD_INTERCEPT, VAL)
+#define ATTR_MSS_VCS_SLOPE_ACTIVE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_CENT_VCS_SLOPE_ACTIVE, VAL)
+#define ATTR_MSS_VCS_SLOPE_INACTIVE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_CENT_VCS_SLOPE_INACTIVE, VAL)
+#define ATTR_MSS_VCS_SLOPE_INTERCEPT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_CENT_VCS_INTERCEPT, VAL)
+#define ATTR_MSS_VPP_SLOPE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_VOLT_VPP_SLOPE_EFF_CONFIG, VAL)
+#define ATTR_MSS_VPP_SLOPE_INTERCEPT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_VOLT_VPP_INTERCEPT_EFF_CONFIG, VAL)
+#define ATTR_MSS_DDR3_VDDR_SLOPE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_VOLT_DDR3_VDDR_SLOPE_EFF_CONFIG, VAL)
+#define ATTR_MSS_DDR3_VDDR_INTERCEPT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(PTARGET,\
+            TARGETING::ATTR_MSS_VOLT_DDR3_VDDR_INTERCEPT_EFF_CONFIG, VAL)
+#define ATTR_MRW_DDR3_VDDR_MAX_LIMIT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MRW_DDR3_VDDR_MAX_LIMIT_EFF_CONFIG, VAL)
+#define ATTR_MSS_DDR4_VDDR_SLOPE_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MSS_VOLT_DDR4_VDDR_SLOPE_EFF_CONFIG, VAL)
+#define ATTR_MSS_DDR4_VDDR_INTERCEPT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(PTARGET,\
+            TARGETING::ATTR_MSS_VOLT_DDR4_VDDR_INTERCEPT_EFF_CONFIG, VAL)
+#define ATTR_MRW_DDR4_VDDR_MAX_LIMIT_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ? \
+        fapi::FAPI_RC_SUCCESS : \
+        fapi::platAttrSvc::fapiPlatGetMemAttrData(\
+            PTARGET, TARGETING::ATTR_MRW_DDR4_VDDR_MAX_LIMIT_EFF_CONFIG, VAL)
+
 #endif // FAPIPLATATTRIBUTESERVICE_H_
diff --git a/src/include/usr/isteps/istep13list.H b/src/include/usr/isteps/istep13list.H
index e717a4a66..4c5c57983 100644
--- a/src/include/usr/isteps/istep13list.H
+++ b/src/include/usr/isteps/istep13list.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -152,6 +152,7 @@ const DepModInfo g_istep13Dependancies = {
 #ifndef CONFIG_VPO_COMPILE
         DEP_LIB(libdram_training.so),
         DEP_LIB(libdram_initialization.so),
+        DEP_LIB(libmc_config.so),
 #endif
         NULL
     }
diff --git a/src/include/usr/targeting/common/target.H b/src/include/usr/targeting/common/target.H
index 04599859f..25e7be6b6 100644
--- a/src/include/usr/targeting/common/target.H
+++ b/src/include/usr/targeting/common/target.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2014                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2015                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */