Skip to content

Commit

Permalink
set npu fir 0, bit 46 to masked, set npu fir 1, bits 1,3,5,7,9,11 to …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
rmc5197 authored and dcrowell77 committed Feb 18, 2018
1 parent a59d4f7 commit 8c55990
Showing 1 changed file with 9 additions and 10 deletions.
19 changes: 9 additions & 10 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2017 */
/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -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))
{
Expand Down

0 comments on commit 8c55990

Please sign in to comment.