diff options
| author | Mike Jones <mjjones@us.ibm.com> | 2013-04-08 10:53:24 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-04-22 16:59:21 -0500 |
| commit | 200fd79ccf031db09b25cd47330003654b09dd3a (patch) | |
| tree | f402cf8e90554e82a782bd97d9430bfa859ebe77 /src/usr/hwpf | |
| parent | 37975f1274aff10c9e19015030c8fec2c58bc277 (diff) | |
| download | talos-hostboot-200fd79ccf031db09b25cd47330003654b09dd3a.tar.gz talos-hostboot-200fd79ccf031db09b25cd47330003654b09dd3a.zip | |
Trace xbus/abus units properly in SCAN trace
The HWPF Platform's implementation of fapi::Target::toString needs to
be expanded to cope with xbus/abus targets, currently, it just prints p8
Change-Id: Ibac1506b9a03b44ebee7c837a5e08aa5321ab4ab
RTC: 68686
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/3945
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf')
| -rw-r--r-- | src/usr/hwpf/plat/fapiPlatTarget.C | 70 |
1 files changed, 38 insertions, 32 deletions
diff --git a/src/usr/hwpf/plat/fapiPlatTarget.C b/src/usr/hwpf/plat/fapiPlatTarget.C index 50a5d873b..bff705233 100644 --- a/src/usr/hwpf/plat/fapiPlatTarget.C +++ b/src/usr/hwpf/plat/fapiPlatTarget.C @@ -1,25 +1,25 @@ -// IBM_PROLOG_BEGIN_TAG -// This is an automatically generated prolog. -// -// $Source: src/usr/hwpf/plat/fapiPlatTarget.C $ -// -// IBM CONFIDENTIAL -// -// COPYRIGHT International Business Machines Corp. 2011 -// -// 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 +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/hwpf/plat/fapiPlatTarget.C $ */ +/* */ +/* IBM CONFIDENTIAL */ +/* */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ +/* */ +/* 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 platTarget.C * @@ -88,7 +88,7 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const } else { - // TODO + // TODO. RTC 47493 // This is a temporary function that constructs the ECMD String from the // target's physical path attribute, eventually, the ECMD String will be // its own attribute (sourced from the MRW) and this function will be @@ -110,7 +110,7 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const // and a single space is added // // <chip> = chip type ("p8" = processor, "centaur" = memory buffer) - // <unit> = unit type ("ex", "mcs", "mbs", "mba") + // <unit> = unit type ("ex", "mcs", "mba", "abus", "xbus") // kX = cage number. Always zero // nX = node number. Always zero in HostBoot (right now) // sX = slot number. Always zero @@ -126,10 +126,11 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const const char * const ECMD_CHIP_PROC_SPC = " "; const char * const ECMD_CHIP_MEMBUF = "centaur"; const char * const ECMD_CHIP_MEMBUF_SPC = " "; - const char * const ECMD_CHIPLET_EX = "ex "; - const char * const ECMD_CHIPLET_MCS = "mcs "; - const char * const ECMD_CHIPLET_MBS = "mbs "; - const char * const ECMD_CHIPLET_MBA = "mba "; + const char * const ECMD_CHIPLET_EX = "ex "; + const char * const ECMD_CHIPLET_MCS = "mcs "; + const char * const ECMD_CHIPLET_MBA = "mba "; + const char * const ECMD_CHIPLET_XBUS = "xbus "; + const char * const ECMD_CHIPLET_ABUS = "abus "; // Look for a chip in the path const char * l_pChipType = NULL; @@ -179,14 +180,19 @@ void Target::toString(char (&o_ecmdString)[MAX_ECMD_STRING_LEN]) const l_pChipletType = ECMD_CHIPLET_MCS; l_chipletPos = l_path[i].instance; } - else if (l_path[i].type == TARGETING::TYPE_MBS) + else if (l_path[i].type == TARGETING::TYPE_MBA) { - l_pChipletType = ECMD_CHIPLET_MBS; + l_pChipletType = ECMD_CHIPLET_MBA; l_chipletPos = l_path[i].instance; } - else if (l_path[i].type == TARGETING::TYPE_MBA) + else if (l_path[i].type == TARGETING::TYPE_XBUS) { - l_pChipletType = ECMD_CHIPLET_MBA; + l_pChipletType = ECMD_CHIPLET_XBUS; + l_chipletPos = l_path[i].instance; + } + else if (l_path[i].type == TARGETING::TYPE_ABUS) + { + l_pChipletType = ECMD_CHIPLET_ABUS; l_chipletPos = l_path[i].instance; } } |
