Skip to content

Commit

Permalink
PRD: Nimbus rule file updates
Browse files Browse the repository at this point in the history 
Change-Id: Ic87ecbe0fc90c91ad54769264d4b0b400f3ee5fd
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/46761
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Caleb N. Palmer <cnpalmer@us.ibm.com>
Reviewed-by: Benjamin J. Weisenbeck <bweisenb@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/46947
  • Loading branch information
@zane131
zane131 committed Sep 29, 2017
1 parent d21a9a0 commit 8e7e2ad
Show file tree
Hide file tree
Showing 17 changed files with 725 additions and 637 deletions.
37 changes: 0 additions & 37 deletions src/usr/diag/prdf/common/plat/p9/p9_capp.rule
View file
Expand Up @@ -79,43 +79,6 @@ chip p9_capp
capture req nonzero("CXAFIR");
};

############################################################################
# P9 CAPP target HDCT additions (open power chkstop analysis)
############################################################################
register SNOOP_ERR_RPT
{
name "P9 CAPP target Snoop Error Report";
scomaddr 0x0201080a;
capture group default;
};

register APC_CERR
{
name "P9 CAPP target APC CERR";
scomaddr 0x0201080b;
capture group default;
};

register XPT_ERR_RPT
{
name "P9 CAPP target XPT Error Report";
scomaddr 0x0201080c;
capture group default;
};

register TLBI_ERR_RPT
{
name "P9 CAPP target TLBI Error Report";
scomaddr 0x0201080d;
capture group default;
};

register CAPP_ERRSTAT_CTRL_REG
{
name "P9 CAPP target ErrorStatus and Ctrl Reg";
scomaddr 0x0201080e;
capture group default;
};

# Include registers not defined by the xml
.include "p9_capp_regs.rule";
Expand Down
68 changes: 68 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/p9_capp_regs.rule
View file
@@ -0,0 +1,68 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/usr/diag/prdf/common/plat/p9/p9_capp_regs.rule $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2017
# [+] International Business Machines Corp.
#
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
# implied. See the License for the specific language governing
# permissions and limitations under the License.
#
# IBM_PROLOG_END_TAG

###############################################################################
# Additional registers for CAPP, not defined in XML
###############################################################################

############################################################################
# P9 CAPP target HDCT additions (open power checkstop analysis)
############################################################################

register SNOOP_ERR_RPT
{
name "P9 CAPP target Snoop Error Report";
scomaddr 0x0201080a;
capture group default;
};

register APC_CERR
{
name "P9 CAPP target APC CERR";
scomaddr 0x0201080b;
capture group default;
};

register XPT_ERR_RPT
{
name "P9 CAPP target XPT Error Report";
scomaddr 0x0201080c;
capture group default;
};

register TLBI_ERR_RPT
{
name "P9 CAPP target TLBI Error Report";
scomaddr 0x0201080d;
capture group default;
};

register CAPP_ERRSTAT_CTRL_REG
{
name "P9 CAPP target ErrorStatus and Ctrl Reg";
scomaddr 0x0201080e;
capture group default;
};

183 changes: 1 addition & 182 deletions src/usr/diag/prdf/common/plat/p9/p9_ec.rule
View file
Expand Up @@ -163,187 +163,6 @@ chip p9_ec
capture group default;
};

############################################################################
# P9 EC target HOMER Enable Reg
############################################################################

register HOMER_ENABLE
{
name "P9 EC target HOMER ENABLE";
capture group default;
scomaddr 0x20010a96;
};

############################################################################
# P9 EC target Spec Att Reason
############################################################################

register SPEC_ATTN_REASON
{
name "P9 EC target SPEC ATTN REASON";
scomaddr 0x20010a99;
capture group default;
};

register SPEC_ATTN_REASON_MASK
{
name "P9 EC target SPEC ATTN REASON MASK";
scomaddr 0x20010a9a;
capture group default;
};

############################################################################
# P9 EC target CERR Holdout Regs
############################################################################

register SPR_CORE_ERR_HOLDOUT
{
name "P9 EC target SPR CORE ERR HOLDOUT";
scomaddr 0x20010ab5;
capture group default;
};

register PMU_ERR_HOLDOUT
{
name "P9 EC target PMU ERR HOLDOUT";
scomaddr 0x20010ab6;
capture group default;
};

register TFAC_ERR_HOLDOUT
{
name "P9 EC target TFAC ERR HOLDOUT";
scomaddr 0x20010ab7;
capture group default;
};

register SPR_COMMON_ERR_HOLDOUT
{
name "P9 EC target SPR COMMON ERR HOLDOUT";
scomaddr 0x20010ab8;
capture group default;
};

register IFU_ERR_HOLDOUT0
{
name "P9 EC target IFU ERR HOLDOUT 0";
scomaddr 0x20010c00;
capture group default;
};

register IFU_ERR_HOLDOUT1
{
name "P9 EC target IFU ERR HOLDOUT 1";
scomaddr 0x20010c01;
capture group default;
};

register IFU_ERR_HOLDOUT2
{
name "P9 EC target IFU ERR HOLDOUT 2";
scomaddr 0x20010c02;
capture group default;
};

register IFU_ERR_HOLDOUT3
{
name "P9 EC target IFU ERR HOLDOUT 3";
scomaddr 0x20010c03;
capture group default;
};

register ISU_ERR_HOLDOUT0
{
name "P9 EC target ISU ERR HOLDOUT 0";
scomaddr 0x20010c40;
capture group default;
};

register ISU_ERR_HOLDOUT1
{
name "P9 EC target ISU ERR HOLDOUT 1";
scomaddr 0x20010c41;
capture group default;
};

register ISU_ERR_HOLDOUT2
{
name "P9 EC target ISU ERR HOLDOUT 2";
scomaddr 0x20010c42;
capture group default;
};

register ISU_ERR_HOLDOUT3
{
name "P9 EC target ISU ERR HOLDOUT 3";
scomaddr 0x20010c43;
capture group default;
};

register ISU_ERR_HOLDOUT4
{
name "P9 EC target ISU ERR HOLDOUT 4";
scomaddr 0x20010c44;
capture group default;
};

register ISU_ERR_HOLDOUT5
{
name "P9 EC target ISU ERR HOLDOUT 5";
scomaddr 0x20010c45;
capture group default;
};

register LSU_ERR_HOLDOUT0
{
name "P9 EC target LSU ERR HOLDOUT 0";
scomaddr 0x20010c80;
capture group default;
};

register LSU_ERR_HOLDOUT1
{
name "P9 EC target LSU ERR HOLDOUT 1";
scomaddr 0x20010c81;
capture group default;
};

register LSU_ERR_HOLDOUT2
{
name "P9 EC target LSU ERR HOLDOUT 2";
scomaddr 0x20010c82;
capture group default;
};

register LSU_ERR_HOLDOUT3
{
name "P9 EC target LSU ERR HOLDOUT 3";
scomaddr 0x20010c83;
capture group default;
};

register FIR_ERR_HOLDOUT
{
name "P9 EC target FIR ERR HOLDOUT";
scomaddr 0x20010a51;
capture group default;
};

register THREAD_CTRL_ERR_HOLDOUT
{
name "P9 EC target THREAD CTRL ERR HOLDOUT";
scomaddr 0x20010a03;
capture group default;
};

register PPM_STOP_STATE_HISTORY
{
name "P9 EC target PPM STOP STATE HISTORY";
scomaddr 0x200f0110;
capture group default;
};


# Include registers not defined by the xml
.include "p9_ec_regs.rule";

Expand Down Expand Up @@ -769,7 +588,7 @@ group gCOREFIR filter singlebit, cs_root_cause
/** COREFIR[60]
* debug checkstop on trigger
*/
(rCOREFIR, bit(60)) ? self_th_32perDay;
(rCOREFIR, bit(60)) ? defaultMaskedError;

/** COREFIR[61]
* SCOM or Recoverable error inject
Expand Down

0 comments on commit 8e7e2ad

Please sign in to comment.