diff options
author | Ryan Black <rblack@us.ibm.com> | 2018-02-01 13:10:06 -0600 |
---|---|---|
committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-02-18 12:53:27 -0500 |
commit | 8c55990c047b8e020633b42aa35edc8c139888af (patch) | |
tree | 7e0b2fdfab2db855e0fd6bebebf522f7db66379b /src | |
parent | a59d4f7d2f4e697ba32dc68a74534f417593ad72 (diff) | |
download | talos-hostboot-8c55990c047b8e020633b42aa35edc8c139888af.tar.gz talos-hostboot-8c55990c047b8e020633b42aa35edc8c139888af.zip |
set npu fir 0, bit 46 to masked, set npu fir 1, bits 1,3,5,7,9,11 to masked
added matching RAS XML updates
Change-Id: Id092df05a4173c44238486a789eade643e134b2d
CQ: HW436822
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53211
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@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: Zane C Shelley <zshelle@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53238
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C | 19 |
1 files changed, 9 insertions, 10 deletions
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 c88ac0be5..c3ed131ab 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 @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -57,14 +57,13 @@ constexpr uint64_t literal_0x0000740000000000 = 0x0000740000000000; constexpr uint64_t literal_0x7F60B04500AC0000 = 0x7F60B04500AC0000; constexpr uint64_t literal_0xAAA70A55F0000000 = 0xAAA70A55F0000000; constexpr uint64_t literal_0x5550740000000000 = 0x5550740000000000; -constexpr uint64_t literal_0x009A48180F61FFFF = 0x009A48180F61FFFF; -constexpr uint64_t literal_0x009A48180F01FFFF = 0x009A48180F01FFFF; +constexpr uint64_t literal_0x009A48180F63FFFF = 0x009A48180F63FFFF; +constexpr uint64_t literal_0x009A48180F03FFFF = 0x009A48180F03FFFF; constexpr uint64_t literal_0xFFFFFFFFFFFFFFFF = 0xFFFFFFFFFFFFFFFF; constexpr uint64_t literal_0x7F60B04500AE0000 = 0x7F60B04500AE0000; constexpr uint64_t literal_0x8005000200100000 = 0x8005000200100000; constexpr uint64_t literal_0xFF65B04700FE0000 = 0xFF65B04700FE0000; constexpr uint64_t literal_0x5550F40000000003 = 0x5550F40000000003; -constexpr uint64_t literal_0x0000F40000000003 = 0x0000F40000000003; constexpr uint64_t literal_0xFFF70A5DF0000000 = 0xFFF70A5DF0000000; constexpr uint64_t literal_0x000801A200000000 = 0x000801A200000000; constexpr uint64_t literal_0xFFFF0BFFF0000000 = 0xFFFF0BFFF0000000; @@ -3582,11 +3581,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& { if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_0))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F61FFFF ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F63FFFF ); } else if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_1))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F01FFFF ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F03FFFF ); } else if ((l_def_NVLINK_ACTIVE == literal_0)) { @@ -3876,7 +3875,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } else if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_1))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0000F40000000003 ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x5550F40000000003 ); } else if ((l_def_NVLINK_ACTIVE == literal_0)) { @@ -4475,11 +4474,11 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_0))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F61FFFF ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F63FFFF ); } else if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_1))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F01FFFF ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x009A48180F03FFFF ); } else if ((l_def_NVLINK_ACTIVE == literal_0)) { @@ -4537,7 +4536,7 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& } else if (((l_def_NVLINK_ACTIVE == literal_1) && (l_def_ENABLE_NPU_FREEZE == literal_1))) { - l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x0000F40000000003 ); + l_scom_buffer.insert<0, 64, 0, uint64_t>(literal_0x5550F40000000003 ); } else if ((l_def_NVLINK_ACTIVE == literal_0)) { |