diff options
| author | John Rell <jgrell@us.ibm.com> | 2017-08-15 12:09:31 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-08-31 13:57:51 -0400 |
| commit | 6c0f59db5a9fa5b3227ee38414783561eaf4bbd4 (patch) | |
| tree | 2e71936010333c69b42d920cffccff81ebfa2ef7 | |
| parent | 4120aece4ad47f1cf5bfa32965cc3931f967fecb (diff) | |
| download | talos-hostboot-6c0f59db5a9fa5b3227ee38414783561eaf4bbd4.tar.gz talos-hostboot-6c0f59db5a9fa5b3227ee38414783561eaf4bbd4.zip | |
jgr17081500 Update TX_ZCAL_P_4X settings for dmi,o,x buses
TPMCP.TC_IOM_FASTX2_RATIO_DC was removed from p9c.mc.initfile
from conflicting framelock patch.
Change-Id: I06ffbb23bbdbb6185a20791afdd45864aa654a16
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44776
Reviewed-by: Benjamin Gass <bgass@us.ibm.com>
Dev-Ready: Benjamin Gass <bgass@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: John G. Rell III <jgrell@us.ibm.com>
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/44805
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
3 files changed, 16 insertions, 2 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C index 172c19a0a..375ab7074 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_obus_scom.C @@ -46,7 +46,7 @@ constexpr uint64_t literal_0b101 = 0b101; constexpr uint64_t literal_0b100 = 0b100; constexpr uint64_t literal_0b110 = 0b110; constexpr uint64_t literal_0b00 = 0b00; -constexpr uint64_t literal_0b00100 = 0b00100; +constexpr uint64_t literal_0b01110 = 0b01110; constexpr uint64_t literal_0b0010101 = 0b0010101; constexpr uint64_t literal_0b0010110 = 0b0010110; constexpr uint64_t literal_0b1000110 = 0b1000110; @@ -3972,7 +3972,7 @@ fapi2::ReturnCode p9_obus_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS>& TGT { FAPI_TRY(fapi2::getScom( TGT0, 0x800f1c0009010c3full, l_scom_buffer )); - l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b00100 ); + l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b01110 ); FAPI_TRY(fapi2::putScom(TGT0, 0x800f1c0009010c3full, l_scom_buffer)); } { diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C index a73de3f94..3c7900f07 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g0_scom.C @@ -58,6 +58,7 @@ constexpr uint64_t literal_0b01111111 = 0b01111111; constexpr uint64_t literal_0b10 = 0b10; constexpr uint64_t literal_0b1100 = 0b1100; constexpr uint64_t literal_0b00 = 0b00; +constexpr uint64_t literal_0b01110 = 0b01110; fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0, const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2) @@ -3215,6 +3216,12 @@ fapi2::ReturnCode p9_xbus_g0_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01111111 ); FAPI_TRY(fapi2::putScom(TGT0, 0x800cf40006010c3full, l_scom_buffer)); } + { + FAPI_TRY(fapi2::getScom( TGT0, 0x800f1c0006010c3full, l_scom_buffer )); + + l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b01110 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x800f1c0006010c3full, l_scom_buffer)); + } }; fapi_try_exit: diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C index 6932f6e7b..9249e8d9c 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_xbus_g1_scom.C @@ -59,6 +59,7 @@ constexpr uint64_t literal_0b01111111 = 0b01111111; constexpr uint64_t literal_0b10 = 0b10; constexpr uint64_t literal_0b1100 = 0b1100; constexpr uint64_t literal_0b00 = 0b00; +constexpr uint64_t literal_0b01110 = 0b01110; fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& TGT0, const fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& TGT2) @@ -3216,6 +3217,12 @@ fapi2::ReturnCode p9_xbus_g1_scom(const fapi2::Target<fapi2::TARGET_TYPE_XBUS>& l_scom_buffer.insert<48, 8, 56, uint64_t>(literal_0b01111111 ); FAPI_TRY(fapi2::putScom(TGT0, 0x800cf42006010c3full, l_scom_buffer)); } + { + FAPI_TRY(fapi2::getScom( TGT0, 0x800f1c0006010c3full, l_scom_buffer )); + + l_scom_buffer.insert<48, 5, 59, uint64_t>(literal_0b01110 ); + FAPI_TRY(fapi2::putScom(TGT0, 0x800f1c0006010c3full, l_scom_buffer)); + } }; fapi_try_exit: |
