Fix HWSV duplicate enum build errors

  p9_putmemproc.H uses the same SBE_MEM_ACCESS flag names as in SBE.
  This caused a duplicated definition errors when building HWSV.
  The fix is to have the enum defined in fapi2 namespace inside
  p9_putmemproc.H

Change-Id: I902fc26503213d607bf108fde47968867ce51345
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53192
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53299
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>

3 files changed, 41 insertions, 30 deletions

diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_build_smp_adu.C b/src/import/chips/p9/procedures/hwp/nest/p9_build_smp_adu.C
index 78c52f970..16c4ac03e 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_build_smp_adu.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_build_smp_adu.C
@@ -194,20 +194,20 @@ fapi2::ReturnCode p9_build_smp_adu_set_switch_action(
     fapi2::ReturnCode l_rc;
     uint64_t l_addr = 0x0ULL;
     uint32_t l_bytes = 1;
-    uint32_t l_flags = SBE_MEM_ACCESS_FLAGS_TARGET_PROC;
+    uint32_t l_flags = fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC;
     uint8_t l_data_unused[1];
 
     if (i_action == SWITCH_AB)
     {
-        l_flags |= SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE;
+        l_flags |= fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE;
     }
     else if (i_action == SWITCH_CD)
     {
-        l_flags |= SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE;
+        l_flags |= fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE;
     }
     else
     {
-        l_flags |= SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE;
+        l_flags |= fapi2::SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE;
     }
 
     // issue operation
@@ -237,7 +237,7 @@ fapi2::ReturnCode p9_build_smp_sequence_adu(p9_build_smp_system& i_smp,
     fapi2::ReturnCode l_rc;
 
     // validate input action, set ADU operation parameters
-    uint32_t l_flags = SBE_MEM_ACCESS_FLAGS_TARGET_PROC;
+    uint32_t l_flags = fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC;
     uint32_t l_bytes = 1;
     uint64_t l_addr = 0x0ULL;
     uint8_t l_data_unused[1];
@@ -246,11 +246,11 @@ fapi2::ReturnCode p9_build_smp_sequence_adu(p9_build_smp_system& i_smp,
     {
         case SWITCH_AB:
         case SWITCH_CD:
-            l_flags |= SBE_MEM_ACCESS_FLAGS_SWITCH_MODE;
+            l_flags |= fapi2::SBE_MEM_ACCESS_FLAGS_SWITCH_MODE;
             break;
 
         case QUIESCE:
-            l_flags |= SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE;
+            l_flags |= fapi2::SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE;
             break;
 
         default:
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.C b/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.C
index 3b790d60b..50b9c9433 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.C
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.C
@@ -63,42 +63,46 @@ fapi2::ReturnCode p9_putmemproc(
 
     FAPI_DBG("Start");
 
-    FAPI_ASSERT(((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TARGET_PROC) == SBE_MEM_ACCESS_FLAGS_TARGET_PROC) &&
-                ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TARGET_PBA)  == 0) &&
-                ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_LCO_MODE) == 0) &&
-                ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_CACHE_INJECT_MODE) == 0),
+    FAPI_ASSERT(((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC) == fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC) &&
+                ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PBA)  == 0) &&
+                ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_LCO_MODE) == 0) &&
+                ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_CACHE_INJECT_MODE) == 0),
                 fapi2::P9_PUTMEMPROC_INVALID_FLAGS().
                 set_TARGET(i_target).
                 set_ADDRESS(i_address).
                 set_BYTES(i_bytes).
                 set_FLAGS(i_mem_flags).
-                set_FLAG_CHECK_OP_TYPE(((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TARGET_PROC) == SBE_MEM_ACCESS_FLAGS_TARGET_PROC) &&
-                                       ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TARGET_PBA)  == 0)).
-                set_FLAG_CHECK_LCO_MODE((i_mem_flags & SBE_MEM_ACCESS_FLAGS_LCO_MODE) == 0).
-                set_FLAG_CHECK_CACHE_INJECT_MODE((i_mem_flags & SBE_MEM_ACCESS_FLAGS_CACHE_INJECT_MODE) == 0),
+                set_FLAG_CHECK_OP_TYPE(((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC) ==
+                                        fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PROC) &&
+                                       ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TARGET_PBA)  == 0)).
+                set_FLAG_CHECK_LCO_MODE((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_LCO_MODE) == 0).
+                set_FLAG_CHECK_CACHE_INJECT_MODE((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_CACHE_INJECT_MODE) == 0),
                 "Invalid flag specified for ADU access");
 
-    FAPI_ASSERT(((i_mem_flags & SBE_MEM_ACCESS_FLAGS_ECC_OVERRIDE) == 0) &&
-                ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TAG) == 0) &&
-                ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_HOST_PASS_THROUGH) == 0),
+    FAPI_ASSERT(((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_ECC_OVERRIDE) == 0) &&
+                ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TAG) == 0) &&
+                ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_HOST_PASS_THROUGH) == 0),
                 fapi2::P9_PUTMEMPROC_UNSUPPORTED_FLAGS().
                 set_TARGET(i_target).
                 set_ADDRESS(i_address).
                 set_BYTES(i_bytes).
                 set_FLAGS(i_mem_flags).
-                set_FLAG_CHECK_ECC_OVERRIDE((i_mem_flags & SBE_MEM_ACCESS_FLAGS_ECC_OVERRIDE) == 0).
-                set_FLAG_CHECK_TAG((i_mem_flags & SBE_MEM_ACCESS_FLAGS_TAG) == 0).
-                set_FLAG_CHECK_HOST_PASS_THROUGH((i_mem_flags & SBE_MEM_ACCESS_FLAGS_HOST_PASS_THROUGH) == 0),
+                set_FLAG_CHECK_ECC_OVERRIDE((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_ECC_OVERRIDE) == 0).
+                set_FLAG_CHECK_TAG((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_TAG) == 0).
+                set_FLAG_CHECK_HOST_PASS_THROUGH((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_HOST_PASS_THROUGH) == 0),
                 "Unsupported flag specified for ADU access");
 
     // set auto-increment
-    l_flags.setAutoIncrement((i_mem_flags & SBE_MEM_ACCESS_FLAGS_AUTO_INCR_ON) == SBE_MEM_ACCESS_FLAGS_AUTO_INCR_ON);
+    l_flags.setAutoIncrement((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_AUTO_INCR_ON) ==
+                             fapi2::SBE_MEM_ACCESS_FLAGS_AUTO_INCR_ON);
 
     // set fast mode
-    l_flags.setFastMode((i_mem_flags & SBE_MEM_ACCESS_FLAGS_FAST_MODE_ON) == SBE_MEM_ACCESS_FLAGS_FAST_MODE_ON);
+    l_flags.setFastMode((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_FAST_MODE_ON) ==
+                        fapi2::SBE_MEM_ACCESS_FLAGS_FAST_MODE_ON);
 
     // set operation type and transaction size
-    if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_CACHE_INHIBITED_MODE) == SBE_MEM_ACCESS_FLAGS_CACHE_INHIBITED_MODE)
+    if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_CACHE_INHIBITED_MODE) ==
+        fapi2::SBE_MEM_ACCESS_FLAGS_CACHE_INHIBITED_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::CACHE_INHIBIT);
 
@@ -129,27 +133,29 @@ fapi2::ReturnCode p9_putmemproc(
                         "Invalid byte count specified for cache-inhibited access");
         }
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE) == SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE) == fapi2::SBE_MEM_ACCESS_FLAGS_PB_DIS_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::PB_DIS_OPER);
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_SWITCH_MODE) == SBE_MEM_ACCESS_FLAGS_SWITCH_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_SWITCH_MODE) == fapi2::SBE_MEM_ACCESS_FLAGS_SWITCH_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::PMISC_OPER);
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_PB_INIT_MODE) == SBE_MEM_ACCESS_FLAGS_PB_INIT_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_PB_INIT_MODE) == fapi2::SBE_MEM_ACCESS_FLAGS_PB_INIT_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::PB_INIT_OPER);
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE) == SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE) ==
+             fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_CD_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::PRE_SWITCH_CD);
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE) == SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE) ==
+             fapi2::SBE_MEM_ACCESS_FLAGS_PRE_SWITCH_AB_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::PRE_SWITCH_AB);
     }
-    else if ((i_mem_flags & SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE) == SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE)
+    else if ((i_mem_flags & fapi2::SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE) == fapi2::SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE)
     {
         l_flags.setOperationType(p9_ADU_oper_flag::POST_SWITCH);
     }
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.H b/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.H
index 83247fccb..958edc0a0 100644
--- a/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.H
+++ b/src/import/chips/p9/procedures/hwp/nest/p9_putmemproc.H
@@ -41,6 +41,9 @@
 //------------------------------------------------------------------------------
 #include <fapi2.H>
 
+namespace fapi2
+{
+
 //------------------------------------------------------------------------------
 // Constant Definitions
 //------------------------------------------------------------------------------
@@ -64,6 +67,8 @@ enum sbeMemoryAccessFlags
     SBE_MEM_ACCESS_FLAGS_POST_SWITCH_MODE     = 0x00008000,
 };
 
+} // End namespace
+
 //------------------------------------------------------------------------------
 // Structure definitions
 //------------------------------------------------------------------------------