Skip to content

Commit

Permalink
PRD: Axone/Explorer Misc Updates needed for TdCtlr/DataBundles
Browse files Browse the repository at this point in the history 
Change-Id: Ia769f949f984c810b998c19fd32c7c3af2e06244
RTC: 207388
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75791
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Paul Greenwood <paul.greenwood@ibm.com>
Reviewed-by: Brian J. Stegmiller <bjs@us.ibm.com>
Reviewed-by: Zane C. Shelley <zshelle@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76086
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
@cnpalmer @zane131
cnpalmer authored and zane131 committed Apr 18, 2019
1 parent 36a58f1 commit 9d139bd
Show file tree
Hide file tree
Showing 13 changed files with 913 additions and 55 deletions.
225 changes: 225 additions & 0 deletions src/usr/diag/prdf/common/plat/explorer/explorer_ocmb_regs.rule
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,225 @@
# IBM_PROLOG_BEGIN_TAG
# This is an automatically generated prolog.
#
# $Source: src/usr/diag/prdf/common/plat/explorer/explorer_ocmb_regs.rule $
#
# OpenPOWER HostBoot Project
#
# Contributors Listed Below - COPYRIGHT 2019
# [+] 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 ocmb, not defined in XML
###############################################################################

###########################################################################
# P9 OCMB Modal Symbol Counter Registers
###########################################################################

register OCMB_MBSSYMEC0
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC0Q";
scomaddr 0x08011858;
capture group default;
};

register OCMB_MBSSYMEC1
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC1Q";
scomaddr 0x08011859;
capture group default;
};

register OCMB_MBSSYMEC2
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC2Q";
scomaddr 0x0801185A;
capture group default;
};

register OCMB_MBSSYMEC3
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC3Q";
scomaddr 0x0801185B;
capture group default;
};

register OCMB_MBSSYMEC4
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC4Q";
scomaddr 0x0801185C;
capture group default;
};

register OCMB_MBSSYMEC5
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC5Q";
scomaddr 0x0801185D;
capture group default;
};

register OCMB_MBSSYMEC6
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC6Q";
scomaddr 0x0801185E;
capture group default;
};

register OCMB_MBSSYMEC7
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC7Q";
scomaddr 0x0801185F;
capture group default;
};

register OCMB_MBSSYMEC8
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSSYMEC8Q";
scomaddr 0x08011860;
capture group default;
};

###########################################################################
# P9 OCMB Error Vector Trap registers
###########################################################################

register MBSEVR0
{
name "P9 MBS Error Vector Trap reg 0 (port 0)";
scomaddr 0x0801187E;
capture group default;
};

############################################################################
# MBS Memory Scrub/Read Error Count Registers
############################################################################

register MBSEC0
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSEC0Q";
scomaddr 0x08011855;
capture group default;
};

register MBSEC1
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSEC1Q";
scomaddr 0x08011856;
capture group default;
};

register MBSMSEC
{
name "MCP.MCBIST.MBA_SCOMFIR.MBSMSECQ";
scomaddr 0x08011869;
capture group default;
};

###########################################################################
# P9 MCBIST command registers
###########################################################################

register MBSTR
{
name "P9 MCBIST Memory Scrub/Read Error Threshold Register";
scomaddr 0x08011857;
capture group default;
};

register MCBAGRA
{
name "P9 MCBIST Address Generator Configuration Register";
scomaddr 0x080118D6;
capture group default;
};

register MCBMCAT
{
name "P9 Maint Current Address Trap Register";
scomaddr 0x080118D7;
capture group default;
};

register MCB_CNTL
{
name "P9 MCBIST target MCBIST Control Register";
scomaddr 0x080118DB;
capture group default;
};

register MCB_CNTLSTAT
{
name "P9 MCBIST Configured Command Sequence Status Register";
scomaddr 0x080118DC;
capture group default;
};

############################################################################
# P9 OCMB target RDFFIR
############################################################################

register RDFFIR_AND
{
name "Explorer chip RDFFIR AND";
scomaddr 0x08011c01;
capture group never;
access write_only;
};

register RDFFIR_MASK_AND
{
name "Explorer chip RDFFIR MASK AND";
scomaddr 0x08011c04;
capture group never;
access write_only;
};

register RDFFIR_MASK_OR
{
name "Explorer chip RDFFIR MASK OR";
scomaddr 0x08011c05;
capture group never;
access write_only;
};

###########################################################################
# P9 OCMB target MCBISTFIR
###########################################################################

register MCBISTFIR_AND
{
name "P9 OCMB target MCBISTFIR AND";
scomaddr 0x08011801;
capture group never;
access write_only;
};

register MCBISTFIR_OR
{
name "P9 OCMB target MCBISTFIR OR";
scomaddr 0x08011802;
capture group never;
access write_only;
};

register MCBISTFIR_MASK_OR
{
name "P9 OCMB target MCBISTFIR MASK OR";
scomaddr 0x08011805;
capture group never;
access write_only;
};
3 changes: 2 additions & 1 deletion src/usr/diag/prdf/common/plat/mem/prdfMemCeTable.C
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 2013,2018 */
/* Contributors Listed Below - COPYRIGHT 2013,2019 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -281,6 +281,7 @@ void MemCeTable<T>::addCapData( CaptureData & io_cd )
// Avoid linker errors with the template.
template class MemCeTable<TYPE_MCA>;
template class MemCeTable<TYPE_MBA>;
template class MemCeTable<TYPE_MEM_PORT>;

//------------------------------------------------------------------------------

Expand Down

0 comments on commit 9d139bd

Please sign in to comment.