Supply WOF data

Create new attributes to make available WOF information to HTMGT and HWPs.

Change-Id: I45689bc06e5a3808b9b9c3a356b70dd6e9cd2dd2
RTC: 125378
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17367
Tested-by: Jenkins Server
Tested-by: Jenkins OP Build CI
Reviewed-by: William H. Schwartz <whs@us.ibm.com>
Tested-by: Jenkins OP HW
Tested-by: FSP CI Jenkins
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

4 files changed, 82 insertions, 4 deletions

diff --git a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
index e1cbba54f..9a5de398d 100644
--- a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
+++ b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
@@ -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: fapiMvpdAccess.H,v 1.8 2014/01/20 22:37:51 mklight Exp $
+// $Id: fapiMvpdAccess.H,v 1.10 2015/04/23 19:42:38 whs Exp $
 // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiMvpdAccess.H,v $
 
 /**
@@ -125,6 +125,7 @@ namespace fapi
         MVPD_KEYWORD_MK  = 0x20,
         MVPD_KEYWORD_PB  = 0x21,
         MVPD_KEYWORD_CH  = 0x22,
+        MVPD_KEYWORD_IQ  = 0x23,
     };
 
     typedef struct voltageBucketData
@@ -227,7 +228,7 @@ fapi::ReturnCode fapiSetMvpdField(const fapi::MvpdRecord i_record,
  *
  * @return fapi::ReturnCode. FAPI_RC_SUCCESS, or failure value.
  */
-fapi::ReturnCode fapiGetPoundVBucketData(const TARGETING::Target *i_pChipTarget,
+fapi::ReturnCode fapiGetPoundVBucketData(const fapi::Target &i_procTarget,
                                          const uint32_t i_record,
                                          fapi::voltageBucketData_t & o_data);
 
diff --git a/src/include/usr/hwpf/hwp/chip_accessors/getTdpRdpCurrentFactor.H b/src/include/usr/hwpf/hwp/chip_accessors/getTdpRdpCurrentFactor.H
new file mode 100644
index 000000000..9d5aab46f
--- /dev/null
+++ b/src/include/usr/hwpf/hwp/chip_accessors/getTdpRdpCurrentFactor.H
@@ -0,0 +1,56 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/hwpf/hwp/chip_accessors/getTdpRdpCurrentFactor.H $ */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015                             */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+// $Id: getTdpRdpCurrentFactor.H,v 1.1 2015/06/01 18:30:12 whs Exp $
+/**
+ *  @file getTdpRdpCurrentFactor.H
+ *
+ *  @brief Accessor for providing the ATTR_TDP_RDP_CURRENT_FACTOR attribute
+ */
+
+#ifndef _HWP_GETTDPRDPCURRENTFACTOR_
+#define _HWP_GETTDPRDPCURRENTFACTOR_
+
+#include <fapi.H>
+
+// function pointer typedef definition for HWP call support
+typedef fapi::ReturnCode (*getTdpRdpCurrentFactor_FP_t)
+    (const fapi::Target &, uint32_t &);
+
+extern "C"
+{
+/**
+ * @brief Get the ATTR_TDP_RDP_CURRENT_FACTOR FAPI attribute
+ *
+ * @param[in]  i_procTarget - Reference to processor chip target
+ * @param[out] o_val        - Filled in with TDP RDP Current Factor
+ *
+ * @return fapi::ReturnCode FAPI_RC_SUCCESS if success, else error code
+ */
+fapi::ReturnCode getTdpRdpCurrentFactor(
+    const fapi::Target & i_procTarget,
+    uint32_t & o_val);
+}
+
+#endif
diff --git a/src/include/usr/hwpf/hwpf_reasoncodes.H b/src/include/usr/hwpf/hwpf_reasoncodes.H
index e1a00da4a..3f0ebd829 100644
--- a/src/include/usr/hwpf/hwpf_reasoncodes.H
+++ b/src/include/usr/hwpf/hwpf_reasoncodes.H
@@ -80,7 +80,7 @@ namespace fapi
         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,
-
+        MOD_GET_WOF_FREQ_UPLIFT_SELECTED           = 0x29,
     };
 
     /**
@@ -139,6 +139,8 @@ namespace fapi
         RC_DATA_MISMATCH              = HWPF_COMP_ID | 0x38,
         RC_DATA_NOT_SUPPORTED         = HWPF_COMP_ID | 0x39,
         RC_NO_SINGLE_NODE             = HWPF_COMP_ID | 0x3A,
+        RC_INVALID_ULTRA_TURBO_FREQ   = HWPF_COMP_ID | 0x3B,
+        RC_INVALID_WOF_INDEX          = HWPF_COMP_ID | 0x3C,
     };
 
     /**
diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
index 9253b0b3a..c7bd87109 100644
--- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
+++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H
@@ -684,6 +684,17 @@ fapi::ReturnCode fapiPlatGetPciOscswitchConfig
                                      uint8_t &o_val);
 /**
  * @brief This function is called by the FAPI_ATTR_GET macro when getting the
+ *        ATTR_TDP_RDP_CURRENT_FACTOR attribute. It should not be called
+ *        directly.
+ *
+ *  @param[in]  i_pProcTarget Processor Chip Target pointer
+ *  @param[out] o_data        Reference to output data
+ */
+fapi::ReturnCode fapiPlatGetTdpRdpCurrentFactor
+                                     (const fapi::Target * i_pProcTarget,
+                                     uint32_t &o_val);
+/**
+ * @brief This function is called by the FAPI_ATTR_GET macro when getting the
  *        ATTR_SPD_MODSPEC_COM_REF_RAW_CARD attribute.
  *        It should not be called directly.
  *
@@ -2868,6 +2879,14 @@ fapi::ReturnCode fapiPlatGetMemAttrData (
     fapi::platAttrSvc::fapiPlatGetPciOscswitchConfig(PTARGET, VAL)
 
 //------------------------------------------------------------------------------
+//  MACRO to support TDP RDP Current Factor
+//------------------------------------------------------------------------------
+#define ATTR_TDP_RDP_CURRENT_FACTOR_GETMACRO(ID, PTARGET, VAL) \
+    fapi::AttrOverrideSync::getAttrOverrideFunc(fapi::ID, PTARGET, &VAL) ?\
+        fapi::FAPI_RC_SUCCESS : \
+    fapi::platAttrSvc::fapiPlatGetTdpRdpCurrentFactor(PTARGET, VAL)
+
+//------------------------------------------------------------------------------
 //  MACRO to support Modspec raw card info
 //------------------------------------------------------------------------------
 #define ATTR_SPD_MODSPEC_COM_REF_RAW_CARD_REV_GETMACRO(ID, PTARGET, VAL) \