Convert mss explorer and axone code to use attr accessors

  Add more xml files to accessor generator makefiles
  Also fix const param errors in attr setter functions

Change-Id: I178ee5c420cf6f9f8bae61a6ad80bdaea81e231f
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/69954
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70252
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>

4 files changed, 47 insertions, 92 deletions

diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C
index 0620d2ba5..d49e56051 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.C
@@ -36,6 +36,8 @@
 #include <exp_oc_regs.H>
 #include <exp_inband.H>
 #include <chips/common/utils/chipids.H>
+#include <mss_explorer_attribute_getters.H>
+#include <mss_p9a_attribute_getters.H>
 
 ///
 /// @brief Verify we know how to talk to the connected device
@@ -79,12 +81,12 @@ fapi2::ReturnCode omiSetUpstreamTemplates(const fapi2::Target<fapi2::TARGET_TYPE
     fapi2::ATTR_EXPLR_ENABLE_US_TMPL_1_Type l_enable_tmpl_1;
     fapi2::ATTR_EXPLR_ENABLE_US_TMPL_5_Type l_enable_tmpl_5;
     fapi2::ATTR_EXPLR_ENABLE_US_TMPL_9_Type l_enable_tmpl_9;
-    fapi2::ATTR_EXPLR_ENABLE_US_TMPL_B_Type l_enable_tmpl_B;
+    fapi2::ATTR_EXPLR_ENABLE_US_TMPL_B_Type l_enable_tmpl_b;
     fapi2::ATTR_EXPLR_TMPL_0_PACING_Type l_tmpl_0_pacing;
     fapi2::ATTR_EXPLR_TMPL_1_PACING_Type l_tmpl_1_pacing;
     fapi2::ATTR_EXPLR_TMPL_5_PACING_Type l_tmpl_5_pacing;
     fapi2::ATTR_EXPLR_TMPL_9_PACING_Type l_tmpl_9_pacing;
-    fapi2::ATTR_EXPLR_TMPL_B_PACING_Type l_tmpl_B_pacing;
+    fapi2::ATTR_EXPLR_TMPL_B_PACING_Type l_tmpl_b_pacing;
 
     fapi2::ATTR_CHIP_EC_FEATURE_US_TEMPLATES_0159_Type l_us_only_0159;
 
@@ -96,58 +98,22 @@ fapi2::ReturnCode omiSetUpstreamTemplates(const fapi2::Target<fapi2::TARGET_TYPE
                            l_us_only_0159),
              "Error from FAPI_ATTR_GET (ATTR_CHIP_EC_FEATURE_US_TEMPLATES_0159)");
 
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_ENABLE_US_TMPL_1,
-                           i_target,
-                           l_enable_tmpl_1),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_ENABLE_US_TMPL_1)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_ENABLE_US_TMPL_5,
-                           i_target,
-                           l_enable_tmpl_5),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_ENABLE_US_TMPL_5)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_ENABLE_US_TMPL_9,
-                           i_target,
-                           l_enable_tmpl_9),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_ENABLE_US_TMPL_9)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_ENABLE_US_TMPL_B,
-                           i_target,
-                           l_enable_tmpl_B),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_ENABLE_US_TMPL_B)");
+    FAPI_TRY(mss::attr::get_explr_enable_us_tmpl_1(i_target, l_enable_tmpl_1));
+    FAPI_TRY(mss::attr::get_explr_enable_us_tmpl_5(i_target, l_enable_tmpl_5));
+    FAPI_TRY(mss::attr::get_explr_enable_us_tmpl_9(i_target, l_enable_tmpl_9));
+    FAPI_TRY(mss::attr::get_explr_enable_us_tmpl_b(i_target, l_enable_tmpl_b));
 
-    FAPI_ASSERT(!l_us_only_0159 || !l_enable_tmpl_B,
+    FAPI_ASSERT(!l_us_only_0159 || !l_enable_tmpl_b,
                 fapi2::PROC_DOES_NOT_SUPPORT_US_B()
                 .set_TARGET(l_proc)
-                .set_B(l_enable_tmpl_B),
+                .set_B(l_enable_tmpl_b),
                 "Upstream template B requested, but not supported by proc");
 
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_TMPL_0_PACING,
-                           i_target,
-                           l_tmpl_0_pacing),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_TMPL_0_PACING)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_TMPL_1_PACING,
-                           i_target,
-                           l_tmpl_1_pacing),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_TMPL_1_PACING)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_TMPL_5_PACING,
-                           i_target,
-                           l_tmpl_5_pacing),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_TMPL_5_PACING)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_TMPL_9_PACING,
-                           i_target,
-                           l_tmpl_9_pacing),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_TMPL_9_PACING)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_TMPL_B_PACING,
-                           i_target,
-                           l_tmpl_B_pacing),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_TMPL_B_PACING)");
-
+    FAPI_TRY(mss::attr::get_explr_tmpl_0_pacing(i_target, l_tmpl_0_pacing));
+    FAPI_TRY(mss::attr::get_explr_tmpl_1_pacing(i_target, l_tmpl_1_pacing));
+    FAPI_TRY(mss::attr::get_explr_tmpl_5_pacing(i_target, l_tmpl_5_pacing));
+    FAPI_TRY(mss::attr::get_explr_tmpl_9_pacing(i_target, l_tmpl_9_pacing));
+    FAPI_TRY(mss::attr::get_explr_tmpl_b_pacing(i_target, l_tmpl_b_pacing));
 
     l_data.setBit<EXPLR_OC_OTTCFG_MSB_TEMPLATE_0>(); //Template 0
 
@@ -158,7 +124,7 @@ fapi2::ReturnCode omiSetUpstreamTemplates(const fapi2::Target<fapi2::TARGET_TYPE
     l_data.writeBit<EXPLR_OC_OTTCFG_MSB_TEMPLATE_9>
     (l_enable_tmpl_9 == fapi2::ENUM_ATTR_EXPLR_ENABLE_US_TMPL_9_ENABLED); //Template 9
     l_data.writeBit<EXPLR_OC_OTTCFG_MSB_TEMPLATE_11>
-    (l_enable_tmpl_B == fapi2::ENUM_ATTR_EXPLR_ENABLE_US_TMPL_B_ENABLED); //Template B
+    (l_enable_tmpl_b == fapi2::ENUM_ATTR_EXPLR_ENABLE_US_TMPL_B_ENABLED); //Template B
 
 
     FAPI_TRY(mss::exp::ib::putOCCfg(i_target, EXPLR_OC_OTTCFG_MSB, l_data));
@@ -194,11 +160,11 @@ fapi2::ReturnCode omiSetUpstreamTemplates(const fapi2::Target<fapi2::TARGET_TYPE
         FAPI_DBG("Upstream template 9 enabled with pacing %X", l_tmpl_9_pacing);
     }
 
-    if (l_enable_tmpl_B == fapi2::ENUM_ATTR_EXPLR_ENABLE_US_TMPL_B_ENABLED)
+    if (l_enable_tmpl_b == fapi2::ENUM_ATTR_EXPLR_ENABLE_US_TMPL_B_ENABLED)
     {
         l_data.insertFromRight<EXPLR_OC_OTRCFG76_LSB_TEMPLATE_11,
-                               EXPLR_OC_OTRCFG76_LSB_TEMPLATE_11_LEN>(l_tmpl_B_pacing);
-        FAPI_DBG("Upstream template B enabled with pacing %X", l_tmpl_B_pacing);
+                               EXPLR_OC_OTRCFG76_LSB_TEMPLATE_11_LEN>(l_tmpl_b_pacing);
+        FAPI_DBG("Upstream template B enabled with pacing %X", l_tmpl_b_pacing);
     }
 
     FAPI_TRY(mss::exp::ib::putOCCfg(i_target, EXPLR_OC_OTRCFG76_LSB, l_data));
@@ -227,21 +193,9 @@ fapi2::ReturnCode omiTLVersionShortBackOff(const fapi2::Target<fapi2::TARGET_TYP
     auto const& l_proc = i_target.getParent<fapi2::TARGET_TYPE_OMI>()
                          .getParent<fapi2::TARGET_TYPE_PROC_CHIP>();
 
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_SHRT_BACKOFF_TIMER,
-                           i_target,
-                           l_short_backoff),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_SHRT_BACKOFF_TIMER)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_OMI_OC_MAJOR_VER,
-                           l_proc,
-                           l_proc_oc_major),
-             "Error from FAPI_ATTR_GET (ATTR_PROC_OMI_OC_MAJOR_VER)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_OMI_OC_MINOR_VER,
-                           l_proc,
-                           l_proc_oc_minor),
-             "Error from FAPI_ATTR_GET (ATTR_PROC_OMI_OC_MINOR_VER)");
-
+    FAPI_TRY(mss::attr::get_explr_shrt_backoff_timer(i_target, l_short_backoff));
+    FAPI_TRY(mss::attr::get_omi_oc_major_ver(l_proc, l_proc_oc_major));
+    FAPI_TRY(mss::attr::get_omi_oc_minor_ver(l_proc, l_proc_oc_minor));
 
     //Write proc's supported OC version
     l_data.insertFromRight<EXPLR_OC_OVERCFG_LSB_TL_MAJOR_VERSION_CONFIGURATION,
@@ -540,30 +494,11 @@ fapi2::ReturnCode omiSetACTagPASIDMetaData(const fapi2::Target<fapi2::TARGET_TYP
     fapi2::buffer<uint32_t> l_afu_actag_len_supported;
     fapi2::buffer<uint32_t> l_pasid_len_supported;
 
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_METADATA_ENABLE,
-                           i_target,
-                           l_meta_data_ena),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_METADATA_ENABLE)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_PASID_BASE,
-                           i_target,
-                           l_pasid_base),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_PASID_BASE)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_ACTAG_BASE,
-                           i_target,
-                           l_actag_base),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_ACTAG_BASE)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_AFU_ACTAG_LEN,
-                           i_target,
-                           l_afu_actag_len),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_AFU_ACTAG_LEN)");
-
-    FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_EXPLR_PASID_LEN,
-                           i_target,
-                           l_pasid_len),
-             "Error from FAPI_ATTR_GET (ATTR_EXPLR_PASID_LEN)");
+    FAPI_TRY(mss::attr::get_explr_metadata_enable(i_target, l_meta_data_ena));
+    FAPI_TRY(mss::attr::get_explr_pasid_base(i_target, l_pasid_base));
+    FAPI_TRY(mss::attr::get_explr_actag_base(i_target, l_actag_base));
+    FAPI_TRY(mss::attr::get_explr_afu_actag_len(i_target, l_afu_actag_len));
+    FAPI_TRY(mss::attr::get_explr_pasid_len(i_target, l_pasid_len));
 
     //Set PASID Base and enable metadata
     FAPI_TRY(mss::exp::ib::getOCCfg(i_target, EXPLR_OC_OCTRLPID_MSB, l_value));
diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.mk b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.mk
index 15c5a50b1..7458548da 100644
--- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.mk
+++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/exp_omi_init.mk
@@ -24,10 +24,12 @@
 # IBM_PROLOG_END_TAG
 # Makefile for exp_omi_init HWP
 PROCEDURE=exp_omi_init
+$(eval $(call ADD_EXP_MEMORY_INCDIRS,$(PROCEDURE)))
 lib$(PROCEDURE)_DEPLIBS+=mss_generic
 lib$(PROCEDURE)_DEPLIBS+=exp_inband
 $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/ocmb/explorer/common/include)
 $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/ocmb/explorer/common/inband)
 $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/nest)
+$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9a/procedures/hwp/memory/lib)
 $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH))
 $(call BUILD_PROCEDURE)
diff --git a/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_init.xml b/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_init.xml
index 6db7aec3e..9aef0ec20 100644
--- a/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_init.xml
+++ b/src/import/chips/ocmb/explorer/procedures/xml/attribute_info/exp_omi_init.xml
@@ -48,6 +48,7 @@
   </enum>
   <default>DISABLED</default>
   <platInit/>
+  <mssAccessorName>explr_enable_us_tmpl_1</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -64,6 +65,7 @@
   </enum>
   <default>ENABLED</default>
   <platInit/>
+  <mssAccessorName>explr_enable_us_tmpl_5</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -80,6 +82,7 @@
   </enum>
   <default>ENABLED</default>
   <platInit/>
+  <mssAccessorName>explr_enable_us_tmpl_9</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -96,6 +99,7 @@
   </enum>
   <default>DISABLED</default>
   <platInit/>
+  <mssAccessorName>explr_enable_us_tmpl_a</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -112,6 +116,7 @@
   </enum>
   <default>DISABLED</default>
   <platInit/>
+  <mssAccessorName>explr_enable_us_tmpl_b</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -123,6 +128,7 @@
   <valueType>uint8</valueType>
   <default>0xF</default>
   <platInit/>
+  <mssAccessorName>explr_tmpl_0_pacing</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -134,6 +140,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_tmpl_1_pacing</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -145,6 +152,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_tmpl_5_pacing</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -156,6 +164,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_tmpl_9_pacing</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -167,6 +176,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_tmpl_b_pacing</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -178,6 +188,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_shrt_backoff_timer</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -189,6 +200,7 @@
   <valueType>uint8</valueType>
   <default>0x1</default>
   <platInit/>
+  <mssAccessorName>explr_metadata_enable</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -200,6 +212,7 @@
   <valueType>uint32</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_pasid_base</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -211,6 +224,7 @@
   <valueType>uint32</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_actag_base</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -225,6 +239,7 @@
   <valueType>uint32</valueType>
   <default>0x1</default>
   <platInit/>
+  <mssAccessorName>explr_afu_actag_len</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -239,6 +254,7 @@
   <valueType>uint8</valueType>
   <default>0x0</default>
   <platInit/>
+  <mssAccessorName>explr_pasid_len</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 </attributes>
diff --git a/src/import/chips/p9/procedures/xml/attribute_info/p9a_omi_init.xml b/src/import/chips/p9/procedures/xml/attribute_info/p9a_omi_init.xml
index 565f0bf87..6182c21a4 100644
--- a/src/import/chips/p9/procedures/xml/attribute_info/p9a_omi_init.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/p9a_omi_init.xml
@@ -183,6 +183,7 @@
   <default>0x3</default>
   <writeable/>
   <platInit/>
+  <mssAccessorName>omi_oc_major_ver</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 <attribute>
@@ -195,6 +196,7 @@
   <default>0x1</default>
   <writeable/>
   <platInit/>
+  <mssAccessorName>omi_oc_minor_ver</mssAccessorName>
 </attribute>
 <!-- ********************************************************************** -->
 </attributes>