Skip to content

Commit

Permalink
PRD: Updates from the RAS XML
Browse files Browse the repository at this point in the history
Change-Id: I276b6eb0c46b9a280e16255530d0fce5a080c53b
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68267
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: Zane C. Shelley <zshelle@us.ibm.com>
Squashed: Iada037092666fa4c71f37cb785b6dd4e52be03e3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68513
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>
  • Loading branch information
zane131 committed Nov 12, 2018
1 parent 4694514 commit f5096ac
Show file tree
Hide file tree
Showing 27 changed files with 170 additions and 224 deletions.
5 changes: 2 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_capp.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_capp
{
name "P9 CAPP chiplet";
name "CUMULUS CAPP target";
targettype TYPE_CAPP;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -406,8 +406,7 @@ group gCXAFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_capp_actions.rule";

9 changes: 2 additions & 7 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_dmi
{
name "P9 MCA chiplet";
name "CUMULUS DMI target";
targettype TYPE_DMI;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -54,15 +54,13 @@ chip cumulus_dmi
reset (&, 0x07010901);
mask (|, 0x07010905);
capture group default;
capture group chnlFail;
};

register CHIFIR_MASK
{
name "P9 DMI target CHIFIR MASK";
scomaddr 0x07010903;
capture group default;
capture group chnlFail;
};

register CHIFIR_ACT0
Expand All @@ -71,7 +69,6 @@ chip cumulus_dmi
scomaddr 0x07010906;
capture group default;
capture req nonzero("CHIFIR");
capture group chnlFail;
};

register CHIFIR_ACT1
Expand All @@ -80,7 +77,6 @@ chip cumulus_dmi
scomaddr 0x07010907;
capture group default;
capture req nonzero("CHIFIR");
capture group chnlFail;
};

# Include registers not defined by the xml
Expand Down Expand Up @@ -421,8 +417,7 @@ group gCHIFIR filter priority( 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "cumulus_dmi_actions.rule";

2 changes: 0 additions & 2 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_dmi_regs.rule
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
name "MCI Configuration Register 0";
scomaddr 0x0701090A;
capture group default;
capture group chnlFail;
};

register MCISTAT
Expand Down Expand Up @@ -85,7 +84,6 @@
name "MCI Configuration Register 1";
scomaddr 0x0701090E;
capture group default;
capture group chnlFail;
};

register RECR
Expand Down
5 changes: 2 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_ec.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_ec
{
name "P9 EC chiplet";
name "CUMULUS EC target";
targettype TYPE_CORE;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -639,8 +639,7 @@ group gCOREFIR filter priority(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_ec_actions.rule";

5 changes: 2 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_eq.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_eq
{
name "P9 EQ chiplet";
name "CUMULUS EQ target";
targettype TYPE_EQ;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -358,9 +358,8 @@ group gEQ_LFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_eq_actions.rule";

actionclass analyzeConnectedEX0 { analyze(connected(TYPE_EX, 0)); };
Expand Down
6 changes: 3 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_ex.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@

chip cumulus_ex
{
name "P9 EX chiplet";
name "CUMULUS EX target";
targettype TYPE_EX;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
scomlen 64;

# Import signatures
.include "prdfP9ExExtraSig.H";

#############################################################################
Expand Down Expand Up @@ -888,8 +889,7 @@ group gCMEFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_ex_actions.rule";

6 changes: 3 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_mc.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,13 @@

chip cumulus_mc
{
name "P9 MC chiplet";
name "CUMULUS MC target";
targettype TYPE_MC;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
scomlen 64;

# Import signatures
.include "prdfLaneRepairExtraSig.H";

#############################################################################
Expand Down Expand Up @@ -839,9 +840,8 @@ group gMCBISTFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "cumulus_mc_actions.rule";

actionclass analyzeConnectedDMI0 { analyze(connected(TYPE_DMI, 0)); };
Expand Down
5 changes: 2 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_mi.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_mi
{
name "P9 MI chiplet";
name "CUMULUS MI target";
targettype TYPE_MI;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -256,8 +256,7 @@ group gMCFIR filter singlebit, cs_root_cause( 0, 8 )
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "cumulus_mi_actions.rule";

7 changes: 3 additions & 4 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_obus.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@

chip cumulus_obus
{
name "P9 OBUS chiplet";
name "CUMULUS OBUS target";
targettype TYPE_OBUS;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
scomlen 64;

#Import signatures
# Import signatures
.include "prdfLaneRepairExtraSig.H";

#############################################################################
Expand Down Expand Up @@ -974,8 +974,7 @@ group gOBPPEFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_obus_actions.rule";

5 changes: 2 additions & 3 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_pec.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_pec
{
name "P9 PEC chiplet";
name "CUMULUS PEC target";
targettype TYPE_PEC;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -461,8 +461,7 @@ group gIOPCIFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_pec_actions.rule";

9 changes: 4 additions & 5 deletions src/usr/diag/prdf/common/plat/cumulus/cumulus_phb.rule
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

chip cumulus_phb
{
name "P9 PHB chiplet";
name "CUMULUS PHB target";
targettype TYPE_PHB;
sigoff 0x9200;
dump DUMP_CONTENT_HW;
Expand Down Expand Up @@ -449,12 +449,12 @@ group gETUFIR filter singlebit, cs_root_cause
(rETUFIR, bit(4)) ? defaultMaskedError;

/** ETUFIR[5]
* spare
* AIB_INF_CLASS_ERROR
*/
(rETUFIR, bit(5)) ? defaultMaskedError;

/** ETUFIR[6]
* AIB_INF_CLASS_ERROR
* spare
*/
(rETUFIR, bit(6)) ? defaultMaskedError;

Expand Down Expand Up @@ -751,8 +751,7 @@ group gETUFIR filter singlebit, cs_root_cause
# #
##############################################################################

# Include the common action set.
# Include the actions defined for this target
.include "p9_common_actions.rule";
# Include the chip-specific action set.
.include "p9_common_phb_actions.rule";

0 comments on commit f5096ac

Please sign in to comment.