diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2019-05-01 12:30:54 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-06-24 10:29:27 -0500 |
| commit | 2c86bbc37ee8d0a2c0da169ace605dde319c898a (patch) | |
| tree | 10bb64bd91068566c077436a2785ed83f84c5288 /src/usr/isteps/expupd/test | |
| parent | 1ac1e9584462a41e204ffaae13f086b0a22c6cf8 (diff) | |
| download | talos-hostboot-2c86bbc37ee8d0a2c0da169ace605dde319c898a.tar.gz talos-hostboot-2c86bbc37ee8d0a2c0da169ace605dde319c898a.zip | |
Run exp tests in Axone and make generic Load utility
Removed CONFIG_AXONE_BRING_UP from expscomtest.H
Added common load utility for loading/unloading needed
modules for testcases. Added a mutex to avoid inband
command/response contention between testcases.
Change-Id: Ia96991983be18fab840b59b8dc7dd1383ecc4abc
RTC:201738
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76818
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Roland Veloz <rveloz@us.ibm.com>
Reviewed-by: Glenn Miles <milesg@ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/isteps/expupd/test')
| -rw-r--r-- | src/usr/isteps/expupd/test/expupdatetest.H | 48 | ||||
| -rw-r--r-- | src/usr/isteps/expupd/test/test.mk | 1 |
2 files changed, 32 insertions, 17 deletions
diff --git a/src/usr/isteps/expupd/test/expupdatetest.H b/src/usr/isteps/expupd/test/expupdatetest.H index a56249ce6..1cfc919a1 100644 --- a/src/usr/isteps/expupd/test/expupdatetest.H +++ b/src/usr/isteps/expupd/test/expupdatetest.H @@ -44,6 +44,7 @@ #ifndef __HOSTBOOT_RUNTIME #include <vfs/vfs.H> // module_is_loaded & module_load #endif +#include <test/exptest_utils.H> const char MSS_LIBRARY_NAME[] = "libisteps_mss.so"; const char EXPUPD_LIBRARY_NAME[] = "libexpupd.so"; @@ -121,31 +122,44 @@ class ExpUpdateTest: public CxxTest::TestSuite // Get a list of all of the functioning ocmb chips TARGETING::getAllChips(l_chipList, TARGETING::TYPE_OCMB_CHIP, true); - for (const auto & l_ocmb: l_chipList) + TARGETING::HB_MUTEX_SERIALIZE_TEST_LOCK_ATTR l_mutex = exptest::getTestMutex(); + if (l_mutex == nullptr) { - TS_TRACE("testExpFwUpdate: updating OCMB 0x%.8X", - TARGETING::get_huid(l_ocmb)); + TS_FAIL("testExpFwUpdate: unable to get test mutex"); + } + else + { + for (const auto & l_ocmb: l_chipList) + { + fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>l_fapi2_target(l_ocmb); - fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>l_fapi2_target(l_ocmb); + // Inband operations can't be run at the same time + // atomic section >> + mutex_lock(l_mutex); - // Invoke procedure - FAPI_INVOKE_HWP(l_errl, exp_fw_update, l_fapi2_target, - l_dataBuffer, sizeof(l_dataBuffer)); - if (l_errl) - { + // Invoke procedure + FAPI_INVOKE_HWP(l_errl, exp_fw_update, l_fapi2_target, + l_dataBuffer, sizeof(l_dataBuffer)); + + // << atomic section + mutex_unlock(l_mutex); + if (l_errl) + { #if 0 // skipping exp_fw_update error until simics is changed - @fixme:RTC-209865 - TS_FAIL("Error from exp_fw_update for 0x%.8X target", - TARGETING::get_huid(l_ocmb)); + TS_FAIL("Error from exp_fw_update for 0x%.8X target", + TARGETING::get_huid(l_ocmb)); #endif - break; + break; + } } - } - if (l_errl) - { - errlCommit(l_errl, CXXTEST_COMP_ID); + if (l_errl) + { + errlCommit(l_errl, CXXTEST_COMP_ID); + } } - TS_TRACE("testExpFwUpdate: exiting"); + + TS_INFO("testExpFwUpdate: exiting"); }; /** diff --git a/src/usr/isteps/expupd/test/test.mk b/src/usr/isteps/expupd/test/test.mk index c23c8723b..aca30b7f4 100644 --- a/src/usr/isteps/expupd/test/test.mk +++ b/src/usr/isteps/expupd/test/test.mk @@ -31,4 +31,5 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/procedures/hwp/memory/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/ocmb/explorer/common/include EXTRAINCDIR += ${ROOTPATH}/src/import +EXTRAINCDIR += ${ROOTPATH}/src/usr/expaccess |
