summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBrian Horton <brianh@linux.ibm.com>2012-08-02 10:19:13 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-09-05 15:19:39 -0500
commitc07b8bb150f1464e17ebf3672460564ec3e8947c (patch)
tree06b450bee68037dba408afa8783d31c31438b956 /src
parent348e054c2d70697169a4ecbdc2eaab1932bd322c (diff)
downloadtalos-hostboot-c07b8bb150f1464e17ebf3672460564ec3e8947c.tar.gz
talos-hostboot-c07b8bb150f1464e17ebf3672460564ec3e8947c.zip
Add node as default parameter to masterProcChipTargetHandle()
Node will default to 0, so no callers have to change. For hostboot, callers will ALWAYS keep this as 0. For FSP code, node could be different. Change-Id: Ib78004dbf89cdee2cfceda6a0c8a54c96380bee1 RTC: 45742 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1465 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com> Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/usr/targeting/common/targetservice.H50
-rw-r--r--src/usr/targeting/common/targetservice.C52
2 files changed, 52 insertions, 50 deletions
diff --git a/src/include/usr/targeting/common/targetservice.H b/src/include/usr/targeting/common/targetservice.H
index d9610e84a..2082ee149 100644
--- a/src/include/usr/targeting/common/targetservice.H
+++ b/src/include/usr/targeting/common/targetservice.H
@@ -1,26 +1,25 @@
-/* IBM_PROLOG_BEGIN_TAG
- * This is an automatically generated prolog.
- *
- * $Source: src/include/usr/targeting/common/targetservice.H $
- *
- * IBM CONFIDENTIAL
- *
- * COPYRIGHT International Business Machines Corp. 2011-2012
- *
- * p1
- *
- * Object Code Only (OCO) source materials
- * Licensed Internal Code Source Materials
- * IBM HostBoot Licensed Internal Code
- *
- * The source code for this program is not published or other-
- * wise divested of its trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- *
- * Origin: 30
- *
- * IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/include/usr/targeting/common/targetservice.H $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
#ifndef __TARGETING_COMMON_TARGETSERVICE_H
#define __TARGETING_COMMON_TARGETSERVICE_H
@@ -324,6 +323,8 @@ class TargetService
*
* @param[out] o_masterProcChipTarget Target handle referring to the
* current master processor chip (the one connected to PNOR)
+ * @param[in] i_node Node that this master resides on (default
+ * is 0)
*
* @pre None
*
@@ -332,7 +333,8 @@ class TargetService
* information is not yet initialized
*/
void masterProcChipTargetHandle(
- Target*& o_masterProcChipTargetHandle) const;
+ Target*& o_masterProcChipTargetHandle,
+ uint8_t i_node = 0) const;
/**
* @brief Returns whether the specified entity path attribute exists
diff --git a/src/usr/targeting/common/targetservice.C b/src/usr/targeting/common/targetservice.C
index 605933241..ab534100a 100644
--- a/src/usr/targeting/common/targetservice.C
+++ b/src/usr/targeting/common/targetservice.C
@@ -1,26 +1,25 @@
-/* IBM_PROLOG_BEGIN_TAG
- * This is an automatically generated prolog.
- *
- * $Source: src/usr/targeting/common/targetservice.C $
- *
- * IBM CONFIDENTIAL
- *
- * COPYRIGHT International Business Machines Corp. 2011-2012
- *
- * p1
- *
- * Object Code Only (OCO) source materials
- * Licensed Internal Code Source Materials
- * IBM HostBoot Licensed Internal Code
- *
- * The source code for this program is not published or other-
- * wise divested of its trade secrets, irrespective of what has
- * been deposited with the U.S. Copyright Office.
- *
- * Origin: 30
- *
- * IBM_PROLOG_END_TAG
- */
+/* IBM_PROLOG_BEGIN_TAG */
+/* This is an automatically generated prolog. */
+/* */
+/* $Source: src/usr/targeting/common/targetservice.C $ */
+/* */
+/* IBM CONFIDENTIAL */
+/* */
+/* COPYRIGHT International Business Machines Corp. 2011,2012 */
+/* */
+/* p1 */
+/* */
+/* Object Code Only (OCO) source materials */
+/* Licensed Internal Code Source Materials */
+/* IBM HostBoot Licensed Internal Code */
+/* */
+/* The source code for this program is not published or otherwise */
+/* divested of its trade secrets, irrespective of what has been */
+/* deposited with the U.S. Copyright Office. */
+/* */
+/* Origin: 30 */
+/* */
+/* IBM_PROLOG_END_TAG */
/**
* @file targeting/common/targetservice.C
*
@@ -319,11 +318,12 @@ Target* TargetService::toTarget(
}
//******************************************************************************
-// TargetService::masterProcChipTarget
+// TargetService::masterProcChipTargetHandle
//******************************************************************************
void TargetService::masterProcChipTargetHandle(
- Target*& o_masterProcChipTargetHandle) const
+ Target*& o_masterProcChipTargetHandle,
+ const uint8_t i_node) const
{
#define TARG_FN "masterProcChipTargetHandle(...)"
@@ -336,7 +336,7 @@ void TargetService::masterProcChipTargetHandle(
// PNOR to determine the master chip
// target; for now, just always report sys0.n0.proc0
EntityPath l_masterProcChipEntityPath(EntityPath::PATH_PHYSICAL);
- l_masterProcChipEntityPath.addLast(TYPE_SYS, 0).addLast(TYPE_NODE, 0)
+ l_masterProcChipEntityPath.addLast(TYPE_SYS, 0).addLast(TYPE_NODE, i_node)
.addLast(TYPE_PROC, 0);
l_pTarget = l_masterProcChipEntityPath.operator->();
OpenPOWER on IntegriCloud