Add Axone to RISK_LEVEL logic

Axone reuses the RISK_LEVEL settings for Nimbus DD2.3 so changes
are made to reflect that.  This is primarily a documentation
exercise but there is logic now to normalize the RISK_LEVEl up
to 4,5 versus 0,1 just to stay sane and reduce the test matrix.

Change-Id: I5410d1bf7b12fc7f771e2c9826fcd086b2520091
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76757
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Matthew Raybuck <matthew.raybuck@ibm.com>
Reviewed-by: Jayashankar Padath <jayashankar.padath@in.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 11 insertions, 9 deletions

diff --git a/src/usr/hdat/hdatiplparms.C b/src/usr/hdat/hdatiplparms.C
index 1f4e3f066..c0b24e49d 100755
--- a/src/usr/hdat/hdatiplparms.C
+++ b/src/usr/hdat/hdatiplparms.C
@@ -564,10 +564,7 @@ static void hdatGetFeatureFlagInfo(
     l_ddLevel = l_pvr.getDDLevel();
 
     // Default to Nimbus DD2.3
-    uint8_t l_ddLvlIdx = 2;
-    l_featFlagArr = hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx];
-    l_featFlagArrSize =
-        sizeof(hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx]);
+    uint8_t l_ddLvlIdx = HDAT_NIMBUS_DD_23_IDX;
 
     // Set the value based on DD level and risk level
     if (l_pvr.chipType == PVR_t::NIMBUS_CHIP)
@@ -586,12 +583,17 @@ static void hdatGetFeatureFlagInfo(
         {
             l_ddLvlIdx = HDAT_NIMBUS_DD_23_IDX;
         }
-
-        l_featFlagArr = hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx];
-        l_featFlagArrSize =
-            sizeof(hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx]);
     }
-        
+    else if (l_pvr.chipFamily == PVR_t::P9_AXONE)
+    {
+        // Axone follows the Nimbus DD2.3 settings
+        l_ddLvlIdx = HDAT_NIMBUS_DD_23_IDX;
+    }
+
+    l_featFlagArr = hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx];
+    l_featFlagArrSize =
+      sizeof(hdatIplpFeatureFlagSettingsArray[l_riskLvl][l_ddLvlIdx]);
+
     HDAT_DBG("Feature flag array size:0x%x, Model:0x%x, DD Level:0x%x "
         "Risk Level:0x%x", l_featFlagArrSize, l_pvr.chipType,
          l_ddLevel, l_riskLvl);