summaryrefslogtreecommitdiffstats
path: root/src/usr/targeting/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr/targeting/runtime')
-rw-r--r--src/usr/targeting/runtime/attrPlatOverride_rt.C5
-rw-r--r--src/usr/targeting/runtime/makefile3
-rw-r--r--src/usr/targeting/runtime/rt_startup.C4
-rw-r--r--src/usr/targeting/runtime/rt_targeting.C59
-rw-r--r--src/usr/targeting/runtime/test/testtargeting.H12
5 files changed, 13 insertions, 70 deletions
diff --git a/src/usr/targeting/runtime/attrPlatOverride_rt.C b/src/usr/targeting/runtime/attrPlatOverride_rt.C
index b379313d9..3c805381c 100644
--- a/src/usr/targeting/runtime/attrPlatOverride_rt.C
+++ b/src/usr/targeting/runtime/attrPlatOverride_rt.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -24,14 +24,13 @@
/* IBM_PROLOG_END_TAG */
#include <runtime/interface.h>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <targeting/common/commontargeting.H>
#include <targeting/attrPlatOverride.H>
#include <fapi2/plat_attr_override_sync.H>
#include <targeting/common/trace.H>
#include <errl/errlmanager.H>
#include <initservice/initserviceif.H>
-#include <config.h>
#include <secureboot/service.H>
#include <targeting/common/targreasoncodes.H>
#include <devicefw/userif.H>
diff --git a/src/usr/targeting/runtime/makefile b/src/usr/targeting/runtime/makefile
index ffb2e8a14..eb1dd366e 100644
--- a/src/usr/targeting/runtime/makefile
+++ b/src/usr/targeting/runtime/makefile
@@ -5,7 +5,7 @@
#
# OpenPOWER HostBoot Project
#
-# Contributors Listed Below - COPYRIGHT 2013,2018
+# Contributors Listed Below - COPYRIGHT 2013,2020
# [+] International Business Machines Corp.
#
#
@@ -38,7 +38,6 @@ HOSTBOOT_RUNTIME_SPECIFIC_OBJS += start_rt.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += targplatutil.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_targeting.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrPlatOverride_rt.o
-HOSTBOOT_RUNTIME_SPECIFIC_OBJS += errludattribute.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attributestrings.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += attrsync.o
HOSTBOOT_RUNTIME_SPECIFIC_OBJS += rt_startup.o
diff --git a/src/usr/targeting/runtime/rt_startup.C b/src/usr/targeting/runtime/rt_startup.C
index 578750006..ed190f196 100644
--- a/src/usr/targeting/runtime/rt_startup.C
+++ b/src/usr/targeting/runtime/rt_startup.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2018 */
+/* Contributors Listed Below - COPYRIGHT 2018,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -22,7 +22,7 @@
/* permissions and limitations under the License. */
/* */
/* IBM_PROLOG_END_TAG */
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <runtime/interface.h>
#include <targeting/common/target.H>
#include <targeting/common/targetservice.H>
diff --git a/src/usr/targeting/runtime/rt_targeting.C b/src/usr/targeting/runtime/rt_targeting.C
index 581386985..28c1fdf7d 100644
--- a/src/usr/targeting/runtime/rt_targeting.C
+++ b/src/usr/targeting/runtime/rt_targeting.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2018 */
+/* Contributors Listed Below - COPYRIGHT 2014,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -39,7 +39,7 @@
#include <targeting/attrrp.H>
#include <arch/pirformat.H>
#include <runtime/customize_attrs_for_payload.H>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <runtime/interface.h>
#include <map>
#include <util/memoize.H>
@@ -54,61 +54,6 @@ using namespace TARGETING;
namespace RT_TARG
{
-errlHndl_t getRtTarget(
- const TARGETING::Target* i_pTarget,
- rtChipId_t& o_rtTargetId)
-{
- errlHndl_t pError = NULL;
-
- do
- {
- if(i_pTarget == TARGETING::MASTER_PROCESSOR_CHIP_TARGET_SENTINEL)
- {
- TARGETING::Target* masterProcChip = NULL;
- TARGETING::targetService().
- masterProcChipTargetHandle(masterProcChip);
- i_pTarget = masterProcChip;
- }
-
- auto hbrtHypId = RUNTIME::HBRT_HYP_ID_UNKNOWN;
- if( (!i_pTarget->tryGetAttr<TARGETING::ATTR_HBRT_HYP_ID>(hbrtHypId))
- || (hbrtHypId == RUNTIME::HBRT_HYP_ID_UNKNOWN))
- {
- auto huid = get_huid(i_pTarget);
- auto targetingTargetType =
- i_pTarget->getAttr<TARGETING::ATTR_TYPE>();
- TRACFCOMP(g_trac_targeting, ERR_MRK
- "Targeting target type of 0x%08X not supported. "
- "HUID: 0x%08X",
- targetingTargetType,
- huid);
- /*@
- * @errortype
- * @moduleid TARG_RT_GET_RT_TARGET
- * @reasoncode TARG_RT_TARGET_TYPE_NOT_SUPPORTED
- * @userdata1 Target's HUID
- * @userdata2 target's targeting type
- * @devdesc Targeting target's type not supported by runtime
- * code
- */
- pError = new ERRORLOG::ErrlEntry(
- ERRORLOG::ERRL_SEV_INFORMATIONAL,
- TARGETING::TARG_RT_GET_RT_TARGET,
- TARGETING::TARG_RT_TARGET_TYPE_NOT_SUPPORTED,
- huid,
- targetingTargetType,
- true);
-
- ERRORLOG::ErrlUserDetailsTarget(i_pTarget,"Targeting Target").
- addToLog(pError);
- }
-
- o_rtTargetId = hbrtHypId;
-
- } while(0);
-
- return pError;
-}
/**
* @brief API documentation same as for getHbTarget; this just implements the
diff --git a/src/usr/targeting/runtime/test/testtargeting.H b/src/usr/targeting/runtime/test/testtargeting.H
index fce91f46d..c6c7c0d60 100644
--- a/src/usr/targeting/runtime/test/testtargeting.H
+++ b/src/usr/targeting/runtime/test/testtargeting.H
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2013,2018 */
+/* Contributors Listed Below - COPYRIGHT 2013,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -25,7 +25,7 @@
#include <cxxtest/TestSuite.H>
#include <targeting/common/commontargeting.H>
#include <runtime/interface.h>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
#include <errl/errlentry.H>
#include <errl/errlmanager.H>
#include <targeting/common/trace.H>
@@ -62,7 +62,7 @@ class TargetingTestSuite : public CxxTest::TestSuite
{
using namespace TARGETING;
errlHndl_t err = NULL;
- RT_TARG::rtChipId_t rt_chipid;
+ TARGETING::rtChipId_t rt_chipid;
TARGETING::TargetHandleList allTargets;
TARGETING::TargetHandleList targetList;
@@ -91,7 +91,7 @@ class TargetingTestSuite : public CxxTest::TestSuite
for(TargetHandleList::iterator pTarg = allTargets.begin();
pTarg != allTargets.end(); ++pTarg)
{
- err = RT_TARG::getRtTarget(*pTarg, rt_chipid);
+ err = TARGETING::getRtTarget(*pTarg, rt_chipid);
if( err )
{
TS_FAIL("getRtTarget returned error log");
@@ -629,7 +629,8 @@ class TargetingTestSuite : public CxxTest::TestSuite
// Compare the complete set of memory
if( memcmp( l_lidStruct, l_rsvdMemPtr, l_attr_size ) )
{
- TS_FAIL( "testSaveRestoreAttrs> Data does not match" );
+ TS_FAIL( "testSaveRestoreAttrs> Data does not match. Attr size = 0x%lx",
+ l_attr_size );
}
uint64_t l_memcmpOffset = 0;
@@ -757,7 +758,6 @@ class TargetingTestSuite : public CxxTest::TestSuite
if(l_memcmpFailed != 0)
{
TS_FAIL("testSaveRestoreAttrs FAILED memcmp %d "
- ERR_MRK"testSaveRestoreAttrs FAILED memcmp %d "
"(0x%.8x) times out of %d (0x%.8x)",
l_memcmpFailed,
l_memcmpFailed,
OpenPOWER on IntegriCloud