Skip to content

Commit

Permalink
Revert "Revert "HW474117 WAT to allow firmware to disable bypass on p…
Browse files Browse the repository at this point in the history 
…ort""

This reverts commit 93cdb7baabb292f994b84da4e9432c1e47121b77.

Change-Id: I6a5f1d25004eeeef2580d38bd2969646aac1cab2
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74718
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/74774
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
@dcrowell77
Jennifer A. Stofer authored and dcrowell77 committed May 11, 2019
1 parent c9d1f3e commit 8591ded
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 0 deletions.
28 changes: 28 additions & 0 deletions src/import/chips/p9/procedures/hwp/initfiles/p9n_mca_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ constexpr uint64_t literal_1300 = 1300;
constexpr uint64_t literal_1040 = 1040;
constexpr uint64_t literal_1215 = 1215;
constexpr uint64_t literal_1400 = 1400;
constexpr uint64_t literal_0b00 = 0b00;

fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0,
const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>& TGT1, const fapi2::Target<fapi2::TARGET_TYPE_MCS>& TGT2,
Expand Down Expand Up @@ -1135,6 +1136,33 @@ fapi2::ReturnCode p9n_mca_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCA>& TGT0

FAPI_TRY(fapi2::putScom(TGT0, 0x7010a0aull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x7010a0bull, l_scom_buffer ));

if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.insert<9, 1, 63, uint64_t>(literal_0b0 );
}

if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
&& (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
{
l_scom_buffer.insert<9, 1, 63, uint64_t>(literal_0b0 );
}

if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.insert<10, 2, 62, uint64_t>(literal_0b00 );
}

if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
&& (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
{
l_scom_buffer.insert<10, 2, 62, uint64_t>(literal_0b00 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x7010a0bull, l_scom_buffer));
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x21)) || ((l_chip_id == 0x5)
&& (l_chip_ec == 0x22)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x23)) )
Expand Down
21 changes: 21 additions & 0 deletions src/import/chips/p9/procedures/hwp/initfiles/p9n_mcbist_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,14 @@ constexpr uint64_t literal_0b00000000000000000000001111111011111111111111 =
constexpr uint64_t literal_0b10000000000000000 = 0b10000000000000000;
constexpr uint64_t literal_0b10000000001000000000000000000100000000000000 =
0b10000000001000000000000000000100000000000000;
constexpr uint64_t literal_0b100000000000000000000000000000000000000000000000 =
0b100000000000000000000000000000000000000000000000;
constexpr uint64_t literal_0b11111111111111111111111111111111111111111111 =
0b11111111111111111111111111111111111111111111;
constexpr uint64_t literal_0b10000010000000000 = 0b10000010000000000;
constexpr uint64_t literal_0b11110000000 = 0b11110000000;
constexpr uint64_t literal_0b00001000000000000000 = 0b00001000000000000000;
constexpr uint64_t literal_0b00010000000000000000 = 0b00010000000000000000;
constexpr uint64_t literal_0b100 = 0b100;
constexpr uint64_t literal_0b0100 = 0b0100;

Expand All @@ -64,6 +70,19 @@ fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>
l_scom_buffer.insert<0, 44, 20, uint64_t>(literal_0b10000000001000000000000000000100000000000000 );
FAPI_TRY(fapi2::putScom(TGT0, 0x7012383ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x701238full, l_scom_buffer ));

l_scom_buffer.insert<0, 48, 16, uint64_t>(literal_0b100000000000000000000000000000000000000000000000 );
FAPI_TRY(fapi2::putScom(TGT0, 0x701238full, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x7012390ull, l_scom_buffer ));

l_scom_buffer.insert<0, 44, 20, uint64_t>(literal_0b11111111111111111111111111111111111111111111 );
l_scom_buffer.insert<44, 17, 47, uint64_t>(literal_0b10000010000000000 );
FAPI_TRY(fapi2::putScom(TGT0, 0x7012390ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x70123e0ull, l_scom_buffer ));

Expand All @@ -90,13 +109,15 @@ fapi2::ReturnCode p9n_mcbist_scom(const fapi2::Target<fapi2::TARGET_TYPE_MCBIST>
FAPI_TRY(fapi2::getScom( TGT0, 0x70123eaull, l_scom_buffer ));

l_scom_buffer.insert<20, 20, 44, uint64_t>(literal_0b00001000000000000000 );
l_scom_buffer.insert<0, 20, 44, uint64_t>(literal_0b00010000000000000000 );
FAPI_TRY(fapi2::putScom(TGT0, 0x70123eaull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x70123ebull, l_scom_buffer ));

l_scom_buffer.insert<23, 3, 61, uint64_t>(literal_0b100 );
l_scom_buffer.insert<37, 4, 60, uint64_t>(literal_0b0100 );
l_scom_buffer.insert<20, 3, 61, uint64_t>(literal_0b100 );
FAPI_TRY(fapi2::putScom(TGT0, 0x70123ebull, l_scom_buffer));
}

Expand Down

0 comments on commit 8591ded

Please sign in to comment.