Skip to content

Commit

Permalink
Undo some p9 Cumulus spy workarounds in initfiles
Browse files Browse the repository at this point in the history 
Change-Id: I961ec9e52962b1d5e1295e484922095acd6697a8
RTC:174656
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41234
Reviewed-by: Benjamin Gass <bgass@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: Jenny Huynh <jhuynh@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41242
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@ibmthi @dcrowell77
ibmthi authored and dcrowell77 committed Jun 9, 2017
1 parent 7ee4d48 commit 1b6b503
Show file tree
Hide file tree
Showing 2 changed files with 152 additions and 173 deletions.
307 changes: 152 additions & 155 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
View file
Expand Up @@ -351,195 +351,192 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
FAPI_TRY(fapi2::putScom(TGT0, 0x90000f2005011c11ull, l_scom_buffer));
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) || ((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
{
l_scom_buffer.flush<0> ();

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 );
}
l_scom_buffer.flush<0> ();

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<12, 3, 61, uint64_t>(literal_0b000 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<15, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<16, 2, 62, uint64_t>(literal_0b00 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<18, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<19, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<20, 1, 63, uint64_t>(literal_0b1 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<21, 2, 62, uint64_t>(literal_0b00 );
}

if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
{
l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<23, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 );
}
if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
{
l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<24, 2, 62, uint64_t>(literal_0b11 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<26, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<27, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_CORE_CEILING_RATIO_8_8 == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b11 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<28, 2, 62, uint64_t>(literal_0b10 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<30, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<31, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 );
}
if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<32, 2, 62, uint64_t>(literal_0b11 );
}

if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<34, 3, 61, uint64_t>(literal_0b111 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_SAFE_MODE == literal_1))
{
l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<37, 2, 62, uint64_t>(literal_0b11 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<39, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<40, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<41, 1, 63, uint64_t>(literal_0b1 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<42, 1, 63, uint64_t>(literal_0b1 );
}

if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
{
l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<43, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 );
}
if (((l_def_SAFE_MODE == literal_1) || (l_def_CORE_CEILING_RATIO_8_8 == literal_1)))
{
l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b00 );
}
else if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<44, 2, 62, uint64_t>(literal_0b11 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<46, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<47, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<48, 2, 62, uint64_t>(literal_0b00 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<50, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<51, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<52, 1, 63, uint64_t>(literal_0b0 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 );
}
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<53, 1, 63, uint64_t>(literal_0b0 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer));
FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer));
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<54, 10, 54, uint64_t>(literal_0x000 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005011811ull, l_scom_buffer));
FAPI_TRY(fapi2::putScom(TGT0, 0x90000f4005012011ull, l_scom_buffer));
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.flush<0> ();

Expand Down
18 changes: 0 additions & 18 deletions src/import/chips/p9/procedures/xml/attribute_info/chip_ec_attributes.xml
View file
Expand Up @@ -3692,24 +3692,6 @@
</chipEcFeature>
</attribute>
<!-- ******************************************************************** -->
<attribute>
<id>ATTR_CHIP_EC_FEATURE_RTC_174656_SKIP_CUMULUS</id>
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
<description>
Only apply spy to Nimbus, skip for Cumulus.
This is because p9c_10.spydef doesn't have the spy yet.
</description>
<chipEcFeature>
<chip>
<name>ENUM_ATTR_NAME_NIMBUS</name>
<ec>
<value>0x10</value>
<test>GREATER_THAN_OR_EQUAL</test>
</ec>
</chip>
</chipEcFeature>
</attribute>
<!-- ********************************************************************* -->
<attribute>
<id>ATTR_CHIP_EC_FEATURE_P9C_SPY_ONLY</id>
<targetType>TARGET_TYPE_PROC_CHIP</targetType>
Expand Down

0 comments on commit 1b6b503

Please sign in to comment.