diff options
| author | Adam Hale <adam.samuel.hale@ibm.com> | 2018-07-24 10:33:34 -0500 |
|---|---|---|
| committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2018-08-01 10:32:49 -0500 |
| commit | 4b5108755cea09369b3ec23043fe6e368eaa567a (patch) | |
| tree | 734ff170951221cf16700687dfd2394620d23fc8 | |
| parent | 85bd4989fd0dd88ec0fd28eaee6cbd7e779399d5 (diff) | |
| download | talos-hostboot-4b5108755cea09369b3ec23043fe6e368eaa567a.tar.gz talos-hostboot-4b5108755cea09369b3ec23043fe6e368eaa567a.zip | |
Disable HW439321 workaround in dd1.3
Change-Id: Iefeff37efedc89567c229c1780ce0054b8279b36
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63221
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: SHELTON LEUNG <sleung@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: DANIEL C. HOWE <dchowe@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/63373
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
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>
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_scom.C | 16 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml | 17 |
2 files changed, 31 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_scom.C index dce2a87e7..b2ca05281 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9c_dmi_scom.C @@ -35,8 +35,9 @@ constexpr uint64_t literal_12 = 12; constexpr uint64_t literal_4 = 4; constexpr uint64_t literal_0b0100 = 0b0100; constexpr uint64_t literal_28 = 28; -constexpr uint64_t literal_0b01010 = 0b01010; constexpr uint64_t literal_0 = 0; +constexpr uint64_t literal_0b01010 = 0b01010; +constexpr uint64_t literal_0b11111 = 0b11111; constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0x1 = 0x1; constexpr uint64_t literal_0x3 = 0x3; @@ -69,6 +70,9 @@ fapi2::ReturnCode p9c_dmi_scom(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& TGT0 FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT3, l_chip_ec)); uint64_t l_def_ENABLE_AMO_CACHING = literal_1; uint64_t l_def_ENABLE_AMO_CLEAN_LINES = literal_1; + fapi2::ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13_Type l_TGT3_ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13; + FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13, TGT3, + l_TGT3_ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13)); uint64_t l_def_ENABLE_DYNAMIC_64_128B_READS = literal_0; uint64_t l_def_ENABLE_PREFETCH_DROP_PROMOTE_BASIC = literal_1; uint64_t l_def_ENABLE_RMW_IN_PROC = literal_1; @@ -127,7 +131,15 @@ fapi2::ReturnCode p9c_dmi_scom(const fapi2::Target<fapi2::TARGET_TYPE_DMI>& TGT0 constexpr auto l_MC01_CHAN0_ATCL_CL_CLSCOM_MCPERF2_ENABLE_REFRESH_BLOCK_DISP_OFF = 0x0; l_scom_buffer.insert<18, 1, 63, uint64_t>(l_MC01_CHAN0_ATCL_CL_CLSCOM_MCPERF2_ENABLE_REFRESH_BLOCK_DISP_OFF ); l_scom_buffer.insert<50, 5, 59, uint64_t>(literal_28 ); - l_scom_buffer.insert<55, 5, 59, uint64_t>(literal_0b01010 ); + + if ((l_TGT3_ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13 == literal_0)) + { + l_scom_buffer.insert<55, 5, 59, uint64_t>(literal_0b01010 ); + } + else if ((l_TGT3_ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13 == literal_1)) + { + l_scom_buffer.insert<55, 5, 59, uint64_t>(literal_0b11111 ); + } if ((l_def_ENABLE_DYNAMIC_64_128B_READS == literal_1)) { diff --git a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml index 1dfd1c1d6..20d98f9ac 100644 --- a/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml +++ b/src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml @@ -7724,4 +7724,21 @@ </chipEcFeature> </attribute> <!-- ******************************************************************** --> + <attribute> + <id>ATTR_CHIP_EC_FEATURE_HW439321_FIXED_IN_P9UDD13</id> + <targetType>TARGET_TYPE_PROC_CHIP</targetType> + <description> + Disable RMW10 Hangbuster workaround in dd1.3 because of hardware fix + </description> + <chipEcFeature> + <chip> + <name>ENUM_ATTR_NAME_CUMULUS</name> + <ec> + <value>0x13</value> + <test>GREATER_THAN_OR_EQUAL</test> + </ec> + </chip> + </chipEcFeature> + </attribute> + <!-- ******************************************************************** --> </attributes> |
