Skip to content

Commit

Permalink
Add call to p9a_omi_io_dccal in istep 12.6
Browse files Browse the repository at this point in the history 
As per the P9A IPL Flow document we must call p9a_omi_dccal in
istep 12.6 during axone IPLs after we have called p9a_omi_io_scominit.
Update XML to set approriate OMI_DL_GROUP_POS attribute settings on
OMIs. This was done using the mapping described in the description
of the FAPI attribute to map the CHIP_UNIT to this group pos.

Change-Id: Ib48967b0b830ddf43b0028b978fca19d6ad9be8f
RTC: 195554
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/72971
Reviewed-by: Michael Baiocchi <mbaiocch@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
  • Loading branch information
@crgeddes @dcrowell77
crgeddes authored and dcrowell77 committed May 1, 2019
1 parent 6fd61ef commit 7254582
Show file tree
Hide file tree
Showing 2 changed files with 136 additions and 12 deletions.
84 changes: 72 additions & 12 deletions src/usr/isteps/istep12/call_dmi_io_dccal.C
View file
Expand Up @@ -57,6 +57,8 @@ using namespace ISTEP_ERROR;
using namespace ERRORLOG;
using namespace TARGETING;

#define POS_0_VECTOR 0x000000FF
#define BITS_PER_BYTE 8

namespace ISTEP_12
{
Expand Down Expand Up @@ -189,26 +191,26 @@ void cumulus_dccal_setup(IStepError & io_istepError)
void axone_dccal_setup(IStepError & io_istepError)
{
errlHndl_t l_err = nullptr;
TARGETING::TargetHandleList l_omicTargetList;
getAllChiplets(l_omicTargetList, TYPE_OMIC);
TargetHandleList l_omic_target_list;
getAllChiplets(l_omic_target_list, TYPE_OMIC);

for (const auto & l_omic_target : l_omicTargetList)
for (const auto & l_omic_target : l_omic_target_list)
{
// call the HWP with each target
fapi2::Target<fapi2::TARGET_TYPE_OMIC> l_fapi_omic_target
(l_omic_target);

TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"p9a_io_omi_scominit HWP target HUID %.8x",
TARGETING::get_huid(l_omic_target));
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"p9a_io_omi_scominit HWP target HUID %.8x",
get_huid(l_omic_target));

FAPI_INVOKE_HWP(l_err, p9a_io_omi_scominit, l_fapi_omic_target);
// process return code.
if ( l_err )
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"ERROR 0x%.8X: p9a_io_omi_scominit HWP on target HUID %.8x",
l_err->reasonCode(), TARGETING::get_huid(l_omic_target) );
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"ERROR 0x%.8X: p9a_io_omi_scominit HWP on target HUID %.8x",
l_err->reasonCode(), TARGETING::get_huid(l_omic_target) );

// capture the target data in the elog
ErrlUserDetailsTarget(l_omic_target).addToLog( l_err );
Expand All @@ -221,10 +223,68 @@ void axone_dccal_setup(IStepError & io_istepError)
}
else
{
TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace,
"SUCCESS : p9a_io_omi_scominit HWP on target HUID %.8x",
TARGETING::get_huid(l_omic_target) );
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"SUCCESS : p9a_io_omi_scominit HWP on target HUID %.8x",
TARGETING::get_huid(l_omic_target) );
}

TargetHandleList l_omi_target_list;

getChildOmiTargetsByState(l_omi_target_list,
l_omic_target,
CLASS_UNIT,
TYPE_OMI,
UTIL_FILTER_FUNCTIONAL);

uint32_t l_laneVector = 0x00000000;

for(const auto & l_omi_target : l_omi_target_list)
{
// The OMI dc calibration HWP requires us to pass in the OMIC target
// and then a bit mask representing which positon of OMI we are calibrating.
// To get the position of the OMI relative to its parent OMIC, look up
// ATTR_OMI_DL_GROUP_POS then shift the POS_0_VECTOR = 0x000000FF by 1 byte to the left
// for every position away from 0 OMI_DL_GROUP_POS is.
// Therefore
// POS_0_VECTOR = 0x000000FF
// POS_1_VECTOR = 0x0000FF00
// POS_2_VECTOR = 0x00FF0000

l_laneVector |=
POS_0_VECTOR << (l_omi_target->getAttr<ATTR_OMI_DL_GROUP_POS>() * BITS_PER_BYTE);

}

TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"p9a_io_omi_dccal HWP target HUID %.8x with lane vector 0x%x",
TARGETING::get_huid(l_omic_target), l_laneVector);

FAPI_INVOKE_HWP(l_err, p9a_io_omi_dccal, l_fapi_omic_target, l_laneVector);

// process return code.
if ( l_err )
{
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"ERROR 0x%.8X: p9a_io_omi_dccal HWP on target HUID %.8x with lane vector 0x%x",
l_err->reasonCode(), TARGETING::get_huid(l_omic_target), l_laneVector);

// capture the target data in the elog
ErrlUserDetailsTarget(l_omic_target).addToLog( l_err );
l_err->collectTrace("ISTEPS_TRACE", 256);

// Create IStep error log and cross reference to error that occurred
io_istepError.addErrorDetails( l_err );

// Commit Error
errlCommit( l_err, ISTEP_COMP_ID );
}
else
{
TRACFCOMP(ISTEPS_TRACE::g_trac_isteps_trace,
"SUCCESS : p9a_io_omi_dccal HWP on target HUID %.8x with lane vector 0x%x",
TARGETING::get_huid(l_omic_target), l_laneVector );
}

}
}
#else
Expand Down
64 changes: 64 additions & 0 deletions src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
View file
Expand Up @@ -7416,6 +7416,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>0</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7491,6 +7495,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>1</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7566,6 +7574,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>2</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7641,6 +7653,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>3</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>2</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7716,6 +7732,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>4</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7791,6 +7811,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>5</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7866,6 +7890,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>6</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>2</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -7941,6 +7969,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>7</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8016,6 +8048,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>8</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8091,6 +8127,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>9</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8166,6 +8206,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>10</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8241,6 +8285,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>11</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>2</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8316,6 +8364,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>12</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8391,6 +8443,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>13</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>1</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8466,6 +8522,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>14</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>2</default>
</attribute>
</targetInstance>

<targetInstance>
Expand Down Expand Up @@ -8541,6 +8601,10 @@
<id>OMI_REFCLOCK_SWIZZLE</id>
<default>15</default>
</attribute>
<attribute>
<id>OMI_DL_GROUP_POS</id>
<default>0</default>
</attribute>
</targetInstance>

<!-- ===================================================================== -->
Expand Down

0 comments on commit 7254582

Please sign in to comment.