diff options
| author | Bill Schwartz <whs@us.ibm.com> | 2014-02-07 17:54:33 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-02-13 14:18:19 -0600 |
| commit | b27f3afb24e832217c5bffccd57fe8c9cc76a081 (patch) | |
| tree | e48682fdde1b491a8dc9a11581ac555e5c419c2b /src/include | |
| parent | ecfc6a3a5aa975d7c72b940f5a5c1d969dfb6712 (diff) | |
| download | talos-hostboot-b27f3afb24e832217c5bffccd57fe8c9cc76a081.tar.gz talos-hostboot-b27f3afb24e832217c5bffccd57fe8c9cc76a081.zip | |
ATTR_VPD_CKE_PWR_MAP uint32_t [2] to uint64_t
Attribute ATTR_VPD_CKE_PWR_MAP has changed from uint32_t [2] to uint64_t.
Update HWP Accessor getMBvpdTermData to match return type.
Change-Id: I7191a495b23fac6897639c36a706f030046bbf6c
RTC: 97264
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/8697
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H | 12 | ||||
| -rw-r--r-- | src/include/usr/hwpf/plat/fapiPlatAttributeService.H | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H b/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H index 1838834cc..838db3940 100644 --- a/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H +++ b/src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H $ */ +/* $Source: src/include/usr/hwpf/hwp/mvpd_accessors/getMBvpdTermData.H $ */ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: getMBvpdTermData.H,v 1.3 2013/10/21 18:54:14 whs Exp $ +// $Id: getMBvpdTermData.H,v 1.5 2014/02/08 11:36:19 whs Exp $ /** * @file getMBvpdTermData.H @@ -95,7 +95,9 @@ const uint8_t TERM_DATA_CHK60 = 0x40; // check version for keyword to use // TERM_DATA_CKE_PRI_MAP is a uint16 in the vpd data. It is returned as // as a uint32. The offset is incremented by only 2 to get the next vpd value. TERM_DATA_CKE_PRI_MAP = 0x36, //uint32_t [2] - TERM_DATA_CKE_PWR_MAP = 0x38, //uint32_t [2] +// TERM_DATA_CKE_PWR_MAP is a uint64_t composed of the uint32_t port 0 and +// port 1 values at this offset. The offset is incremented by 4. + TERM_DATA_CKE_PWR_MAP = 0x38, //uint64_t TERM_DATA_RLO = 0x3c|TERM_DATA_CHK60|TERM_DATA_LOW_NIBBLE, //uint8_t[2] TERM_DATA_WLO = 0x3c|TERM_DATA_CHK60|TERM_DATA_HIGH_NIBBLE, //uint8_t[2] TERM_DATA_GPO = 0x3d|TERM_DATA_CHK60, //uint8_t[2] @@ -150,7 +152,7 @@ template<>class MBvpdTermDataSize<fapi::TERM_DATA_CEN_SLEW_RATE_SPCKE> template<>class MBvpdTermDataSize<fapi::TERM_DATA_CKE_PRI_MAP> { public: typedef uint32_t Type[2]; }; template<>class MBvpdTermDataSize<fapi::TERM_DATA_CKE_PWR_MAP> - { public: typedef uint32_t Type[2]; }; + { public: typedef uint64_t Type ; }; template<>class MBvpdTermDataSize<fapi::TERM_DATA_RLO> { public: typedef uint8_t Type[2]; }; template<>class MBvpdTermDataSize<fapi::TERM_DATA_WLO> diff --git a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H index a06510ebf..b0e66e251 100644 --- a/src/include/usr/hwpf/plat/fapiPlatAttributeService.H +++ b/src/include/usr/hwpf/plat/fapiPlatAttributeService.H @@ -1474,7 +1474,7 @@ fapi::ReturnCode fapiPlatGetPciOscswitchConfig fapi::FAPI_RC_SUCCESS :\ (checkTermDataType<fapi::TERM_DATA_CKE_PWR_MAP>(VAL), \ fapi::platAttrSvc::fapiPlatGetTermData\ - (PTARGET, fapi::TERM_DATA_CKE_PWR_MAP , VAL, sizeof(VAL))) + (PTARGET, fapi::TERM_DATA_CKE_PWR_MAP , &VAL, sizeof(VAL))) //------------------------------------------------------------------------------ // MACROS to support MBVPD Slope Intercept attributes |
