Skip to content

Commit

Permalink
Adding HW363780 to NPU scom initfiles
Browse files Browse the repository at this point in the history 
NPU fir bit can fire for any rcmd snoop that misses in the table
lookup. Masking for nimbus dd1 only.

Change-Id: I0651b37279b0cee4ca5d383d83f0eb1079b75bd1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35676
Reviewed-by: Thi N. Tran <thi@us.ibm.com>
Reviewed-by: James N. Klazynski <jklazyns@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/35684
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
Jenny Huynh authored and dcrowell77 committed Feb 7, 2017
1 parent 91725e5 commit 154a52e
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 0 deletions.
72 changes: 72 additions & 0 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_npu_scom.C
View file
Expand Up @@ -90,6 +90,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011008ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501101bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501101bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011020ull, l_scom_buffer ));

Expand Down Expand Up @@ -119,6 +125,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011028ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501103bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501103bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011040ull, l_scom_buffer ));

Expand Down Expand Up @@ -148,6 +160,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011048ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501105bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501105bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011060ull, l_scom_buffer ));

Expand Down Expand Up @@ -177,6 +195,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011068ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501107bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501107bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011100ull, l_scom_buffer ));

Expand Down Expand Up @@ -206,6 +230,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011108ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501111bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501111bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011120ull, l_scom_buffer ));

Expand Down Expand Up @@ -235,6 +265,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011128ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501113bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501113bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011140ull, l_scom_buffer ));

Expand Down Expand Up @@ -264,6 +300,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011148ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501115bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501115bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011160ull, l_scom_buffer ));

Expand Down Expand Up @@ -293,6 +335,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011168ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501117bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501117bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011200ull, l_scom_buffer ));

Expand Down Expand Up @@ -322,6 +370,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011208ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501121bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501121bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011220ull, l_scom_buffer ));

Expand Down Expand Up @@ -351,6 +405,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011228ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501123bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501123bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011240ull, l_scom_buffer ));

Expand Down Expand Up @@ -380,6 +440,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011248ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501125bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501125bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011260ull, l_scom_buffer ));

Expand Down Expand Up @@ -409,6 +475,12 @@ fapi2::ReturnCode p9_npu_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&
|| (l_TGT0_ATTR_PROC_FABRIC_OPTICS_CONFIG_MODE[literal_3] == literal_2)) );
FAPI_TRY(fapi2::putScom(TGT0, 0x5011268ull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x501127bull, l_scom_buffer ));

l_scom_buffer.insert<0, 1, 63, uint64_t>(literal_1 );
FAPI_TRY(fapi2::putScom(TGT0, 0x501127bull, l_scom_buffer));
}
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5011403ull, l_scom_buffer ));

Expand Down
18 changes: 18 additions & 0 deletions src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
View file
Expand Up @@ -2021,6 +2021,24 @@
</chipEcFeature>
</attribute>

<attribute>
<id>ATTR_CHIP_EC_FEATURE_HW363780</id>>
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
<description>
Nimbus DD1: NPU incorrectly asserts FIR for any rcmd snoops that
misses its table lookup, includes commands that it does not master
</description>
<chipEcFeature>
<chip>
<name>ENUM_ATTR_NAME_NIMBUS</name>
<ec>
<value>0x20</value>
<test>LESS_THAN</test>
</ec>
</chip>
</chipEcFeature>
</attribute>

<!-- ******************************************************************** -->
<!-- Memory Section -->
<!-- ******************************************************************** -->
Expand Down

0 comments on commit 154a52e

Please sign in to comment.