diff options
author | Prachi Gupta <pragupta@us.ibm.com> | 2016-07-11 13:58:15 -0500 |
---|---|---|
committer | Sachin Gupta <sgupta2m@in.ibm.com> | 2016-07-18 02:41:41 -0400 |
commit | 8adb1e9dfb2b6e0542157a8afbe8d22696c3a1ef (patch) | |
tree | 926c91e97a6ee8aa3d742807a264b76fa6eb2ab5 /import/chips | |
parent | 713995d971efb59e36d13a8a28523dc22172db4e (diff) | |
download | talos-sbe-8adb1e9dfb2b6e0542157a8afbe8d22696c3a1ef.tar.gz talos-sbe-8adb1e9dfb2b6e0542157a8afbe8d22696c3a1ef.zip |
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: 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/27113
Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
Diffstat (limited to 'import/chips')
-rw-r--r-- | import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C | 24 | ||||
-rw-r--r-- | import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C | 28 | ||||
-rw-r--r-- | import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C | 8 |
3 files changed, 30 insertions, 30 deletions
diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C b/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C index 281d15ee..071d8464 100644 --- a/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C +++ b/import/chips/p9/procedures/hwp/initfiles/p9_l2_scom.C @@ -67,29 +67,29 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, { 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_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_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_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_SYSMAP_SM_NOT_LG_SEL_OFF, 23, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 21, 1, 63 ); + constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_HASH_L3_ADDR_EN_ON, 21, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 15, 1, 63 ); + constexpr auto l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_CFG_CAC_ERR_REPAIR_EN_ON, 15, 1, 63 ); } } @@ -256,8 +256,8 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, } { - constexpr auto l_scom_buffer_OFF = 0x0; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 29, 1, 63 ); + constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_CNT_USE_L2_DIVIDER_EN_OFF, 29, 1, 63 ); } { @@ -269,8 +269,8 @@ fapi2::ReturnCode p9_l2_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, } { - constexpr auto l_scom_buffer_MODE1 = 0x0; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_MODE1, 28, 1, 63 ); + constexpr auto l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1 = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_L2_L2MISC_L2CERRS_EPS_MODE_SEL_MODE1, 28, 1, 63 ); } l_rc = fapi2::putScom(TGT0, 0x10010811ull, l_scom_buffer); diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C b/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C index 325a2aa1..f71d792d 100644 --- a/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C +++ b/import/chips/p9/procedures/hwp/initfiles/p9_l3_scom.C @@ -216,50 +216,50 @@ fapi2::ReturnCode p9_l3_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, { 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, 22, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_ON, 22, 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, 22, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_SYSMAP_SM_NOT_LG_SEL_OFF, 22, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 11, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_ADDR_HASH_EN_CFG_ON, 11, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 2, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_RDSN_LINEDEL_UE_EN_ON, 2, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 3, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_NO_ALLOCATE_MODE_EN_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_NO_ALLOCATE_MODE_EN_ON, 3, 1, 63 ); } else if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_CACHE_CONTAINED)) { - constexpr auto l_scom_buffer_ON = 0x1; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_ON, 3, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_NO_ALLOCATE_MODE_EN_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_NO_ALLOCATE_MODE_EN_ON, 3, 1, 63 ); } } { if ((l_TGT1_ATTR_SYSTEM_IPL_PHASE == fapi2::ENUM_ATTR_SYSTEM_IPL_PHASE_HB_RUNTIME)) { - constexpr auto l_scom_buffer_OFF = 0x0; - l_scom_buffer.insert<uint64_t> (l_scom_buffer_OFF, 1, 1, 63 ); + constexpr auto l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_L3_L3_MISC_L3CERRS_L3_DMAP_CI_EN_CFG_OFF, 1, 1, 63 ); } } diff --git a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C b/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C index 7599446b..787c50b2 100644 --- a/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C +++ b/import/chips/p9/procedures/hwp/initfiles/p9_ncu_scom.C @@ -57,13 +57,13 @@ fapi2::ReturnCode p9_ncu_scom(const fapi2::Target<fapi2::TARGET_TYPE_EX>& TGT0, { 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, 9, 1, 63 ); + constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON = 0x1; + l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_ON, 9, 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, 9, 1, 63 ); + constexpr auto l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF = 0x0; + l_scom_buffer.insert<uint64_t> (l_EXP_NC_NCMISC_NCSCOMS_SYSMAP_SM_NOT_LG_SEL_OFF, 9, 1, 63 ); } } |