diff options
| author | Thi Tran <thi@us.ibm.com> | 2016-05-26 14:54:34 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2016-06-13 16:48:04 -0400 |
| commit | 6a4bf623a6f2c7c969431944cd684c8d98bcb1ae (patch) | |
| tree | 93c55b1f98dfff68fabb35ee7a2d3e075f7a80b5 /src/usr/runtime | |
| parent | a4edd934b26877603b9e024182d98fb210fba8fc (diff) | |
| download | blackbird-hostboot-6a4bf623a6f2c7c969431944cd684c8d98bcb1ae.tar.gz blackbird-hostboot-6a4bf623a6f2c7c969431944cd684c8d98bcb1ae.zip | |
Attribute Review - Nest
Change-Id: I6af714a8975122a4e83c955a21913ede0d643453
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23164
Tested-by: Jenkins Server
Tested-by: PPE CI
Tested-by: Hostboot CI
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/23168
Tested-by: FSP CI Jenkins
Diffstat (limited to 'src/usr/runtime')
| -rw-r--r-- | src/usr/runtime/common/hsvc_sysdata.C | 14 | ||||
| -rw-r--r-- | src/usr/runtime/test/runtimeattrstest.H | 20 |
2 files changed, 17 insertions, 17 deletions
diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index 5068c9c74..c17a28e2a 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2015 */ +/* Contributors Listed Below - COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -30,15 +30,15 @@ // -- Input: ../../xml/attribute_info/common_attributes.xml -- // No attributes found // -- Input: ../../xml/attribute_info/freq_attributes.xml -- -HSVC_LOAD_ATTR( ATTR_FREQ_A ); -HSVC_LOAD_ATTR( ATTR_FREQ_CORE_FLOOR ); -HSVC_LOAD_ATTR( ATTR_FREQ_CORE_NOMINAL ); +HSVC_LOAD_ATTR( ATTR_FREQ_A_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_CORE_FLOOR_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_CORE_NOMINAL_MHZ ); HSVC_LOAD_ATTR( ATTR_FREQ_MEM_REFCLOCK ); -HSVC_LOAD_ATTR( ATTR_FREQ_PB ); -HSVC_LOAD_ATTR( ATTR_FREQ_PCIE ); +HSVC_LOAD_ATTR( ATTR_FREQ_PB_MHZ ); +HSVC_LOAD_ATTR( ATTR_FREQ_PCIE_MHZ ); HSVC_LOAD_ATTR( ATTR_FREQ_PROC_REFCLOCK ); HSVC_LOAD_ATTR( ATTR_FREQ_PROC_REFCLOCK_KHZ ); -HSVC_LOAD_ATTR( ATTR_FREQ_X ); +HSVC_LOAD_ATTR( ATTR_FREQ_X_MHZ ); // -- Input: ../../xml/attribute_info/L2_L3_attributes.xml -- HSVC_LOAD_ATTR( ATTR_L2_FORCE_R_T2_EPS ); HSVC_LOAD_ATTR( ATTR_L2_R_T0_EPS ); diff --git a/src/usr/runtime/test/runtimeattrstest.H b/src/usr/runtime/test/runtimeattrstest.H index 478f405ea..0eb628cf3 100644 --- a/src/usr/runtime/test/runtimeattrstest.H +++ b/src/usr/runtime/test/runtimeattrstest.H @@ -82,11 +82,11 @@ class RuntimeAttrsTest: public CxxTest::TestSuite //Grab a couple of arbitrary attributes ReturnCode l_rc; - fapi::ATTR_FREQ_PB_Type freq = 0; - l_rc = FAPI_ATTR_GET(ATTR_FREQ_PB,NULL,freq); + fapi::ATTR_FREQ_PB_MHZ_Type freq = 0; + l_rc = FAPI_ATTR_GET(ATTR_FREQ_PB_MHZ,NULL,freq); if( l_rc ) { - TS_FAIL("Error getting fapi::ATTR_FREQ_PB"); + TS_FAIL("Error getting fapi::ATTR_FREQ_PB_MHZ"); } bool freq_found = false; @@ -102,24 +102,24 @@ class RuntimeAttrsTest: public CxxTest::TestSuite uint64_t attr = 0; while( headers[attr].id != hsvc_attr_header_t::NO_ATTRIBUTE ) { - if( headers[attr].id == fapi::ATTR_FREQ_PB ) + if( headers[attr].id == fapi::ATTR_FREQ_PB_MHZ ) { freq_found = true; if( headers[attr].sizeBytes != - sizeof(fapi::ATTR_FREQ_PB_Type) ) + sizeof(fapi::ATTR_FREQ_PB_MHZ_Type) ) { TRACFCOMP( g_trac_runtime, "size=%.16X", headers[attr].sizeBytes ); - TS_FAIL("Size of fapi::ATTR_FREQ_PB data is wrong"); + TS_FAIL("Size of fapi::ATTR_FREQ_PB_MHZ data is wrong"); } else { - fapi::ATTR_FREQ_PB_Type* freq_act = - reinterpret_cast<fapi::ATTR_FREQ_PB_Type*> + fapi::ATTR_FREQ_PB_MHZ_Type* freq_act = + reinterpret_cast<fapi::ATTR_FREQ_PB_MHZ_Type*> (beginning+headers[attr].offset); if( *freq_act != freq ) { TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", freq, *freq_act ); - TS_FAIL("fapi::ATTR_FREQ_PB data is wrong"); + TS_FAIL("fapi::ATTR_FREQ_PB_MHZ data is wrong"); } } } @@ -159,7 +159,7 @@ class RuntimeAttrsTest: public CxxTest::TestSuite if( !freq_found ) { - TS_FAIL("Never found FREQ_PB in system attributes"); + TS_FAIL("Never found FREQ_PB_MHZ in system attributes"); } if( !vpdMinLevel_found ) { |
