diff options
author | Nick Bofferding <bofferdn@us.ibm.com> | 2015-03-11 00:37:28 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-03-26 07:10:30 -0500 |
commit | 443e443dd12dd902ab58143a19c6489a27307abd (patch) | |
tree | 5de5693ad2d83a8cd70c3fee029f12a54cfde2a1 /src/usr/runtime | |
parent | 9ab6a2659dd6378e1b5317d3eac1e664cb8cdfec (diff) | |
download | talos-hostboot-443e443dd12dd902ab58143a19c6489a27307abd.tar.gz talos-hostboot-443e443dd12dd902ab58143a19c6489a27307abd.zip |
Support Alpine per-socket proc loadline attributes
- Moved proc loadline attributes to processor target, from system
- Moved same attributes from system to proc for runtime
- Updated runtime tests to use different system attributes
- Updated MRW parser to override invidual proc loadline attributes
- Updated system XML files to reflect attribute moves
Change-Id: Ie61c3ef87ce20b5fd8f537f63ec97904d89859b6
RTC: 125036
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16595
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/runtime')
-rw-r--r-- | src/usr/runtime/common/hsvc_procdata.C | 6 | ||||
-rw-r--r-- | src/usr/runtime/common/hsvc_sysdata.C | 6 | ||||
-rw-r--r-- | src/usr/runtime/test/runtimeattrstest.H | 40 |
3 files changed, 30 insertions, 22 deletions
diff --git a/src/usr/runtime/common/hsvc_procdata.C b/src/usr/runtime/common/hsvc_procdata.C index 8e177143f..d2e6a7f01 100644 --- a/src/usr/runtime/common/hsvc_procdata.C +++ b/src/usr/runtime/common/hsvc_procdata.C @@ -162,6 +162,12 @@ HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VCS_BIAS_DOWN ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VCS_BIAS_UP ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VDD_BIAS_DOWN ); HSVC_LOAD_ATTR( ATTR_VOLTAGE_INT_VDD_BIAS_UP ); +HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VDD ); +HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD ); +HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS ); +HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD ); // -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml -- HSVC_LOAD_ATTR( ATTR_PNOR_I2C_ADDRESS_BYTES ); HSVC_LOAD_ATTR( ATTR_SBE_SEEPROM_I2C_ADDRESS_BYTES ); diff --git a/src/usr/runtime/common/hsvc_sysdata.C b/src/usr/runtime/common/hsvc_sysdata.C index b9a94e380..5068c9c74 100644 --- a/src/usr/runtime/common/hsvc_sysdata.C +++ b/src/usr/runtime/common/hsvc_sysdata.C @@ -75,12 +75,6 @@ HSVC_LOAD_ATTR( ATTR_PM_SPIPSS_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SPIVID_FREQUENCY ); HSVC_LOAD_ATTR( ATTR_PM_SYSTEM_IVRMS_ENABLED ); HSVC_LOAD_ATTR( ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL ); -HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_R_DISTLOSS_VDD ); -HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_R_LOADLINE_VDD ); -HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VCS ); -HSVC_LOAD_ATTR( ATTR_PROC_VRM_VOFFSET_VDD ); // -- Input: ../../xml/attribute_info/poreve_memory_attributes.xml -- // No attributes found // -- Input: ../../xml/attribute_info/proc_chip_ec_feature.xml -- diff --git a/src/usr/runtime/test/runtimeattrstest.H b/src/usr/runtime/test/runtimeattrstest.H index ee0eb7f76..9236225bd 100644 --- a/src/usr/runtime/test/runtimeattrstest.H +++ b/src/usr/runtime/test/runtimeattrstest.H @@ -5,7 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,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. */ @@ -88,13 +90,14 @@ class RuntimeAttrsTest: public CxxTest::TestSuite } bool freq_found = false; - fapi::ATTR_PROC_R_LOADLINE_VDD_Type loadline = 0; - l_rc = FAPI_ATTR_GET(ATTR_PROC_R_LOADLINE_VDD,NULL,loadline); + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type vpdMinLevel = 0; + l_rc = FAPI_ATTR_GET( + ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL,NULL,vpdMinLevel); if( l_rc ) { - TS_FAIL("Error getting fapi::ATTR_PROC_R_LOADLINE_VDD"); + TS_FAIL("Error getting fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL"); } - bool loadline_found = false; + bool vpdMinLevel_found = false; uint64_t attr = 0; while( headers[attr].id != hsvc_attr_header_t::NO_ATTRIBUTE ) @@ -120,24 +123,28 @@ class RuntimeAttrsTest: public CxxTest::TestSuite } } } - else if( headers[attr].id == fapi::ATTR_PROC_R_LOADLINE_VDD ) + else if( headers[attr].id + == fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL ) { - loadline_found = true; + vpdMinLevel_found = true; if( headers[attr].sizeBytes != - sizeof(fapi::ATTR_PROC_R_LOADLINE_VDD_Type) ) + sizeof(fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type) ) { TRACFCOMP( g_trac_runtime, "size=%.16X", headers[attr].sizeBytes ); - TS_FAIL("Size of fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong"); + TS_FAIL("Size of fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL " + "data is wrong"); } else { - fapi::ATTR_PROC_R_LOADLINE_VDD_Type* loadline_act = - reinterpret_cast<fapi::ATTR_PROC_R_LOADLINE_VDD_Type*> + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type* + vpdMinLevel_act = reinterpret_cast< + fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL_Type*> (beginning+headers[attr].offset); - if( *loadline_act != loadline ) + if( *vpdMinLevel_act != vpdMinLevel ) { - TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", loadline, *loadline_act ); - TS_FAIL("fapi::ATTR_PROC_R_LOADLINE_VDD data is wrong"); + TRACFCOMP( g_trac_runtime, "Expected=%X, Actual=%X", vpdMinLevel, *vpdMinLevel_act ); + TS_FAIL("fapi::ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL data " + "is wrong"); } } } @@ -154,9 +161,10 @@ class RuntimeAttrsTest: public CxxTest::TestSuite { TS_FAIL("Never found FREQ_PB in system attributes"); } - if( !loadline_found ) + if( !vpdMinLevel_found ) { - TS_FAIL("Never found ATTR_PROC_R_LOADLINE_VDD in system attributes"); + TS_FAIL("Never found ATTR_PM_SYSTEM_IVRM_VPD_MIN_LEVEL in system " + "attributes"); } TRACFCOMP( g_trac_runtime, "testVerifySystemAttributes> finish" ); |