Fix paranthesis syntax in scom initfiles

- The spyname needs to be added only once to the scom list because
  we iiterate over all spynames
- Create unique enum variable names for scom initfile

Change-Id: I6f4ffe62b6632c2a1ad39f45c7558d42acb42827
Original-Change-Id: I6b5faab70b4867c17f72fc536d792e9459087857
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/26872
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/36650
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 64 insertions, 64 deletions

diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C
index a6857fe7c..337d5805e 100644
--- a/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C
+++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_nx_scom.C
@@ -58,28 +58,28 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 63, 1, 63 );
+                constexpr auto l_NX_DMA_CH0_EFT_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH0_EFT_ENABLE_ON, 63, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 62, 1, 63 );
+                constexpr auto l_NX_DMA_CH1_EFT_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH1_EFT_ENABLE_ON, 62, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 58, 1, 63 );
+                constexpr auto l_NX_DMA_CH2_SYM_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH2_SYM_ENABLE_ON, 58, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 57, 1, 63 );
+                constexpr auto l_NX_DMA_CH3_SYM_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH3_SYM_ENABLE_ON, 57, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 61, 1, 63 );
+                constexpr auto l_NX_DMA_CH4_GZIP_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH4_GZIP_ENABLE_ON, 61, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x2011041ull, l_scom_buffer);
@@ -100,58 +100,58 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
 
             {
-                constexpr auto l_scom_buffer_MAX_13_INRD = 0xd;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MAX_13_INRD, 33, 4, 60 );
+                constexpr auto l_NX_DMA_EFTCOMP_MAX_INRD_MAX_13_INRD = 0xd;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_EFTCOMP_MAX_INRD_MAX_13_INRD, 33, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_MAX_7_INRD = 0x7;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MAX_7_INRD, 37, 4, 60 );
+                constexpr auto l_NX_DMA_EFTDECOMP_MAX_INRD_MAX_7_INRD = 0x7;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_EFTDECOMP_MAX_INRD_MAX_7_INRD, 37, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_MAX_13_INRD = 0xd;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MAX_13_INRD, 8, 4, 60 );
+                constexpr auto l_NX_DMA_GZIPCOMP_MAX_INRD_MAX_13_INRD = 0xd;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_GZIPCOMP_MAX_INRD_MAX_13_INRD, 8, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_MAX_7_INRD = 0x7;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MAX_7_INRD, 12, 4, 60 );
+                constexpr auto l_NX_DMA_GZIPDECOMP_MAX_INRD_MAX_7_INRD = 0x7;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_GZIPDECOMP_MAX_INRD_MAX_7_INRD, 12, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_MAX_3_INRD = 0x3;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_MAX_3_INRD, 25, 4, 60 );
+                constexpr auto l_NX_DMA_SYM_MAX_INRD_MAX_3_INRD = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_SYM_MAX_INRD_MAX_3_INRD, 25, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 48, 1, 63 );
+                constexpr auto l_NX_DMA_SYM_CPB_CHECK_DISABLE_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_SYM_CPB_CHECK_DISABLE_OFF, 48, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 23, 1, 63 );
+                constexpr auto l_NX_DMA_EFT_COMP_PREFETCH_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_EFT_COMP_PREFETCH_ENABLE_ON, 23, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 24, 1, 63 );
+                constexpr auto l_NX_DMA_EFT_DECOMP_PREFETCH_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_EFT_DECOMP_PREFETCH_ENABLE_ON, 24, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 16, 1, 63 );
+                constexpr auto l_NX_DMA_GZIP_COMP_PREFETCH_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_GZIP_COMP_PREFETCH_ENABLE_ON, 16, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 17, 1, 63 );
+                constexpr auto l_NX_DMA_GZIP_DECOMP_PREFETCH_ENABLE_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_GZIP_DECOMP_PREFETCH_ENABLE_ON, 17, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_OFF = 0x0;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 56, 1, 63 );
+                constexpr auto l_NX_DMA_EFT_SPBC_WRITE_ENABLE_OFF = 0x0;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_EFT_SPBC_WRITE_ENABLE_OFF, 56, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x2011042ull, l_scom_buffer);
@@ -172,63 +172,63 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_4 = 0x2;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_4, 1, 4, 60 );
+                constexpr auto l_NX_DMA_CH0_WATCHDOG_REF_DIV_DIVIDE_BY_4 = 0x2;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH0_WATCHDOG_REF_DIV_DIVIDE_BY_4, 1, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 0, 1, 63 );
+                constexpr auto l_NX_DMA_CH0_WATCHDOG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH0_WATCHDOG_TIMER_ENBL_ON, 0, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_4 = 0x2;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_4, 6, 4, 60 );
+                constexpr auto l_NX_DMA_CH1_WATCHDOG_REF_DIV_DIVIDE_BY_4 = 0x2;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH1_WATCHDOG_REF_DIV_DIVIDE_BY_4, 6, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 5, 1, 63 );
+                constexpr auto l_NX_DMA_CH1_WATCHDOG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH1_WATCHDOG_TIMER_ENBL_ON, 5, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_4 = 0x2;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_4, 11, 4, 60 );
+                constexpr auto l_NX_DMA_CH2_WATCHDOG_REF_DIV_DIVIDE_BY_4 = 0x2;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH2_WATCHDOG_REF_DIV_DIVIDE_BY_4, 11, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 10, 1, 63 );
+                constexpr auto l_NX_DMA_CH2_WATCHDOG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH2_WATCHDOG_TIMER_ENBL_ON, 10, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_4 = 0x2;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_4, 16, 4, 60 );
+                constexpr auto l_NX_DMA_CH3_WATCHDOG_REF_DIV_DIVIDE_BY_4 = 0x2;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH3_WATCHDOG_REF_DIV_DIVIDE_BY_4, 16, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 15, 1, 63 );
+                constexpr auto l_NX_DMA_CH3_WATCHDOG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH3_WATCHDOG_TIMER_ENBL_ON, 15, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_4 = 0x2;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_4, 21, 4, 60 );
+                constexpr auto l_NX_DMA_CH4_WATCHDOG_REF_DIV_DIVIDE_BY_4 = 0x2;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH4_WATCHDOG_REF_DIV_DIVIDE_BY_4, 21, 4, 60 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 20, 1, 63 );
+                constexpr auto l_NX_DMA_CH4_WATCHDOG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_CH4_WATCHDOG_TIMER_ENBL_ON, 20, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 25, 1, 63 );
+                constexpr auto l_NX_DMA_DMA_HANG_TIMER_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_DMA_HANG_TIMER_ENBL_ON, 25, 1, 63 );
             }
 
             {
-                constexpr auto l_scom_buffer_DIVIDE_BY_32 = 0x3;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_DIVIDE_BY_32, 26, 4, 60 );
+                constexpr auto l_NX_DMA_DMA_HANG_TIMER_REF_DIV_DIVIDE_BY_32 = 0x3;
+                l_scom_buffer.insert<uint64_t> (l_NX_DMA_DMA_HANG_TIMER_REF_DIV_DIVIDE_BY_32, 26, 4, 60 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x201105cull, l_scom_buffer);
@@ -321,20 +321,20 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 22, 1, 63 );
+                constexpr auto l_NX_PBI_CQ_WRAP_NXCQ_SCOM_RD_GO_M_QOS_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_PBI_CQ_WRAP_NXCQ_SCOM_RD_GO_M_QOS_ON, 22, 1, 63 );
             }
 
             {
                 if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_SMALL_SYSTEM))
                 {
-                    constexpr auto l_scom_buffer_ON = 0x1;
-                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 23, 1, 63 );
+                    constexpr auto l_NX_PBI_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON = 0x1;
+                    l_scom_buffer.insert<uint64_t> (l_NX_PBI_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_ON, 23, 1, 63 );
                 }
                 else if ((l_TGT1_ATTR_PROC_FABRIC_ADDR_BAR_MODE == fapi2::ENUM_ATTR_PROC_FABRIC_ADDR_BAR_MODE_LARGE_SYSTEM))
                 {
-                    constexpr auto l_scom_buffer_OFF = 0x0;
-                    l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 23, 1, 63 );
+                    constexpr auto l_NX_PBI_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF = 0x0;
+                    l_scom_buffer.insert<uint64_t> (l_NX_PBI_CQ_WRAP_NXCQ_SCOM_ADDR_BAR_MODE_OFF, 23, 1, 63 );
                 }
             }
 
@@ -469,8 +469,8 @@ fapi2::ReturnCode p9_nx_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
             }
 
             {
-                constexpr auto l_scom_buffer_ON = 0x1;
-                l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 1, 1, 63 );
+                constexpr auto l_NX_PBI_PBI_UMAC_CRB_READS_ENBL_ON = 0x1;
+                l_scom_buffer.insert<uint64_t> (l_NX_PBI_PBI_UMAC_CRB_READS_ENBL_ON, 1, 1, 63 );
             }
 
             l_rc = fapi2::putScom(TGT0, 0x20110d5ull, l_scom_buffer);