From 8b524caae018b295f4ed604f6ce1e96d5a718d75 Mon Sep 17 00:00:00 2001
From: Christian Geddes <crgeddes@us.ibm.com>
Date: Wed, 16 Oct 2019 17:47:04 -0500
Subject: Set endianess attributes in hb_customized_attrs instead of in code

When we first detected we needed to have these attributes differerent
than what the EKB had we set them in the call_mss_eff_config istep
code. Really these should be set in the hb_customized_attrs xml.

Change-Id: I7166a25c53330bf90e423b0e4de718b95344bfb7
RTC: 202491
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/85443
Reviewed-by: Daniel M Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M Crowell <dcrowell@us.ibm.com>
---
 src/usr/isteps/istep07/call_mss_eff_config.C       |  7 ------
 .../common/xmltohb/hb_customized_attrs.xml         | 26 +++++++++++++++++-----
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/usr/isteps/istep07/call_mss_eff_config.C b/src/usr/isteps/istep07/call_mss_eff_config.C
index 00ebcc429..e5ac21875 100644
--- a/src/usr/isteps/istep07/call_mss_eff_config.C
+++ b/src/usr/isteps/istep07/call_mss_eff_config.C
@@ -207,18 +207,11 @@ void*    call_mss_eff_config( void *io_pArgs )
 
     TARGETING::ATTR_MODEL_type l_procModel = TARGETING::targetService().getProcessorModel();
 
-    TARGETING::Target* l_sys = nullptr;
-    targetService().getTopLevelTarget(l_sys);
-    assert( l_sys != nullptr );
-
     TARGETING::TargetHandleList l_membufTargetList;
     TARGETING::TargetHandleList l_mcsTargetList;
     TARGETING::TargetHandleList l_memportTargetList;
     std::vector<fapi2::Target<fapi2::TARGET_TYPE_OCMB_CHIP>> l_fapi_ocmb_targets;
 
-    //TODO RTC: 202491 Ensure endianess in simics matches hardware
-    l_sys->setAttr<TARGETING::ATTR_MSS_OCMB_EXP_STRUCT_MMIO_ENDIAN_CTRL>(fapi2::ENUM_ATTR_MSS_OCMB_EXP_STRUCT_MMIO_ENDIAN_CTRL_NO_SWAP);
-    l_sys->setAttr<TARGETING::ATTR_MSS_OCMB_EXP_STRUCT_ENDIAN>(fapi2::ENUM_ATTR_MSS_OCMB_EXP_STRUCT_ENDIAN_LITTLE_ENDIAN);
 
     if(l_procModel == TARGETING::MODEL_CUMULUS)
     {
diff --git a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
index b5eadd177..904af49c0 100644
--- a/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
+++ b/src/usr/targeting/common/xmltohb/hb_customized_attrs.xml
@@ -292,12 +292,6 @@
           <default>0</default>
      </attribute>
 
-    <attribute>
-          <id>ATTR_MSS_OCMB_EXP_STRUCT_MMIO_WORD_SWAP</id>
-          <default>NO_SWAP</default><!-- @fixme : RTC: 202491 -->
-          <no_export/>
-    </attribute>
-
     <attribute>
           <id>ATTR_SYSTEM_IPL_PHASE</id>
           <default>HB_IPL</default>
@@ -838,6 +832,26 @@
         <writeable/>
         <persistency>volatile-zeroed</persistency>
     </attribute>
+    <!-- OCMB Endianess attributes -->
+    <attribute>
+        <id>ATTR_MSS_OCMB_EXP_STRUCT_ENDIAN</id>
+        <default>0x1</default>
+        <no_export/>
+    </attribute>
+    <attribute>
+        <id>ATTR_MSS_OCMB_EXP_STRUCT_MMIO_ENDIAN_CTRL</id>
+        <default>0x1</default>
+        <no_export/>
+    </attribute>
+    <attribute>
+        <id>ATTR_MSS_OCMB_EXP_STRUCT_MMIO_WORD_SWAP</id>
+        <default>NO_SWAP</default>
+        <no_export/>
+    </attribute>
+    <attribute>
+        <id>ATTR_MSS_OCMB_EXP_OMI_CFG_ENDIAN_CTRL</id>
+        <no_export/>
+    </attribute>
     <!-- =====================================================================
      End of customizations definitions
      ================================================================= -->
-- 
cgit v1.2.1