From 826713fa254a1255a42c4c4a8968b3ae3b7d0ea9 Mon Sep 17 00:00:00 2001 From: Brian Stegmiller Date: Wed, 31 May 2017 14:53:18 -0500 Subject: ATTN: Return IPOLL bits being used to HOST OS Change-Id: I74d84208c1f24d156739b8bb4c912f8a1bd11ee3 RTC: 174196 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41179 Reviewed-by: Zane C. Shelley Tested-by: Jenkins Server Tested-by: FSP CI Jenkins --- src/usr/diag/attn/common/attnbits.C | 21 +++++----------- src/usr/diag/attn/common/attnbits.H | 24 ++++++++++++++++-- src/usr/diag/attn/runtime/attn_rt.C | 37 +++++++++++++++++++++++++--- src/usr/diag/attn/runtime/test/attntest_rt.H | 13 +++++++++- 4 files changed, 73 insertions(+), 22 deletions(-) (limited to 'src/usr/diag') diff --git a/src/usr/diag/attn/common/attnbits.C b/src/usr/diag/attn/common/attnbits.C index 2ae89291b..b2514ad11 100644 --- a/src/usr/diag/attn/common/attnbits.C +++ b/src/usr/diag/attn/common/attnbits.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -98,15 +98,6 @@ const uint64_t address = IPOLL_MASK_REG; // 'routing to FSP' should be enabled. // (along with all interrupt types to FSP) // --------------------------------------------- -// {ROUTE_TO_HOST, 0x0400000000000000ull}, -// -// {TOSP_CHECK_STOP, 0x0200000000000000ull}, -// {TOSP_RECOVERABLE, 0x0100000000000000ull}, -// {TOSP_SPECIAL, 0x0080000000000000ull}, -// {TOSP_UNIT_CS, 0x0040000000000000ull}, -// {TOSP_HOST, 0x0020000000000000ull}, -// {ROUTE_TO_SP, 0x0010000000000000ull}, -// --------------------------------------------- void getCheckbitsAssociations( const RegAssoc * & o_first, @@ -114,11 +105,11 @@ void getCheckbitsAssociations( { static const RegAssoc first[] = { - {CHECK_STOP, 0x8000000000000000ull}, - {RECOVERABLE, 0x4000000000000000ull}, - {SPECIAL, 0x2000000000000000ull}, - {UNIT_CS, 0x1000000000000000ull}, - {HOST_ATTN, 0x0800000000000000ull}, + {CHECK_STOP, IPOLL_CHECK_STOP}, + {RECOVERABLE, IPOLL_RECOVERABLE}, + {SPECIAL, IPOLL_SPECIAL}, + {UNIT_CS, IPOLL_UNIT_CS}, + {HOST_ATTN, IPOLL_HOST_ATTN}, }; static const RegAssoc * last = first + diff --git a/src/usr/diag/attn/common/attnbits.H b/src/usr/diag/attn/common/attnbits.H index 763f0c987..5bee569e8 100644 --- a/src/usr/diag/attn/common/attnbits.H +++ b/src/usr/diag/attn/common/attnbits.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -186,11 +186,31 @@ enum IPOLL_MASK_REG = 0x000F0033, // (IPOLL) Error status reg IPOLL_STATUS_REG = 0x000F0034, - }; +/** + * @brief Values used to indicate the bits used in + * the IPOLL mask and status registers. + */ +enum +{ + IPOLL_CHECK_STOP = 0x8000000000000000ull, + IPOLL_RECOVERABLE = 0x4000000000000000ull, + IPOLL_SPECIAL = 0x2000000000000000ull, + IPOLL_UNIT_CS = 0x1000000000000000ull, + IPOLL_HOST_ATTN = 0x0800000000000000ull, + + IPOLL_ROUTE_TO_HOST = 0x0400000000000000ull, + + IPOLL_SP_CHECK_STOP = 0x0200000000000000ull, + IPOLL_SP_RECOVERABLE = 0x0100000000000000ull, + IPOLL_SP_SPECIAL = 0x0080000000000000ull, + IPOLL_SP_UNIT_CS = 0x0040000000000000ull, + IPOLL_SP_HOST_ATTN = 0x0020000000000000ull, + IPOLL_ROUTE_TO_SP = 0x0010000000000000ull +}; } diff --git a/src/usr/diag/attn/runtime/attn_rt.C b/src/usr/diag/attn/runtime/attn_rt.C index 15b7b6b9e..5dd165b19 100644 --- a/src/usr/diag/attn/runtime/attn_rt.C +++ b/src/usr/diag/attn/runtime/attn_rt.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2016 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -26,6 +26,7 @@ #include "runtime/attnsvc.H" #include "common/attntrace.H" #include "common/attnmem.H" +#include "common/attnbits.H" #include #include #include @@ -158,6 +159,33 @@ namespace ATTN_RT return rc; } + + /** brief getIpollEvents + * + * Bits that are *set* in this bitmask represent events that will be + * allowed to flow to the HOST or Service Processor. + * + * @return Value indicating which attention events should + * be enabled in the IPOLL mask register. + */ + + uint64_t getIpollEvents( void ) + { + uint64_t l_ipollEvents = 0; + + // Host side should allow 'Recov', 'UnitCs' and 'HostInt' + // SP side should allow 'Chkstop', 'Recov', 'Special' + // and maybe the mystery bit (route to SP). + l_ipollEvents = IPOLL_RECOVERABLE | IPOLL_UNIT_CS | + IPOLL_HOST_ATTN | IPOLL_SP_CHECK_STOP | + IPOLL_SP_RECOVERABLE | IPOLL_SP_SPECIAL | + IPOLL_ROUTE_TO_SP ; + + return(l_ipollEvents); + + } // end getIpollEvents + + // register runtimeInterfaces struct registerAttn { @@ -169,9 +197,10 @@ namespace ATTN_RT return; } - rt_intf->enable_attns = &enableAttns; - rt_intf->disable_attns = &disableAttns; - rt_intf->handle_attns = &handleAttns; + rt_intf->enable_attns = &enableAttns; + rt_intf->disable_attns = &disableAttns; + rt_intf->handle_attns = &handleAttns; + rt_intf->get_ipoll_events = &getIpollEvents; } }; diff --git a/src/usr/diag/attn/runtime/test/attntest_rt.H b/src/usr/diag/attn/runtime/test/attntest_rt.H index 84731ec22..b86c0a0a7 100644 --- a/src/usr/diag/attn/runtime/test/attntest_rt.H +++ b/src/usr/diag/attn/runtime/test/attntest_rt.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2017 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -76,6 +76,17 @@ class AttnTestRT: public CxxTest::TestSuite ATTN_SLOW("handle_attns returned rc: %d", rc); } + if (NULL == rt_intf->get_ipoll_events) + { + TS_FAIL("AttnTestRT: get_ipoll_events not set"); + } + else + { + // just pass in some params for now + uint64_t l_bits = rt_intf->get_ipoll_events(); + ATTN_SLOW("get_ipoll_events returned: %llx", l_bits); + } + ATTN_SLOW(EXIT_MRK"AttnTestRT::testAttnRtIntf"); } -- cgit v1.2.1