diff options
| author | Thi Tran <thi@us.ibm.com> | 2017-05-31 16:21:56 -0500 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2017-06-11 13:09:52 -0400 |
| commit | 2a804602af153d43f11fb63e5e7dad264c5a1e33 (patch) | |
| tree | 841473fc62ddbf5c7efae68ff040425a45aa81c7 | |
| parent | b7400ba903b8cbf288126872599474833b452319 (diff) | |
| download | talos-hostboot-2a804602af153d43f11fb63e5e7dad264c5a1e33.tar.gz talos-hostboot-2a804602af153d43f11fb63e5e7dad264c5a1e33.zip | |
Fix EKB build un-committed file error:
Change-Id: Ie5d307018c472e1f955fcc8fbab83ab5a4b9596e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41190
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: 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: Thi N. Tran <thi@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41199
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C | 4 | ||||
| -rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C | 50 |
2 files changed, 18 insertions, 36 deletions
diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C index 23f6b7e83..fb32f1869 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_cxa_scom.C @@ -115,7 +115,7 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0 l_scom_buffer.insert<45, 3, 61, uint64_t>(literal_0b111 ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<45, 3, 61, uint64_t>(literal_0b111 ); } @@ -125,7 +125,7 @@ fapi2::ReturnCode p9_cxa_scom(const fapi2::Target<fapi2::TARGET_TYPE_CAPP>& TGT0 l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0010 ); } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { l_scom_buffer.insert<48, 4, 60, uint64_t>(literal_0b0010 ); } diff --git a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C index eb70caba1..c3e8dc399 100644 --- a/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C +++ b/src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C @@ -245,12 +245,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -567,7 +564,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1128,7 +1125,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1349,12 +1346,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -1548,7 +1542,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1738,7 +1732,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } } - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) ) { if ((l_def_NVLINK_ACTIVE == literal_1)) { @@ -1999,12 +1993,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2153,12 +2144,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2303,12 +2291,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) @@ -2410,12 +2395,9 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& l_scom_buffer.insert<4, 1, 63, uint64_t>(literal_0b0 ); - if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) ) + if ((l_def_NVLINK_ACTIVE == literal_1)) { - if ((l_def_NVLINK_ACTIVE == literal_1)) - { - l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); - } + l_scom_buffer.insert<38, 1, 63, uint64_t>(literal_0x1 ); } if ((l_def_NVLINK_ACTIVE == literal_1)) |
