diff options
| author | Zane Shelley <zshelle@us.ibm.com> | 2014-09-25 09:54:57 -0500 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2014-09-26 13:18:02 -0500 |
| commit | 60e669b9771225da4b92ed978cc025d5762e7e06 (patch) | |
| tree | 09243bd5af175f7adb50210d3b8f21cea4e7c9a6 /src/usr | |
| parent | 1300dc02979646be65a39097f86a559cf68bcfb7 (diff) | |
| download | talos-hostboot-60e669b9771225da4b92ed978cc025d5762e7e06.tar.gz talos-hostboot-60e669b9771225da4b92ed978cc025d5762e7e06.zip | |
Partial revert "PRD: Circumvent issue with channel fails before MP-IPLs"
This partially reverts commit 09d48be23518b8dbb58194ae13bfc012fc070785.
Change-Id: Ic75642e56e68fa5da0469a5dee27d0b9be3da149
CQ: SW279531
Backport: release-fips811
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13590
Reviewed-by: Christopher T. Phan <cphan@us.ibm.com>
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Zane Shelley <zshelle@us.ibm.com>
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/13600
Diffstat (limited to 'src/usr')
3 files changed, 38 insertions, 3 deletions
diff --git a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C index e44fe80bc..e46b1ee6a 100644 --- a/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C +++ b/src/usr/diag/prdf/common/framework/service/prdfRasServices_common.C @@ -754,7 +754,11 @@ void ErrDataService::initPfaData( const ServiceDataCollector & i_sdc, hwTableContent dumpContent; i_sdc.GetDumpRequest( dumpContent, o_dumpTrgt ); - checkMpIplEligibility( i_attnType, o_dumpTrgt, dumpContent ); + // TODO: RTC 116213 proc_mpipl_check_eligibility() is completely broken so + // reverting this bug fix to the original 810 and 820 behavior (per + // request from Kevin) until proc_mpipl_check_eligibility() is fixed + // in FW830. + //checkMpIplEligibility( i_attnType, o_dumpTrgt, dumpContent ); o_pfa.msDumpInfo.content = dumpContent; o_pfa.msDumpInfo.id = getHuid(o_dumpTrgt); diff --git a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule index 2270862c4..77ac6bae9 100755 --- a/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule +++ b/src/usr/diag/prdf/common/plat/pegasus/Proc_acts_PB.rule @@ -3165,13 +3165,23 @@ actionclass calloutNxThr5pHr actionclass combinedResponseError { - dumpSH; + # TODO: RTC 116213 proc_mpipl_check_eligibility() is completely broken so + # reverting this bug fix to the original 810 and 820 behavior (per + # request from Kevin) until proc_mpipl_check_eligibility() is fixed + # in FW830. + funccall("analyzeMpIPL"); + #dumpSH; funccall("combinedResponseCallout"); }; actionclass forceMpIpl { - dumpSH; + # TODO: RTC 116213 proc_mpipl_check_eligibility() is completely broken so + # reverting this bug fix to the original 810 and 820 behavior (per + # request from Kevin) until proc_mpipl_check_eligibility() is fixed + # in FW830. + funccall("analyzeMpIPL"); + #dumpSH; callout2ndLvlMedThr1NoGard; }; diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C index 08bec0e54..56f0aa247 100644 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C +++ b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C @@ -42,6 +42,27 @@ namespace PRDF namespace Proc { +// TODO: RTC 116213 proc_mpipl_check_eligibility() is completely broken so +// reverting this bug fix to the original 810 and 820 behavior (per +// request from Kevin) until proc_mpipl_check_eligibility() is fixed +// in FW830. +/** + * @brief Call HWP and set the right dump type + * @param i_chip P8 chip + * @param i_sc The step code data struct + * @returns Failure or Success + * @note + */ +int32_t analyzeMpIPL( ExtensibleChip * i_chip, + STEP_CODE_DATA_STRUCT & i_sc ) +{ + PRDF_ERR( "analyzeMpIPL functionality not supported during hostboot: " + "PROC = 0x%08x", i_chip->GetId() ); + + return SUCCESS; +} +PRDF_PLUGIN_DEFINE( Proc, analyzeMpIPL ); + /** * @brief Handle SLW Malfunction alert * @param i_chip P8 chip |
