From 6f456343a42a3def8d14637b2f8ffc90832ee563 Mon Sep 17 00:00:00 2001 From: Christian Geddes Date: Tue, 31 Oct 2017 15:29:25 -0500 Subject: Clean up things that were left after updating to simics nimbus 2.0 A few workarounds were put in place to get simics moved up to the 2.0 nimbus model. One was that we put in a hack into a mvpd test case, the other was disabling the occ_xstop handler from starting. I found that after putting in good mvpd the occ_xstop handler was booting up okay. An the mvpd test case is fixed to correctly find the bucketValue from the value returned from the POUNDV_DATA attr Change-Id: I0eb023c386066c92e475c3302b2f18d984439d3b Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/49071 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Reviewed-by: Christian R. Geddes --- src/usr/fapi2/test/fapi2MvpdTestCxx.H | 89 ++++++++-------------- .../isteps/istep06/host_start_occ_xstop_handler.C | 2 +- 2 files changed, 33 insertions(+), 58 deletions(-) (limited to 'src/usr') diff --git a/src/usr/fapi2/test/fapi2MvpdTestCxx.H b/src/usr/fapi2/test/fapi2MvpdTestCxx.H index 0f0d0e056..dab243795 100644 --- a/src/usr/fapi2/test/fapi2MvpdTestCxx.H +++ b/src/usr/fapi2/test/fapi2MvpdTestCxx.H @@ -350,34 +350,36 @@ public: l_bucketAttr); uint32_t l_huid = TARGETING::get_huid(l_fapi_eq_target); - uint32_t l_pos = eqChiplet->getAttr(); - //PROC0EQ1 has an override set in nimbus's standalone xml, this branch checks it - if(l_pos == 1) - { - - numTests++; - if(voltageData.bucketId != 2) - { - numFails++; - TS_FAIL("Error:p9_pm_get_poundv_bucket with EQ with HUID = 0x%X should have returned bucket ID 2, not %d",l_huid, voltageData.bucketId); - } - - numTests++; - if(*l_bucketAttr != 2) - { - numFails++; - TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 2, not %d",l_huid, *l_bucketAttr); - } - - if(l_rc) - { - numFails++; - TS_FAIL("Error: Error occured while trying to read voltage data from mvpd"); - continue; - } - continue; - } + //PROC0EQ1 has an override set in nimbus's standalone xml, this branch checks it + //TODO RTC: 181716 Re-enable #V override test path when we have multiple + // EQs avaiable in the simics model +// uint32_t l_pos = eqChiplet->getAttr(); +// if(l_pos == 1) +// { +// +// numTests++; +// if(voltageData.bucketId != 2) +// { +// numFails++; +// TS_FAIL("Error:p9_pm_get_poundv_bucket with EQ with HUID = 0x%X should have returned bucket ID 2, not %d",l_huid, voltageData.bucketId); +// } +// +// numTests++; +// if(*l_bucketAttr != 2) +// { +// numFails++; +// TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDV_BUCKET_DATA EQ with HUID = 0x%X should have bucket ID 2, not %d",l_huid, *l_bucketAttr); +// } +// +// if(l_rc) +// { +// numFails++; +// TS_FAIL("Error: Error occured while trying to read voltage data from mvpd"); +// continue; +// } +// continue; +// } numTests++; if(voltageData.bucketId != 3) { @@ -443,34 +445,6 @@ public: l_bucketAttr); uint32_t l_huid = TARGETING::get_huid(l_fapi_eq_target); - uint32_t l_pos = eqChiplet->getAttr(); - - //PROC0EQ1 has an override set in nimbus's standalone xml, - //this branch checks it - if(l_pos == 1) - { - numTests++; - if(vdmData.bucketId != 2) - { - numFails++; - TS_FAIL("Error:p9_pm_get_poundw_bucket with EQ with HUID = " - "0x%X should have returned bucket ID 2, not %d", - l_huid, - vdmData.bucketId); - } - - numTests++; - if(*l_bucketAttr != 2) - { - numFails++; - TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDW_BUCKET_DATA " - "EQ with HUID = 0x%X should have bucket ID 2, not %d", - l_huid, - *l_bucketAttr); - } - - continue; - } numTests++; if(vdmData.bucketId != 3) @@ -484,11 +458,12 @@ public: } numTests++; - if(*l_bucketAttr != 2) + //Need to offset by a single uint8_t to get to bucketId data in struct + if(*(l_bucketAttr + sizeof(uint8_t)) != 3) { numFails++; TS_FAIL("Error:FAPI_ATTR_GET(fapi2::ATTR_POUNDW_BUCKET_DATA " - "EQ with HUID = 0x%X should have bucket ID 2, not %d", + "EQ with HUID = 0x%X should have bucket ID 3, not %d", l_huid, *l_bucketAttr); } diff --git a/src/usr/isteps/istep06/host_start_occ_xstop_handler.C b/src/usr/isteps/istep06/host_start_occ_xstop_handler.C index e59f9ead1..0747333bc 100644 --- a/src/usr/isteps/istep06/host_start_occ_xstop_handler.C +++ b/src/usr/isteps/istep06/host_start_occ_xstop_handler.C @@ -63,7 +63,7 @@ void* host_start_occ_xstop_handler( void *io_pArgs ) l_homerPhysAddrBase, l_commonPhysAddr); do { - if ( Util::isSimicsRunning() ) break; //Skip if running in Simics +// if ( Util::isSimicsRunning() ) break; //Skip if running in Simics l_errl = HBPM::loadPMComplex(masterproc, l_homerPhysAddrBase, -- cgit v1.2.1