Skip to content

Commit

Permalink
p9_proc_gettracearray -- updates for Axone
Browse files Browse the repository at this point in the history
p9_tracearray_defs.H:
- adjust value of PROC_TB_LAST_AXONE_CHIP_TARGET, to cover NPU busses
  only
- introduce PROC_TB_LAST_AXONE_MC_TARGET, to cover OMI busses
  that logically associate with MC pervasive targets

p9_proc_gettracearray.H:
- update proc_gettracearray_target_type to return TARGET_TYPE_MC for
  Axone OMI busses

p9_sbe_tracearray.H:
- update p9_sbe_tracearray_target_type to return TARGET_TYPE_PERV for
  Axone OMI busses

p9_proc_gettracearray_wrap.C:
- add eCMD looper to determine chip type
- use chip type to swizzle target type returned by
  proc_gettracearray_target_type from MCBIST to MC, when running
  on Axone or Cumulus

Change-Id: I5c729385c685ed3b1aac02f1f63b2c81f3e2f0e0
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82308
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: Adam S Hale <adam.samuel.hale@ibm.com>
Dev-Ready: Joseph J McGill <jmcgill@us.ibm.com>
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/82318
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
  • Loading branch information
jjmcgill authored and dcrowell77 committed Aug 21, 2019
1 parent 0ea4fac commit 1fb1c42
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
Expand Up @@ -63,6 +63,7 @@ static const fapi2::TargetType PROC_GETTRACEARRAY_TARGET_TYPES =
fapi2::TARGET_TYPE_PROC_CHIP |
fapi2::TARGET_TYPE_OBUS |
fapi2::TARGET_TYPE_MCBIST |
fapi2::TARGET_TYPE_MC |
fapi2::TARGET_TYPE_EX |
fapi2::TARGET_TYPE_CORE;

Expand Down Expand Up @@ -106,6 +107,10 @@ extern "C"
{
return fapi2::TARGET_TYPE_PROC_CHIP;
}
else if (i_trace_bus <= _PROC_TB_LAST_AXONE_MC_TARGET)
{
return fapi2::TARGET_TYPE_MC;
}
else
{
return fapi2::TARGET_TYPE_EX;
Expand Down
4 changes: 4 additions & 0 deletions src/import/chips/p9/procedures/hwp/perv/p9_sbe_tracearray.H
Expand Up @@ -128,6 +128,10 @@ extern "C" {
{
return fapi2::TARGET_TYPE_PROC_CHIP;
}
else if (i_trace_bus <= _PROC_TB_LAST_AXONE_MC_TARGET)
{
return fapi2::TARGET_TYPE_PERV;
}
else
{
return fapi2::TARGET_TYPE_EX;
Expand Down
5 changes: 4 additions & 1 deletion src/import/chips/p9/procedures/hwp/perv/p9_tracearray_defs.H
Expand Up @@ -176,11 +176,14 @@ enum p9_tracearray_bus_id
PROC_TB_NPU11,
PROC_TB_NPU20,
PROC_TB_NPU21,

_PROC_TB_LAST_AXONE_CHIP_TARGET = PROC_TB_NPU21,

PROC_TB_OMI0,
PROC_TB_OMI1,
PROC_TB_OMI2,

_PROC_TB_LAST_AXONE_CHIP_TARGET = PROC_TB_OMI2,
_PROC_TB_LAST_AXONE_MC_TARGET = PROC_TB_OMI2,

PROC_TB_SKIT00,
PROC_TB_SKIT01,
Expand Down

0 comments on commit 1fb1c42

Please sign in to comment.