Skip to content

Commit

Permalink
PRD: misc cleanup from latest RAS XML
Browse files Browse the repository at this point in the history 
Change-Id: I791c3307831aca31018f6f810c47029553bff5e5
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75993
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/77245
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
@zane131
zane131 committed May 13, 2019
1 parent 6a2bedb commit a1f0a3e
Show file tree
Hide file tree
Showing 10 changed files with 94 additions and 262 deletions.
106 changes: 53 additions & 53 deletions src/usr/diag/prdf/common/plat/axone/axone_mc.rule
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 2018
# Contributors Listed Below - COPYRIGHT 2018,2019
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -141,39 +141,39 @@ chip axone_mc
};

############################################################################
# P9 MC target MCBISTFIR
# P9 MC target MCMISCFIR
############################################################################

register MCBISTFIR
register MCMISCFIR
{
name "P9 MC target MCBISTFIR";
name "P9 MC target MCMISCFIR";
scomaddr 0x07012300;
reset (&, 0x07012301);
mask (|, 0x07012305);
capture group default;
};

register MCBISTFIR_MASK
register MCMISCFIR_MASK
{
name "P9 MC target MCBISTFIR MASK";
name "P9 MC target MCMISCFIR MASK";
scomaddr 0x07012303;
capture group default;
};

register MCBISTFIR_ACT0
register MCMISCFIR_ACT0
{
name "P9 MC target MCBISTFIR ACT0";
name "P9 MC target MCMISCFIR ACT0";
scomaddr 0x07012306;
capture group default;
capture req nonzero("MCBISTFIR");
capture req nonzero("MCMISCFIR");
};

register MCBISTFIR_ACT1
register MCMISCFIR_ACT1
{
name "P9 MC target MCBISTFIR ACT1";
name "P9 MC target MCMISCFIR ACT1";
scomaddr 0x07012307;
capture group default;
capture req nonzero("MCBISTFIR");
capture req nonzero("MCMISCFIR");
};

# Include registers not defined by the xml
Expand Down Expand Up @@ -253,9 +253,9 @@ group gMC_CHIPLET_FIR attntype CHECK_STOP, RECOVERABLE
(rMC_CHIPLET_FIR, bit(11)) ? analyzeConnectedMCC3;

/** MC_CHIPLET_FIR[12]
* Attention from MCBISTFIR
* Attention from MCMISCFIR
*/
(rMC_CHIPLET_FIR, bit(12)) ? analyzeMCBISTFIR;
(rMC_CHIPLET_FIR, bit(12)) ? analyzeMCMISCFIR;

/** MC_CHIPLET_FIR[13]
* Attention from IOOMIFIR 0
Expand Down Expand Up @@ -358,9 +358,9 @@ group gMC_CHIPLET_UCS_FIR attntype UNIT_CS
(rMC_CHIPLET_UCS_FIR, bit(8)) ? analyzeConnectedMCC3;

/** MC_CHIPLET_UCS_FIR[9]
* Attention from MCBISTFIR
* Attention from MCMISCFIR
*/
(rMC_CHIPLET_UCS_FIR, bit(9)) ? analyzeMCBISTFIR;
(rMC_CHIPLET_UCS_FIR, bit(9)) ? analyzeMCMISCFIR;

/** MC_CHIPLET_UCS_FIR[10]
* Attention from IOOMIFIR 0
Expand Down Expand Up @@ -448,9 +448,9 @@ group gMC_CHIPLET_HA_FIR attntype HOST_ATTN
(rMC_CHIPLET_HA_FIR, bit(8)) ? analyzeConnectedMCC3;

/** MC_CHIPLET_HA_FIR[9]
* Attention from MCBISTFIR
* Attention from MCMISCFIR
*/
(rMC_CHIPLET_HA_FIR, bit(9)) ? analyzeMCBISTFIR;
(rMC_CHIPLET_HA_FIR, bit(9)) ? analyzeMCMISCFIR;

};

Expand Down Expand Up @@ -563,94 +563,94 @@ group gMC_LFIR
};

################################################################################
# P9 MC target MCBISTFIR
# P9 MC target MCMISCFIR
################################################################################

rule rMCBISTFIR
rule rMCMISCFIR
{
CHECK_STOP:
MCBISTFIR & ~MCBISTFIR_MASK & ~MCBISTFIR_ACT0 & ~MCBISTFIR_ACT1;
MCMISCFIR & ~MCMISCFIR_MASK & ~MCMISCFIR_ACT0 & ~MCMISCFIR_ACT1;
RECOVERABLE:
MCBISTFIR & ~MCBISTFIR_MASK & ~MCBISTFIR_ACT0 & MCBISTFIR_ACT1;
MCMISCFIR & ~MCMISCFIR_MASK & ~MCMISCFIR_ACT0 & MCMISCFIR_ACT1;
HOST_ATTN:
MCBISTFIR & ~MCBISTFIR_MASK & MCBISTFIR_ACT0 & ~MCBISTFIR_ACT1;
MCMISCFIR & ~MCMISCFIR_MASK & MCMISCFIR_ACT0 & ~MCMISCFIR_ACT1;
UNIT_CS:
MCBISTFIR & ~MCBISTFIR_MASK & MCBISTFIR_ACT0 & MCBISTFIR_ACT1;
MCMISCFIR & ~MCMISCFIR_MASK & MCMISCFIR_ACT0 & MCMISCFIR_ACT1;
};

group gMCBISTFIR
group gMCMISCFIR
filter singlebit,
cs_root_cause
{
/** MCBISTFIR[0]
/** MCMISCFIR[0]
* WAT debug bus attn
*/
(rMCBISTFIR, bit(0)) ? defaultMaskedError;
(rMCMISCFIR, bit(0)) ? defaultMaskedError;

/** MCBISTFIR[1]
/** MCMISCFIR[1]
* WAT debug register parity error
*/
(rMCBISTFIR, bit(1)) ? defaultMaskedError;
(rMCMISCFIR, bit(1)) ? defaultMaskedError;

/** MCBISTFIR[2]
/** MCMISCFIR[2]
* SCOM recoverable register parity error
*/
(rMCBISTFIR, bit(2)) ? defaultMaskedError;
(rMCMISCFIR, bit(2)) ? defaultMaskedError;

/** MCBISTFIR[3]
/** MCMISCFIR[3]
* Spare
*/
(rMCBISTFIR, bit(3)) ? defaultMaskedError;
(rMCMISCFIR, bit(3)) ? defaultMaskedError;

/** MCBISTFIR[4]
/** MCMISCFIR[4]
* Chan 0A application interrupt
*/
(rMCBISTFIR, bit(4)) ? defaultMaskedError;
(rMCMISCFIR, bit(4)) ? defaultMaskedError;

/** MCBISTFIR[5]
/** MCMISCFIR[5]
* Chan 0B application interrupt
*/
(rMCBISTFIR, bit(5)) ? defaultMaskedError;
(rMCMISCFIR, bit(5)) ? defaultMaskedError;

/** MCBISTFIR[6]
/** MCMISCFIR[6]
* Chan 1A application interrupt
*/
(rMCBISTFIR, bit(6)) ? defaultMaskedError;
(rMCMISCFIR, bit(6)) ? defaultMaskedError;

/** MCBISTFIR[7]
/** MCMISCFIR[7]
* Chan 1B application interrupt
*/
(rMCBISTFIR, bit(7)) ? defaultMaskedError;
(rMCMISCFIR, bit(7)) ? defaultMaskedError;

/** MCBISTFIR[8]
/** MCMISCFIR[8]
* Chan 2A application interrupt
*/
(rMCBISTFIR, bit(8)) ? defaultMaskedError;
(rMCMISCFIR, bit(8)) ? defaultMaskedError;

/** MCBISTFIR[9]
/** MCMISCFIR[9]
* Chan 2B application interrupt
*/
(rMCBISTFIR, bit(9)) ? defaultMaskedError;
(rMCMISCFIR, bit(9)) ? defaultMaskedError;

/** MCBISTFIR[10]
/** MCMISCFIR[10]
* Chan 3A application interrupt
*/
(rMCBISTFIR, bit(10)) ? defaultMaskedError;
(rMCMISCFIR, bit(10)) ? defaultMaskedError;

/** MCBISTFIR[11]
/** MCMISCFIR[11]
* Chan 3B application interrupt
*/
(rMCBISTFIR, bit(11)) ? defaultMaskedError;
(rMCMISCFIR, bit(11)) ? defaultMaskedError;

/** MCBISTFIR[12]
/** MCMISCFIR[12]
* Internal SCOM error
*/
(rMCBISTFIR, bit(12)) ? defaultMaskedError;
(rMCMISCFIR, bit(12)) ? defaultMaskedError;

/** MCBISTFIR[13]
/** MCMISCFIR[13]
* Internal SCOM error clone
*/
(rMCBISTFIR, bit(13)) ? defaultMaskedError;
(rMCMISCFIR, bit(13)) ? defaultMaskedError;

};

Expand Down
4 changes: 2 additions & 2 deletions src/usr/diag/prdf/common/plat/axone/axone_mc_actions.rule
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 2017,2018
# Contributors Listed Below - COPYRIGHT 2017,2019
# [+] International Business Machines Corp.
#
#
Expand All @@ -28,7 +28,7 @@
###############################################################################

actionclass analyzeMC_LFIR { analyze(gMC_LFIR); };
actionclass analyzeMCBISTFIR { analyze(gMCBISTFIR); };
actionclass analyzeMCMISCFIR { analyze(gMCMISCFIR); };

###############################################################################
# Analyze connected
Expand Down
10 changes: 5 additions & 5 deletions src/usr/diag/prdf/common/plat/axone/axone_phb.rule
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 2018
# Contributors Listed Below - COPYRIGHT 2018,2019
# [+] International Business Machines Corp.
#
#
Expand Down Expand Up @@ -212,7 +212,7 @@ group gPHBNFIR
/** PHBNFIR[0]
* BAR Parity Error
*/
(rPHBNFIR, bit(0)) ? self_th_1;
(rPHBNFIR, bit(0)) ? parent_proc_th_1;

/** PHBNFIR[1]
* Parity Errors on Registers besides BAR
Expand Down Expand Up @@ -252,12 +252,12 @@ group gPHBNFIR
/** PHBNFIR[8]
* Register Array Parity Error
*/
(rPHBNFIR, bit(8)) ? self_th_1;
(rPHBNFIR, bit(8)) ? parent_proc_th_1;

/** PHBNFIR[9]
* Power Bus Interface Parity Error
*/
(rPHBNFIR, bit(9)) ? self_th_1;
(rPHBNFIR, bit(9)) ? parent_proc_th_1;

/** PHBNFIR[10]
* Power Bus Data Hang
Expand Down Expand Up @@ -297,7 +297,7 @@ group gPHBNFIR
/** PHBNFIR[17]
* Hardware Error
*/
(rPHBNFIR, bit(17)) ? self_th_1;
(rPHBNFIR, bit(17)) ? parent_proc_th_1;

/** PHBNFIR[18]
* Unsolicited Power Bus Data
Expand Down

0 comments on commit a1f0a3e

Please sign in to comment.