Skip to content

Commit

Permalink
Modify the getFfdc routine to consider the SBE proc
Browse files Browse the repository at this point in the history 
    -The SBE returns target instance numbers associated with the
     proc, not the system. This commit adds a translation to
     map the instance number to the FAPI_FAPI position based on the
     proc number.

Change-Id: I9b296142cd977dee8c1f390f48abfd4b0cb0abe8
CQ:SW442966
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64995
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+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: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/64998
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
  • Loading branch information
@rjknight @crgeddes
rjknight authored and crgeddes committed Aug 29, 2018
1 parent f4aa6c6 commit 76a1494
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 10 deletions.
58 changes: 52 additions & 6 deletions src/import/hwpf/fapi2/include/error_info_defs.H
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2015,2017 */
/* Contributors Listed Below - COPYRIGHT 2015,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -160,6 +160,24 @@ enum ErrorInfoType
EI_LAST_TYPE = EI_TYPE_COLLECT_TRACE + 1,
};

// @brief used when translating the SBE targets instance into a fapi pos.
enum maxTargetsPerProc : uint16_t
{
MAX_MCBIST_PER_PROC = 2,
MAX_MC_PER_PROC = 2,
MAX_MI_PER_PROC = 4,
MAX_MCS_PER_PROC = 4,
MAX_EQ_PER_PROC = 6,
MAX_MCA_PER_PROC = 8,
MAX_PHB_PER_PROC = 6,
MAX_EX_PER_PROC = 12,
MAX_CORE_PER_PROC = 24,
MAX_PERV_PER_PROC = 56,
INVALID_TARGET_COUNT = 0xFFFF,
INVALID_FAPI_POS = INVALID_TARGET_COUNT,
};


#ifndef MINIMUM_FFDC
///
/// @enum HwCallout
Expand Down Expand Up @@ -251,10 +269,21 @@ enum CollectTrace
};
}

// @brief convert the processor relative sbe target instance into a fapi pos
//
// @param[in] i_targType - type of target from SBE FFDC buffer
// @param[in] i_proc - current SBE processor number
// @param[in] i_instance - instance of i_targType relitive to the processor
// number i_proc.
//
uint16_t convertSbeTargInstanceToFapiPos(fapi2::TargetType i_targType,
fapi2::Target<TARGET_TYPE_PROC_CHIP>& i_proc, uint16_t i_instance);

// NOTE - this assumes no buffer_t or variable_buffers are passed
// data is converted to a uint64_t when placed into the sbe ffdc
// buffer
inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc, bool& invalid_data )
inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc, uint8_t i_proc_instance,
bool& invalid_data )
{
fapi2::ffdc_t l_ffdc;

Expand All @@ -264,15 +293,32 @@ inline fapi2::ffdc_t getFfdcData( sbeFfdc_t& i_sbeFfdc, bool& invalid_data )
{
#ifdef FAPI2_ENABLE_PLATFORM_GET_TARGET
uint64_t targetData = i_sbeFfdc.data;
// get a fapi target for the passed in proc instance
auto l_proc =
getTarget<TARGET_TYPE_PROC_CHIP>(i_proc_instance);

fapi2::TargetType type = static_cast<fapi2::TargetType>(targetData >> 32);
uint8_t instance = static_cast<uint8_t>(targetData & 0xFFFFFFFF);
// call hostboot to get the fapi2 target reference
l_ffdc.ptr() = static_cast<void*>(getTarget<TARGET_TYPE_ALL>(type, instance));

if(l_ffdc.ptr() == nullptr )
// sbe returns the target instance based on processor scope,
// we will need to convert that number to system scope (FAPI_POS)
uint16_t instance = static_cast<uint16_t>(targetData & 0xFFFFFFFF);

uint16_t fapi_pos = convertSbeTargInstanceToFapiPos(type, l_proc, instance);

if( fapi_pos == INVALID_FAPI_POS )
{
invalid_data = true;
}
else
{
// call hostboot to get the fapi2 target pointer
l_ffdc.ptr() = static_cast<void*>(getTarget<TARGET_TYPE_ALL>(type, fapi_pos));

if(l_ffdc.ptr() == nullptr )
{
invalid_data = true;
}
}

#endif
}
Expand Down
109 changes: 109 additions & 0 deletions src/import/hwpf/fapi2/src/fapi2_utils.C
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,113 @@ ReturnCode queryChipEcAndName(

return l_rc;
}


// convert sbe instance of target to a fapi position
uint16_t convertSbeTargInstanceToFapiPos(fapi2::TargetType i_targType,
fapi2::Target<TARGET_TYPE_PROC_CHIP>& i_proc, uint16_t i_instance)
{
// Compute this target's FAPI_POS value. We first take the parent's
// FAPI_POS and multiply by the max number of targets of this type that
// the parent's type can have. This yields the lower bound of this
// target's FAPI_POS. Then we add in the relative position of this
// target with respect to the parent. Typically this is done by passing
// in the chip unit, in which case (such as for cores) it can be much
// greater than the architecture limit ratio (there can be cores with
// chip units of 0..23, but only 2 cores per ex), so to normalize we
// have to take the value mod the architecture limit. Note that this
// scheme only holds up because every parent also had the same type of
// calculation to compute its own FAPI_POS.

uint16_t max_targets = 0;

uint16_t fapi_pos = INVALID_FAPI_POS;

ATTR_FAPI_POS_Type l_procPosition = 0;

FAPI_ATTR_GET(fapi2::ATTR_FAPI_POS, i_proc, l_procPosition);

switch( i_targType )
{
case TARGET_TYPE_EQ:
{
max_targets = MAX_EQ_PER_PROC;
break;
}

case TARGET_TYPE_CORE:
{
max_targets = MAX_CORE_PER_PROC;
break;
}

case TARGET_TYPE_EX:
{
max_targets = MAX_EX_PER_PROC;
break;
}

case TARGET_TYPE_MCS:
{
max_targets = MAX_MCS_PER_PROC;
break;
}

case TARGET_TYPE_MCA:
{
max_targets = MAX_MCA_PER_PROC;
break;
}

case TARGET_TYPE_MC:
{
max_targets = MAX_MC_PER_PROC;
break;
}

case TARGET_TYPE_MI:
{
max_targets = MAX_MI_PER_PROC;
break;
}

case TARGET_TYPE_PHB:
{
max_targets = MAX_PHB_PER_PROC;
break;
}

case TARGET_TYPE_MCBIST:
{
max_targets = MAX_MCBIST_PER_PROC;
break;
}

case TARGET_TYPE_PERV:
{
max_targets = MAX_PERV_PER_PROC;
break;
}

default:
max_targets = INVALID_TARGET_COUNT;
break;
}

if( max_targets == INVALID_TARGET_COUNT )
{
FAPI_ERR("Unable to determine the target count "
"for target type = 0x%x and instance 0x%d "
"associated with proc position %d",
i_targType, i_instance, l_procPosition);
}
else
{
fapi_pos = max_targets * l_procPosition +
(i_instance % max_targets);
}

return fapi_pos;
}

};
8 changes: 4 additions & 4 deletions src/import/hwpf/fapi2/tools/parseErrorInfo.pl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ sub addFfdcMethod
$method_body .= " fapi2::getErrorInfoFfdcSize(i_value);\n return *this;\n }\n\n";
$methods->{$key}{member} = "$ffdc_type $ffdc_uc;";
$methods->{$objectNumber}{localvar} =
"$ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],invalid_data);";
"$ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],proc_instance,invalid_data);";
$methods->{$objectNumber}{assignment_string} = "l_obj.$ffdc_uc = $ffdc_uc;";
}
else
Expand Down Expand Up @@ -336,7 +336,7 @@ sub addFfdcMethod
$method_body .= " }\n\n";
$methods->{$key}{member} = "$ffdc_type $ffdc_uc;";
$methods->{$objectNumber}{localvar} =
"$buffer_ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],invalid_data);";
"$buffer_ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],proc_instance,invalid_data);";
$methods->{$objectNumber}{assignment_string} = "l_obj.$ffdc_uc = $ffdc_uc;";
}

Expand Down Expand Up @@ -373,7 +373,7 @@ sub addFfdcMethod

$methods->{$key}{member} = "$ffdc_type $ffdc_uc;";
$methods->{$objectNumber}{localvar} =
"$ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],invalid_data);";
"$ffdc_type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],proc_instance,invalid_data);";
$methods->{$objectNumber}{assignment_string} = "l_obj.$ffdc_uc=$ffdc_uc;";
}
elsif ( $type eq $scom_addr_type )
Expand All @@ -394,7 +394,7 @@ sub addFfdcMethod
$method_body .= " return *this;}\n\n";
$methods->{$key}{member} = "$type $ffdc_uc;";
$methods->{$objectNumber}{localvar} =
"$type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],invalid_data);";
"$type $ffdc_uc = fapi2::getFfdcData(i_ebuf[$objectNumber],proc_instance,invalid_data);";
$methods->{$objectNumber}{assignment_string} = "l_obj.$ffdc_uc = $ffdc_uc;";
}
else
Expand Down

0 comments on commit 76a1494

Please sign in to comment.