diff options
author | Lennard Streat <lstreat@us.ibm.com> | 2018-02-23 09:28:41 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-03-07 21:51:38 -0500 |
commit | 75823b14fb47375f502f0ec0c5d115390b98ac08 (patch) | |
tree | 6824416aad799f34880795d53105747172c3004a | |
parent | ac0c8f0e7bdb44d1ae1faf112d7968c36a6e1ed1 (diff) | |
download | talos-hostboot-75823b14fb47375f502f0ec0c5d115390b98ac08.tar.gz talos-hostboot-75823b14fb47375f502f0ec0c5d115390b98ac08.zip |
HW439321 - Trusty Birthday Alternative Workaround
Change-Id: Ied12567ab7fb600c5685fa81f73c0eb3df83bc4b
CQ:HW439829
CQ:HW439321
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54651
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Dev-Ready: LENNARD G. STREAT <lstreat@us.ibm.com>
Reviewed-by: John G. Rell III <jgrell@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Marc Gollub <gollub@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54662
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: Daniel M. Crowell <dcrowell@us.ibm.com>
-rw-r--r-- | src/import/chips/centaur/procedures/hwp/initfiles/centaur_dmi_scom.C | 10 | ||||
-rw-r--r-- | src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scom.C | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_dmi_scom.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_dmi_scom.C index 460faf8b6..28a96a81d 100644 --- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_dmi_scom.C +++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_dmi_scom.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -42,7 +42,7 @@ constexpr uint64_t literal_0b0011000 = 0b0011000; constexpr uint64_t literal_0b0010001 = 0b0010001; constexpr uint64_t literal_0b00 = 0b00; constexpr uint64_t literal_0b11 = 0b11; -constexpr uint64_t literal_0b0001111 = 0b0001111; +constexpr uint64_t literal_0b1000000 = 0b1000000; constexpr uint64_t literal_0b101 = 0b101; constexpr uint64_t literal_0b0111 = 0b0111; constexpr uint64_t literal_0b0011 = 0b0011; @@ -588,9 +588,9 @@ fapi2::ReturnCode centaur_dmi_scom(const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF { FAPI_TRY(fapi2::getScom( TGT0, 0x8009d8000201043full, l_scom_buffer )); - l_scom_buffer.insert<48, 7, 57, uint64_t>(literal_0b0001111 ); - constexpr auto l_DMI_RX_RXCTL_RX_CTL_REGS_RX_DYN_RPR_ERR_CNTR1_DURATION_TAP7 = 0x7; - l_scom_buffer.insert<55, 4, 60, uint64_t>(l_DMI_RX_RXCTL_RX_CTL_REGS_RX_DYN_RPR_ERR_CNTR1_DURATION_TAP7 ); + l_scom_buffer.insert<48, 7, 57, uint64_t>(literal_0b1000000 ); + constexpr auto l_DMI_RX_RXCTL_RX_CTL_REGS_RX_DYN_RPR_ERR_CNTR1_DURATION_TAP2 = 0x2; + l_scom_buffer.insert<55, 4, 60, uint64_t>(l_DMI_RX_RXCTL_RX_CTL_REGS_RX_DYN_RPR_ERR_CNTR1_DURATION_TAP2 ); l_scom_buffer.insert<61, 3, 61, uint64_t>(literal_0b101 ); FAPI_TRY(fapi2::putScom(TGT0, 0x8009d8000201043full, l_scom_buffer)); } diff --git a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scom.C b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scom.C index b5aacd75c..215b0b231 100644 --- a/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scom.C +++ b/src/import/chips/centaur/procedures/hwp/initfiles/centaur_mbs_scom.C @@ -34,7 +34,6 @@ constexpr uint64_t literal_0b0 = 0b0; constexpr uint64_t literal_0b0000000 = 0b0000000; constexpr uint64_t literal_0x0 = 0x0; constexpr uint64_t literal_0b00000 = 0b00000; -constexpr uint64_t literal_0b1 = 0b1; constexpr uint64_t literal_0b010010 = 0b010010; constexpr uint64_t literal_0b00 = 0b00; constexpr uint64_t literal_0b00000000000000000000 = 0b00000000000000000000; @@ -65,6 +64,7 @@ constexpr uint64_t literal_8 = 8; constexpr uint64_t literal_0b10 = 0b10; constexpr uint64_t literal_4 = 4; constexpr uint64_t literal_0b01 = 0b01; +constexpr uint64_t literal_0b1 = 0b1; constexpr uint64_t literal_13 = 13; constexpr uint64_t literal_10 = 10; constexpr uint64_t literal_12 = 12; @@ -786,7 +786,7 @@ fapi2::ReturnCode centaur_mbs_scom(const fapi2::Target<fapi2::TARGET_TYPE_MEMBUF if (literal_1) { - l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b1 ); + l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 ); } if (literal_1) |