summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorCaleb Palmer <cnpalmer@us.ibm.com>2017-10-12 11:44:37 -0500
committerZane C. Shelley <zshelle@us.ibm.com>2017-10-14 15:23:36 -0400
commit1b42fde7fb28e27fab83949e049db80c4f469992 (patch)
tree4a1dbc6f470a2d00763772ad95c9e951805bb732 /src/usr
parente73311be6966037d409a7f0b95cf24d43fac57f2 (diff)
downloadtalos-hostboot-1b42fde7fb28e27fab83949e049db80c4f469992.tar.gz
talos-hostboot-1b42fde7fb28e27fab83949e049db80c4f469992.zip
PRD: Do not merge SUE flag when UERE flag is also set
Resolves #578 Change-Id: Ic7b17dbba04f949c2ea90a3a3cb6f9a402203cc3 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48306 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com> Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com> Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/48344 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>
Diffstat (limited to 'src/usr')
-rwxr-xr-xsrc/usr/diag/prdf/common/framework/config/iipSystem.C14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/usr/diag/prdf/common/framework/config/iipSystem.C b/src/usr/diag/prdf/common/framework/config/iipSystem.C
index b57955c1d..087347b93 100755
--- a/src/usr/diag/prdf/common/framework/config/iipSystem.C
+++ b/src/usr/diag/prdf/common/framework/config/iipSystem.C
@@ -5,7 +5,7 @@
/* */
/* OpenPOWER HostBoot Project */
/* */
-/* Contributors Listed Below - COPYRIGHT 2012,2015 */
+/* Contributors Listed Below - COPYRIGHT 2012,2017 */
/* [+] International Business Machines Corp. */
/* */
/* */
@@ -396,8 +396,16 @@ int32_t System::Analyze(STEP_CODE_DATA_STRUCT & serviceData,
// In that case get the secondary signature and update this.
if ( NULL != l_temp_sdc )
{
- // Merge SUE flag
- if( serviceData.service_data->IsSUE() )
+ // Merge SUE flag, but only when the UERE flag is not set. We want
+ // to merge the flag in cases where we happen to get another attn
+ // at around the same time as a CS that has the SUE flag set, so
+ // when we analyze to that other attn, we account for the SUE flag
+ // from the CS and adjust the gard policy to null accordingly.
+ // However, we do not want to merge the flags when we get the SUE
+ // and UERE flags together, as then we end up adjusting the gard
+ // policy to null when analyzing the SueSource, which we don't want.
+ if( serviceData.service_data->IsSUE() &&
+ !serviceData.service_data->IsUERE() )
{
l_temp_sdc->SetSUE();
}
OpenPOWER on IntegriCloud