diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/sbeio/runtime/test/makefile | 3 | ||||
| -rw-r--r-- | src/usr/sbeio/runtime/test/sbeiotestRt.H | 20 | ||||
| -rw-r--r-- | src/usr/sbeio/runtime/test/sbeiotestRtConstants.H | 3 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/usr/sbeio/runtime/test/makefile b/src/usr/sbeio/runtime/test/makefile index 3d07f9a86..4a61daa0f 100644 --- a/src/usr/sbeio/runtime/test/makefile +++ b/src/usr/sbeio/runtime/test/makefile @@ -31,7 +31,6 @@ MODULE = testsbeio_rt EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ -#@TODO RTC:178802 -#TESTS = *.H +TESTS = *.H include ${ROOTPATH}/config.mk diff --git a/src/usr/sbeio/runtime/test/sbeiotestRt.H b/src/usr/sbeio/runtime/test/sbeiotestRt.H index 7fff432c3..a2a4b1996 100644 --- a/src/usr/sbeio/runtime/test/sbeiotestRt.H +++ b/src/usr/sbeio/runtime/test/sbeiotestRt.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -363,7 +363,7 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite "0x%08x, but read 0x%08x", (l_read_reg & ~l_mask) | i_checkMask, l_read_reg); - + rc = 1; break; } @@ -400,8 +400,6 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite // Test entry TRACFCOMP(g_trac_sbeio, ENTER_MRK "SbeMessagePassingRtTest::" "testSbeMessagePassingVersions"); -//@TODO RTC:178802 -#if 0 sbeMessage_t l_request; sbeMessage_t l_expected_response; RT_TARG::rtChipId_t chipId = 0; @@ -485,7 +483,7 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite break; } }while (0); -#endif + // Test exit TRACFCOMP(g_trac_sbeio, EXIT_MRK "SbeMessagePassingRtTest::" "testSbeMessagePassingVersions"); @@ -800,7 +798,8 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite } // Check setting of bits in CFAM register - rc = checkResetSbeMessagePassingCFAM(chipId); + rc = checkResetSbeMessagePassingCFAM(chipId, + SBE_MSG_IN_PROGRESS); if(0 != rc) { TS_FAIL("Unexpected error during RT SBE message passing. " @@ -1051,7 +1050,8 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite } // Check setting of bits in CFAM register - rc = checkResetSbeMessagePassingCFAM(chipId); + rc = checkResetSbeMessagePassingCFAM(chipId, + SBE_MSG_COMPLETE); if(0 != rc) { TS_FAIL("Unexpected error during RT SBE message passing. " @@ -1112,7 +1112,8 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite } // Check setting of bits in CFAM register - rc = checkResetSbeMessagePassingCFAM(chipId); + rc = checkResetSbeMessagePassingCFAM(chipId, + SBE_MSG_COMPLETE); if(0 != rc) { TS_FAIL("Unexpected error during RT SBE message passing. " @@ -1306,7 +1307,8 @@ class SbeMessagePassingRtTest : public CxxTest::TestSuite } // Check setting of bits in CFAM register - rc = checkResetSbeMessagePassingCFAM(chipId); + rc = checkResetSbeMessagePassingCFAM(chipId, + SBE_MSG_COMPLETE); if(0 != rc) { TS_FAIL("Unexpected error during RT SBE message passing. " diff --git a/src/usr/sbeio/runtime/test/sbeiotestRtConstants.H b/src/usr/sbeio/runtime/test/sbeiotestRtConstants.H index 4ea937a3b..c4db54ca3 100644 --- a/src/usr/sbeio/runtime/test/sbeiotestRtConstants.H +++ b/src/usr/sbeio/runtime/test/sbeiotestRtConstants.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,7 +26,6 @@ #define __SBEIO_SBEIO_TEST_RT_CONSTANTS_H // Constants for SBE Message bits in SCOM_ADDR_5003B -const uint32_t SCOM_ADDR_5003B = 0x0005003B; // CFAM Reg 0x283B const uint32_t SBE_MSG_IN_PROGRESS = 0x40000000; const uint32_t SBE_MSG_COMPLETE = 0x80000000; const uint32_t SBE_MSG_MASK = SBE_MSG_COMPLETE | SBE_MSG_IN_PROGRESS; |
