Revert "Initf procedure updates for OMI rings for Axone"

This reverts commit 19228973bc00b3b9433470177c1878c46ab65450.

Change-Id: I131098b902f3ce99c9aab35bab5ff20b3e2a4548
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64801
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64812
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>

3 files changed, 2 insertions, 65 deletions

diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
index 5db665d5..4a2adabe 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_gptr_time_initf.C
@@ -50,13 +50,9 @@ fapi2::ReturnCode p9_sbe_gptr_time_initf(const
     bool mc01_iom23 = false;
     bool mc23_iom01 = false;
     bool mc23_iom23 = false;
-    uint8_t l_read_attr_axone_only;
 
     FAPI_INF("p9_sbe_gptr_time_initf: Entering ...");
 
-    FAPI_DBG("Reading ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY\n");
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY, i_target_chip, l_read_attr_axone_only));
-
     for( auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>
          ( fapi2::TARGET_STATE_FUNCTIONAL))
     {
@@ -139,7 +135,7 @@ fapi2::ReturnCode p9_sbe_gptr_time_initf(const
         }
     }
 
-    // mc - Cumulus, Axone
+    // mc - Cumulus
     for (auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MC>
          (fapi2::TARGET_STATE_FUNCTIONAL))
     {
@@ -153,26 +149,6 @@ fapi2::ReturnCode p9_sbe_gptr_time_initf(const
         FAPI_DBG("Scan mc_time ring");
         FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_time),
                  "Error from putRing (mc_time)");
-
-        // Axone only
-        if (l_read_attr_axone_only)
-        {
-            FAPI_DBG("Scan mc_omi0_gptr, mc_omi1_gptr, mc_omi2_gptr ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi0_gptr),
-                     "Error from putRing (mc_omi0_gptr)");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi1_gptr),
-                     "Error from putRing (mc_omi1_gptr)");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi2_gptr),
-                     "Error from putRing (mc_omi2_gptr)");
-
-            FAPI_DBG("Scan mc_omippe_gptr ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omippe_gptr),
-                     "Error from putRing (mc_omippe_gptr)");
-
-            FAPI_DBG("Scan mc_omippe_time ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omippe_time),
-                     "Error from putRing (mc_omippe_time)");
-        }
     }
 
     // mc - Cumulus
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
index fb0c8de4..ed2d87df 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_nest_initf.C
@@ -56,9 +56,6 @@ fapi2::ReturnCode p9_sbe_nest_initf(const
     bool mc23_iom01 = false;
     bool mc23_iom23 = false;
 #endif
-    uint8_t l_read_attr_axone_only;
-    FAPI_DBG("Reading ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY\n");
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY, i_target_chip, l_read_attr_axone_only));
 
     for (auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>(fapi2::TARGET_STATE_FUNCTIONAL))
     {
@@ -195,36 +192,11 @@ fapi2::ReturnCode p9_sbe_nest_initf(const
         }
     }
 
-    // mc - Nimbus
     for (auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MCBIST>(fapi2::TARGET_STATE_FUNCTIONAL))
     {
         FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_fure));
     }
 
-    // mc - Cumulus, Axone
-    for (auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MC>(fapi2::TARGET_STATE_FUNCTIONAL))
-    {
-        FAPI_DBG("Scan mc_fure ring");
-        FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_fure));
-
-        // Axone only
-        if (l_read_attr_axone_only)
-        {
-            FAPI_DBG("Scan mc_omi0_fure ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi0_fure));
-
-            FAPI_DBG("Scan mc_omi1_fure ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi1_fure));
-
-            FAPI_DBG("Scan mc_omi2_fure ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omi2_fure));
-
-            FAPI_DBG("Scan mc_omippe_fure ring");
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omippe_fure));
-        }
-    }
-
-
 #if 0
 
     // mcbist0
diff --git a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
index 2223298d..858d9be0 100644
--- a/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
+++ b/src/import/chips/p9/procedures/hwp/perv/p9_sbe_repr_initf.C
@@ -49,16 +49,12 @@ fapi2::ReturnCode p9_sbe_repr_initf(const
     bool mc01_iom23 = false;
     bool mc23_iom23 = false;
     uint8_t l_read_attr_cumulus_only;
-    uint8_t l_read_attr_axone_only;
 
     FAPI_INF("p9_sbe_repr_initf: Entering ...");
 
     FAPI_DBG("Reading ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY\n");
     FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9C_LOGIC_ONLY, i_target_chip, l_read_attr_cumulus_only));
 
-    FAPI_DBG("Reading ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY\n");
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_P9A_LOGIC_ONLY, i_target_chip, l_read_attr_axone_only));
-
     for( auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_PERV>
          ( fapi2::TARGET_STATE_FUNCTIONAL))
     {
@@ -83,17 +79,10 @@ fapi2::ReturnCode p9_sbe_repr_initf(const
         FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_repr));
     }
 
-    // mc - Cumulus, Axone
+    // mc - Cumulus
     for (auto& l_chplt_trgt : i_target_chip.getChildren<fapi2::TARGET_TYPE_MC>(fapi2::TARGET_STATE_FUNCTIONAL))
     {
         FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_repr));
-
-        // Axone only
-        if (l_read_attr_axone_only)
-        {
-            FAPI_TRY(fapi2::putRing(l_chplt_trgt, mc_omippe_repr),
-                     "Error from putRing (mc_omippe_repr)");
-        }
     }
 
     // mc - Cumulus