From e0373c9878e6ece88c090a0d2cad3beedd858198 Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Fri, 26 Oct 2018 14:08:24 -0500 Subject: Add Axone targets to fapi error utilities Added a few constants and case statements to cover the Axone targets in the convertSbeTargInstanceToFapiPos path. Change-Id: I38937f37bec051f279f837c48a7e5ce013bb23d8 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68071 Tested-by: Jenkins Server Tested-by: HWSV CI Tested-by: PPE CI Tested-by: Hostboot CI Reviewed-by: Christian R. Geddes Reviewed-by: Matt K. Light Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68080 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW --- src/import/hwpf/fapi2/include/error_info_defs.H | 27 ++++++++++++------- src/import/hwpf/fapi2/src/fapi2_utils.C | 36 +++++++++++++++++++++++++ 2 files changed, 53 insertions(+), 10 deletions(-) (limited to 'src/import/hwpf') diff --git a/src/import/hwpf/fapi2/include/error_info_defs.H b/src/import/hwpf/fapi2/include/error_info_defs.H index e5347ae84..79a11b69c 100644 --- a/src/import/hwpf/fapi2/include/error_info_defs.H +++ b/src/import/hwpf/fapi2/include/error_info_defs.H @@ -163,16 +163,23 @@ enum ErrorInfoType // @brief used when translating the SBE targets instance into a fapi pos. enum maxTargetsPerProc : uint16_t { - MAX_MCBIST_PER_PROC = 2, - MAX_MC_PER_PROC = 2, - MAX_MI_PER_PROC = 4, - MAX_MCS_PER_PROC = 4, - MAX_EQ_PER_PROC = 6, - MAX_MCA_PER_PROC = 8, - MAX_PHB_PER_PROC = 6, - MAX_EX_PER_PROC = 12, - MAX_CORE_PER_PROC = 24, - MAX_PERV_PER_PROC = 56, + MAX_MCBIST_PER_PROC = 2, //Nimbus + MAX_MC_PER_PROC = 2, //Cumulus,Axone + MAX_MI_PER_PROC = 4, //Cumulus,Axone + MAX_MCS_PER_PROC = 4, //Nimbus + MAX_EQ_PER_PROC = 6, //Nimbus,Cumulus,Axone + MAX_MCA_PER_PROC = 8, //Nimbus + MAX_PHB_PER_PROC = 6, //Nimbus,Cumulus,Axone + MAX_EX_PER_PROC = 12, //Nimbus,Cumulus,Axone + MAX_CORE_PER_PROC = 24, //Nimbus,Cumulus,Axone + MAX_PERV_PER_PROC = 56, //Nimbus,Cumulus,Axone + MAX_OBUS_PER_PROC = 4, //Nimbus,Cumulus,Axone + MAX_PEC_PER_PROC = 3, //Nimbus,Cumulus,Axone + MAX_OMI_PER_PROC = 16, //Axone + MAX_OMIC_PER_PROC = 6, //Axone + MAX_MCC_PER_PROC = 8, //Axone + MAX_OCMB_CHIP_PER_PROC = MAX_OMI_PER_PROC, //Axone + INVALID_TARGET_COUNT = 0xFFFF, INVALID_FAPI_POS = INVALID_TARGET_COUNT, }; diff --git a/src/import/hwpf/fapi2/src/fapi2_utils.C b/src/import/hwpf/fapi2/src/fapi2_utils.C index f1124d508..e00f9a56f 100644 --- a/src/import/hwpf/fapi2/src/fapi2_utils.C +++ b/src/import/hwpf/fapi2/src/fapi2_utils.C @@ -154,6 +154,42 @@ uint16_t convertSbeTargInstanceToFapiPos(fapi2::TargetType i_targType, break; } + case TARGET_TYPE_OBUS: + { + max_targets = MAX_OBUS_PER_PROC; + break; + } + + case TARGET_TYPE_PEC: + { + max_targets = MAX_PEC_PER_PROC; + break; + } + + case TARGET_TYPE_OMI: + { + max_targets = MAX_OMI_PER_PROC; + break; + } + + case TARGET_TYPE_OMIC: + { + max_targets = MAX_OMIC_PER_PROC; + break; + } + + case TARGET_TYPE_MCC: + { + max_targets = MAX_MCC_PER_PROC; + break; + } + + case TARGET_TYPE_OCMB_CHIP: + { + max_targets = MAX_OCMB_CHIP_PER_PROC; + break; + } + default: max_targets = INVALID_TARGET_COUNT; break; -- cgit v1.2.1