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 <pfd-jenkins+hostboot@us.ibm.com> Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com> Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com> Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com> Reviewed-by: Matt K. Light <mklight@us.ibm.com> Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com> Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68080 Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
open-power · Nov 15, 2018 · e0373c9 · e0373c9
1 parent 9e552af
commit e0373c9
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 10 deletions.
diff --git 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
@@ -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;