Skip to content

Commit

Permalink
Mask ut=0 and ut=1 mmio bad cmd/length/align
Browse files Browse the repository at this point in the history 
Change-Id: I7b22382dfa2401ab908c1e454fb6794db0708049
CQ: SW438268
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62595
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/62598
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
  • Loading branch information
@rmc5197 @crgeddes
rmc5197 authored and crgeddes committed Aug 20, 2018
1 parent 28b8367 commit c708492
Showing 1 changed file with 110 additions and 0 deletions.
110 changes: 110 additions & 0 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011010ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011012ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011012ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((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 All @@ -461,6 +471,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501101aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501101aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -819,6 +831,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501103aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501103aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -1018,6 +1032,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501104aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501104aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -1077,6 +1093,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501105aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501105aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -1381,6 +1399,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011070ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011072ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011072ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((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 All @@ -1390,6 +1418,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501107aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501107aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -1699,6 +1729,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x50110aaull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x50110aaull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -1995,6 +2027,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501111aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501111aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -2260,12 +2294,24 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011130ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011132ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011132ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501113aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501113aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -2443,6 +2489,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501115aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501115aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -2631,6 +2679,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501117aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501117aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -3117,6 +3167,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501121aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501121aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -3475,6 +3527,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501123aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501123aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -3674,6 +3728,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501124aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501124aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -3722,6 +3778,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501125aull, l_scom_buffer ));

l_scom_buffer.insert<48, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501125aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -4015,6 +4073,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501127aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501127aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -4324,6 +4384,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x50112aaull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x50112aaull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -4981,6 +5043,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011410ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011412ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011412ull, 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)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
Expand All @@ -4990,6 +5062,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501141aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501141aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -5246,6 +5320,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501144aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501144aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -5578,6 +5654,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011470ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011472ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011472ull, 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)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
Expand All @@ -5587,6 +5673,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x501147aull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501147aull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -5788,6 +5876,8 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::getScom( TGT0, 0x50114aaull, l_scom_buffer ));

l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x50114aaull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -5986,6 +6076,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x50114d0ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x50114d2ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x50114d2ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
Expand Down Expand Up @@ -6052,6 +6152,16 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
FAPI_TRY(fapi2::putScom(TGT0, 0x5011522ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x7) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011532ull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
l_scom_buffer.insert<1, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011532ull, 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)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10))
Expand Down

0 comments on commit c708492

Please sign in to comment.