Change accesses to IS_SIM to use mss accessor

Change-Id: I084addd19c90bbb9b28ce67517092ea7cffc3610
Original-Change-Id: Iafcaddbca510c29fb4a0289490b90b539dde2b13
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37610
Reviewed-by: Brian R. Silver <bsilver@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: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/39395
Reviewed-by: JACOB L. HARVEY <jlharvey@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: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 9 insertions, 9 deletions

diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
index 15a6583ff..532eb330a 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.C
@@ -180,7 +180,7 @@ fapi2::ReturnCode operation<TARGET_TYPE_MCBIST>::single_port_init()
 
     // The address should have the port and DIMM noted in it. All we need to do is calculate the
     // remainder of the address
-    if (iv_is_sim)
+    if (iv_l_sim)
     {
         iv_const.iv_start_address.get_sim_end_address(iv_const.iv_end_address);
     }
@@ -221,7 +221,7 @@ fapi2::ReturnCode operation<TARGET_TYPE_MCBIST>::multi_port_addr()
     // we don't run too many cycles. Also, if there are intermediate ports the end addresses of those ports
     // need to be limited as well - they override the end address of a complete port (which is otherwise the
     // largest address.)
-    if (iv_is_sim)
+    if (iv_l_sim)
     {
         iv_const.iv_start_address.get_sim_end_address(l_end_of_start_port);
         mss::mcbist::address().get_sim_end_address(l_end_of_complete_port);
@@ -379,7 +379,7 @@ continuous_scrub_operation<TARGET_TYPE_MCBIST>::continuous_scrub_operation(
     // We leverage the MCBIST's ability to skip invalid addresses, and just setup
     // If we're running in the simulator, we want to only touch the addresses which training touched
     // *INDENT-OFF*
-    iv_is_sim ?
+    iv_l_sim ?
         l_generic_start_address.get_sim_end_address(l_generic_end_address) :
         l_generic_start_address.get_range<mss::mcbist::address::DIMM>(l_generic_end_address);
     // *INDENT-ON*
@@ -436,7 +436,7 @@ continuous_scrub_operation<TARGET_TYPE_MCBIST>::continuous_scrub_operation(
         // We don't need to account for the simulator here as the caller can do that when they setup the
         // start address.
         // *INDENT-OFF*
-        iv_is_sim ?
+        iv_l_sim ?
             iv_const.iv_start_address.get_sim_end_address(iv_const.iv_end_address) :
             iv_const.iv_start_address.get_range<mss::mcbist::address::DIMM>(iv_const.iv_end_address);
         // *INDENT-ON*
@@ -504,10 +504,10 @@ fapi2::ReturnCode sf_init( const fapi2::Target<TARGET_TYPE_MCBIST>& i_target,
 {
     FAPI_INF("superfast init start");
 
-    uint8_t is_sim = false;
-    FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_IS_SIMULATION, fapi2::Target<TARGET_TYPE_SYSTEM>(), is_sim) );
+    uint8_t l_sim = false;
+    FAPI_TRY( mss::is_simulation( l_sim) );
 
-    if (is_sim)
+    if (l_sim)
     {
         // Use some sort of pattern in sim in case the verification folks need to look for something
         // TK. Need a verification pattern. This is a not-good pattern for verification ... We don't really
diff --git a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
index dafb88000..f74c68d70 100644
--- a/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
+++ b/src/import/chips/p9/procedures/hwp/memory/lib/mcbist/memdiags.H
@@ -107,7 +107,7 @@ class operation
             iv_subtest(i_subtest),
             iv_const(i_const)
         {
-            FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_IS_SIMULATION, fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>(), iv_is_sim) );
+            FAPI_TRY( mss::is_simulation (iv_l_sim) );
             return;
 
         fapi_try_exit:
@@ -178,7 +178,7 @@ class operation
         mss::mcbist::subtest_t<T> iv_subtest;
         constraints               iv_const;
         mss::mcbist::program<T>   iv_program;
-        uint8_t                   iv_is_sim;
+        uint8_t                   iv_l_sim;
 };
 
 ///