Skip to content

Commit

Permalink
DD2 updated scan overrides, Cumulus DD1 initfile updates
Browse files Browse the repository at this point in the history 
Change-Id: I1b66fdf7786a2358b304b6b3d5bbc6b92d06e4e1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42380
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: DANIEL C. HOWE <dchowe@us.ibm.com>
Dev-Ready: Brent Wieman <bwieman@us.ibm.com>
Reviewed-by: Joseph J. McGill <jmcgill@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/42399
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: Dean Sanner <dsanner@us.ibm.com>
Tested-by: Dean Sanner <dsanner@us.ibm.com>
  • Loading branch information
@sannerd
dchowe authored and sannerd committed Jul 11, 2017
1 parent 1788064 commit ebca601
Show file tree
Hide file tree
Showing 6 changed files with 102 additions and 131 deletions.
99 changes: 34 additions & 65 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_cd_hp_scom.C
View file
Expand Up @@ -53,8 +53,6 @@ constexpr uint64_t literal_110 = 110;
constexpr uint64_t literal_105 = 105;
constexpr uint64_t literal_0b01011 = 0b01011;
constexpr uint64_t literal_125 = 125;
constexpr uint64_t literal_130 = 130;
constexpr uint64_t literal_135 = 135;
constexpr uint64_t literal_0b01111 = 0b01111;
constexpr uint64_t literal_0b10001 = 0b10001;
constexpr uint64_t literal_0b10011 = 0b10011;
Expand Down Expand Up @@ -89,8 +87,8 @@ constexpr uint64_t literal_0b1 = 0b1;
constexpr uint64_t literal_0b10 = 0b10;
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_0b00001100 = 0b00001100;
constexpr uint64_t literal_0x0C = 0x0C;
constexpr uint64_t literal_0x141 = 0x141;
constexpr uint64_t literal_0x21B = 0x21B;
constexpr uint64_t literal_0x30D = 0x30D;
Expand Down Expand Up @@ -132,8 +130,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
uint64_t l_def_X_RATIO_100_115 = ((literal_115 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
uint64_t l_def_X_RATIO_100_120 = ((literal_120 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
uint64_t l_def_X_RATIO_100_125 = ((literal_125 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
uint64_t l_def_X_RATIO_100_130 = ((literal_130 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
uint64_t l_def_X_RATIO_100_135 = ((literal_135 * l_TGT1_ATTR_FREQ_X_MHZ) >= (literal_100 * l_TGT1_ATTR_FREQ_PB_MHZ));
fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE_Type l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_PROC_FABRIC_SMP_OPTICS_MODE, TGT1, l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE));
uint64_t l_def_SMP_OPTICS_MODE = (l_TGT1_ATTR_PROC_FABRIC_SMP_OPTICS_MODE ==
Expand Down Expand Up @@ -240,14 +236,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01100 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
Expand Down Expand Up @@ -288,14 +276,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_1) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10100 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b10011 );
Expand Down Expand Up @@ -336,14 +316,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11010 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11011 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_2) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11100 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_120_100))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11000 );
Expand Down Expand Up @@ -384,14 +356,6 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_130))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
}
else if ((((l_def_NUM_A_LINKS_CFG == literal_3) && (l_def_NUM_X_LINKS_CFG < literal_4)) && l_def_X_RATIO_100_135))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b11111 );
}
else if (((l_def_NUM_A_LINKS_CFG == literal_0) && (l_def_NUM_X_LINKS_CFG == literal_4)))
{
l_scom_buffer.insert<54, 5, 59, uint64_t>(literal_0b01110 );
Expand Down Expand Up @@ -428,6 +392,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.flush<0> ();

if (l_def_SMP_OPTICS_MODE)
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
l_scom_buffer.insert<45, 4, 60, uint64_t>
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
}
else if (( ! l_def_SMP_OPTICS_MODE))
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
l_scom_buffer.insert<45, 4, 60, uint64_t>
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
}

if (l_def_SMP_OPTICS_MODE)
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
Expand Down Expand Up @@ -481,6 +458,19 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
{
l_scom_buffer.flush<0> ();

if (l_def_SMP_OPTICS_MODE)
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 = 0xe;
l_scom_buffer.insert<45, 4, 60, uint64_t>
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_012 );
}
else if (( ! l_def_SMP_OPTICS_MODE))
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 = 0xc;
l_scom_buffer.insert<45, 4, 60, uint64_t>
(l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_ARBMODE_NEXT_ENABLE_01 );
}

if (l_def_SMP_OPTICS_MODE)
{
constexpr auto l_PB_DAT_PBIEN_PBIEN_EAST_EN_SER_DCTL_PB_PBIEN_CFG_LINK_DOFF_VCINIT_NEXT_DOFF_32_32 = 0x4;
Expand Down Expand Up @@ -533,35 +523,17 @@ fapi2::ReturnCode p9_fbc_cd_hp_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC_
if (((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
l_scom_buffer.flush<0> ();

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 );
}

l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
FAPI_TRY(fapi2::putScom(TGT0, 0x90000d6805011c11ull, l_scom_buffer));
}
}
{
if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) )
{
l_scom_buffer.flush<0> ();

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 );
}

l_scom_buffer.insert<41, 2, 62, uint64_t>(literal_0b01 );
l_scom_buffer.insert<43, 2, 62, uint64_t>(literal_0b11 );
FAPI_TRY(fapi2::putScom(TGT0, 0x90000d7805011c11ull, l_scom_buffer));
}
}
Expand Down Expand Up @@ -791,15 +763,12 @@ 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)) )
{
if ((l_def_TRUE == literal_1))
{
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00010000 );
}
l_scom_buffer.insert<20, 8, 56, uint64_t>(literal_0b00001100 );
}

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

FAPI_TRY(fapi2::putScom(TGT0, 0x90000ec705011c11ull, l_scom_buffer));
Expand Down
4 changes: 2 additions & 2 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioe_tl_scom.C
View file
Expand Up @@ -324,7 +324,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5013411ull, l_scom_buffer ));

if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
if ((l_def_X1_ENABLED && l_def_OPTICS_IS_A_BUS))
{
l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
}
Expand Down Expand Up @@ -361,7 +361,7 @@ fapi2::ReturnCode p9_fbc_ioe_tl_scom(const fapi2::Target<fapi2::TARGET_TYPE_PROC
{
FAPI_TRY(fapi2::getScom( TGT0, 0x5013412ull, l_scom_buffer ));

if ((l_def_X0_ENABLED && l_def_OPTICS_IS_A_BUS))
if ((l_def_X2_ENABLED && l_def_OPTICS_IS_A_BUS))
{
l_scom_buffer.insert<24, 5, 59, uint64_t>(literal_0x10 );
}
Expand Down
34 changes: 20 additions & 14 deletions src/import/chips/p9/procedures/hwp/initfiles/p9_fbc_ioo_dl_scom.C
View file
Expand Up @@ -44,31 +44,22 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS
FAPI_TRY(FAPI_ATTR_GET_PRIVILEGED(fapi2::ATTR_EC, TGT1, l_chip_ec));
fapi2::ATTR_OPTICS_CONFIG_MODE_Type l_TGT0_ATTR_OPTICS_CONFIG_MODE;
FAPI_TRY(FAPI_ATTR_GET(fapi2::ATTR_OPTICS_CONFIG_MODE, TGT0, l_TGT0_ATTR_OPTICS_CONFIG_MODE));
uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
uint64_t l_def_OBUS_NV_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_NV);
uint64_t l_def_OBUS_FBC_ENABLED = (l_TGT0_ATTR_OPTICS_CONFIG_MODE == fapi2::ENUM_ATTR_OPTICS_CONFIG_MODE_SMP);
fapi2::buffer<uint64_t> l_scom_buffer;
{
FAPI_TRY(fapi2::getScom( TGT0, 0x901080aull, l_scom_buffer ));

if (l_def_OBUS_FBC_ENABLED)
{
constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );
}
constexpr auto l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON = 0x1;
l_scom_buffer.insert<0, 1, 63, uint64_t>(l_PB_IOO_LL0_CONFIG_LINK_PAIR_ON );

if (((l_chip_id == 0x5) && (l_chip_ec == 0x10)) )
{
if (l_def_OBUS_FBC_ENABLED)
{
l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
}
l_scom_buffer.insert<12, 4, 60, uint64_t>(literal_0x0B );
}
else if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
if (l_def_OBUS_FBC_ENABLED)
{
l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
}
l_scom_buffer.insert<11, 5, 59, uint64_t>(literal_0x0B );
}

l_scom_buffer.insert<28, 4, 60, uint64_t>(literal_0x0 );
Expand Down Expand Up @@ -157,6 +148,21 @@ fapi2::ReturnCode p9_fbc_ioo_dl_scom(const fapi2::Target<fapi2::TARGET_TYPE_OBUS

constexpr auto l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 = 0x2;
l_scom_buffer.insert<56, 2, 62, uint64_t>(l_PB_IOO_LL0_CONFIG_REPLAY_BUFFER_SIZE_REPLAY_255 );
constexpr auto l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON = 0x1;
l_scom_buffer.insert<39, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_ELEVEN_LANE_SHIFT_ON );

if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
constexpr auto l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON = 0x1;
l_scom_buffer.insert<42, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_RX_LANE_SWAP_ON );
}

if (((l_chip_id == 0x5) && (l_chip_ec == 0x20)) || ((l_chip_id == 0x6) && (l_chip_ec == 0x10)) )
{
constexpr auto l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON = 0x1;
l_scom_buffer.insert<43, 1, 63, uint64_t>(l_PB_IOO_LL0_LINK1_TX_LANE_SWAP_ON );
}

FAPI_TRY(fapi2::putScom(TGT0, 0x901080full, l_scom_buffer));
}

Expand Down

0 comments on commit ebca601

Please sign in to comment.