Skip to content

Commit

Permalink
Revert "Mask early hang indicators from nmmu/vas unit"
Browse files Browse the repository at this point in the history 
This reverts commit 55243e7.

Change-Id: Ibcadbdc855f8e1fefc69ee662dacd3633553c168
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70913
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
dcrowell77 committed Jan 25, 2019
1 parent 55243e7 commit 10dbf93
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
10 changes: 5 additions & 5 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_mmu_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2019 */
/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -30,8 +30,8 @@
using namespace fapi2;

constexpr uint64_t literal_0 = 0;
constexpr uint64_t literal_0x44047C0000000000 = 0x44047C0000000000;
constexpr uint64_t literal_0x44247C0000000000 = 0x44247C0000000000;
constexpr uint64_t literal_0x04047C0000000000 = 0x04047C0000000000;
constexpr uint64_t literal_0x04247C0000000000 = 0x04247C0000000000;
constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
constexpr uint64_t literal_0x409B000000000000 = 0x409B000000000000;
constexpr uint64_t literal_0x4092000000000000 = 0x4092000000000000;
Expand Down Expand Up @@ -69,11 +69,11 @@ fapi2::ReturnCode p9_mmu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&

if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 != literal_0))
{
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x44047C0000000000 );
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x04047C0000000000 );
}
else if ((l_TGT0_ATTR_CHIP_EC_FEATURE_NMMU_NDD1 == literal_0))
{
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x44247C0000000000 );
l_scom_buffer.insert<0, 22, 0, uint64_t>(literal_0x04247C0000000000 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x5012c03ull, l_scom_buffer));
Expand Down
6 changes: 3 additions & 3 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_vas_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2016,2019 */
/* Contributors Listed Below - COPYRIGHT 2016,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand All @@ -29,7 +29,7 @@

using namespace fapi2;

constexpr uint64_t literal_0x00210102540D7FFF = 0x00210102540D7FFF;
constexpr uint64_t literal_0x00200102000D7FFF = 0x00200102000D7FFF;
constexpr uint64_t literal_0x0000000000000000 = 0x0000000000000000;
constexpr uint64_t literal_0 = 0;
constexpr uint64_t literal_0x00DD0201C0000000 = 0x00DD0201C0000000;
Expand Down Expand Up @@ -58,7 +58,7 @@ fapi2::ReturnCode p9_vas_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
{
FAPI_TRY(fapi2::getScom( TGT0, 0x3011803ull, l_scom_buffer ));

l_scom_buffer.insert<0, 54, 0, uint64_t>(literal_0x00210102540D7FFF );
l_scom_buffer.insert<0, 54, 0, uint64_t>(literal_0x00200102000D7FFF );
FAPI_TRY(fapi2::putScom(TGT0, 0x3011803ull, l_scom_buffer));
}
{
Expand Down

0 comments on commit 10dbf93

Please sign in to comment.