Skip to content

Commit

Permalink
Fix for cd hotplug initfile
Browse files Browse the repository at this point in the history 
Change-Id: Iae93fb2369483251965a8e46942febee8267f131
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/41580
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>
Dev-Ready: 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://ralgit01.raleigh.ibm.com/gerrit1/41582
Reviewed-by: Hostboot Team <hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@dcrowell77
dchowe authored and dcrowell77 committed Jun 13, 2017
1 parent 78f670a commit 45e9254
Showing 1 changed file with 29 additions and 13 deletions.
42 changes: 29 additions & 13 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
View file
Expand Up @@ -29,8 +29,6 @@

using namespace fapi2;

constexpr uint64_t literal_0x10 = 0x10;
constexpr uint64_t literal_0b01 = 0b01;
constexpr uint64_t literal_0 = 0;
constexpr uint64_t literal_6 = 6;
constexpr uint64_t literal_5 = 5;
Expand Down Expand Up @@ -73,6 +71,8 @@ constexpr uint64_t literal_0b11111 = 0b11111;
constexpr uint64_t literal_0b111 = 0b111;
constexpr uint64_t literal_0x4 = 0x4;
constexpr uint64_t literal_0b000 = 0b000;
constexpr uint64_t literal_0b01 = 0b01;
constexpr uint64_t literal_0b11 = 0b11;
constexpr uint64_t literal_0x0 = 0x0;
constexpr uint64_t literal_0x1 = 0x1;
constexpr uint64_t literal_0x2 = 0x2;
Expand All @@ -87,9 +87,10 @@ constexpr uint64_t literal_0b00 = 0b00;
constexpr uint64_t literal_0b0 = 0b0;
constexpr uint64_t literal_0b1 = 0b1;
constexpr uint64_t literal_0b10 = 0b10;
constexpr uint64_t literal_0b11 = 0b11;
constexpr uint64_t literal_0x400 = 0x400;
constexpr uint64_t literal_0b010 = 0b010;
constexpr uint64_t literal_0b00010000 = 0b00010000;
constexpr uint64_t literal_0x10 = 0x10;
constexpr uint64_t literal_0x141 = 0x141;
constexpr uint64_t literal_0x21B = 0x21B;
constexpr uint64_t literal_0x30D = 0x30D;
Expand Down Expand Up @@ -153,14 +154,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
uint64_t l_def_CORE_CEILING_RATIO_8_8 = (l_TGT1_ATTR_PROC_FABRIC_CORE_CEILING_RATIO ==
ENUM_ATTR_PROC_FABRIC_CORE_CEILING_RATIO_RATIO_8_8);
fapi2::buffer<uint64_t> l_scom_buffer;
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
FAPI_TRY(fapi2::getScom( TGT0, 0x0ull, l_scom_buffer ));

FAPI_TRY(fapi2::putScom(TGT0, 0x0ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
Expand Down Expand Up @@ -487,7 +480,17 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.flush<0> ();
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b01 );

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
}

if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x90000d6805011c11ull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -714,7 +717,20 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
}
{
l_scom_buffer.flush<0> ();
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x10 );

if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00010000 );
}
}

if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0x10 );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x90000ec705011c11ull, l_scom_buffer));
}
{
Expand Down

0 comments on commit 45e9254

Please sign in to comment.