Skip to content

Commit

Permalink
PRD: Support for new Axone domains
Browse files Browse the repository at this point in the history 
Change-Id: I149c2f290fae505814d79975983b43fdadb13aef
RTC: 199010
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/67771
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://rchgit01.rchland.ibm.com/gerrit1/68272
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
@cnpalmer @zane131
cnpalmer authored and zane131 committed Nov 2, 2018
1 parent 68d4fee commit e652b19
Show file tree
Hide file tree
Showing 7 changed files with 321 additions and 3 deletions.
13 changes: 10 additions & 3 deletions src/usr/diag/prdf/common/framework/config/prdfRuleChipDomain.H
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 2012,2017 */
/* Contributors Listed Below - COPYRIGHT 2012,2018 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -56,6 +56,11 @@ class RuleChipDomain : public DomainContainer<RuleChip>
MC_DOMAIN_SIZE = PROC_DOMAIN_SIZE * 2,
MI_DOMAIN_SIZE = MC_DOMAIN_SIZE * 2,
DMI_DOMAIN_SIZE = MI_DOMAIN_SIZE * 2,
NPU_DOMAIN_SIZE = PROC_DOMAIN_SIZE * 3,
MCC_DOMAIN_SIZE = MI_DOMAIN_SIZE * 2,
OMIC_DOMAIN_SIZE = MC_DOMAIN_SIZE * 3,
OMI_DOMAIN_SIZE = MCC_DOMAIN_SIZE * 2,
OCMB_DOMAIN_SIZE = OMI_DOMAIN_SIZE,


MEMBUF_DOMAIN_SIZE = MCS_DOMAIN_SIZE,
Expand All @@ -67,9 +72,11 @@ class RuleChipDomain : public DomainContainer<RuleChip>
PEC_DOMAIN_SIZE + PHB_DOMAIN_SIZE +
CAPP_DOMAIN_SIZE +
MCBIST_DOMAIN_SIZE + MCS_DOMAIN_SIZE + MCA_DOMAIN_SIZE +
MEMBUF_DOMAIN_SIZE + MBA_DOMAIN_SIZE,
MEMBUF_DOMAIN_SIZE + MBA_DOMAIN_SIZE + NPU_DOMAIN_SIZE +
MCC_DOMAIN_SIZE + OMIC_DOMAIN_SIZE + OMI_DOMAIN_SIZE +
OCMB_DOMAIN_SIZE,

TOTAL_DOMAINS = 14,
TOTAL_DOMAINS = 19,
};

/** @fn RuleChipDomain
Expand Down
6 changes: 6 additions & 0 deletions src/usr/diag/prdf/common/iipconst.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,12 @@ enum DOMAIN_ID
MEMBUF_DOMAIN = 0x80,
MBA_DOMAIN = 0x81,

NPU_DOMAIN = 0x82,
MCC_DOMAIN = 0x83,
OMIC_DOMAIN = 0x84,
OMI_DOMAIN = 0x85,
OCMB_DOMAIN = 0x86,

CLOCK_DOMAIN_FAB = 0x90,
CLOCK_DOMAIN_MEMBUF = 0x91,
CLOCK_DOMAIN_IO = 0x92,
Expand Down
61 changes: 61 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/prdfP9MccDomain.H
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9MccDomain.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* [+] 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 */

#ifndef __prdfP9MccDomain_H
#define __prdfP9MccDomain_H

#include <prdfRuleChipDomain.H>

namespace PRDF
{

class MccDomain : public RuleChipDomain
{
public:

/**
* @brief Constructor
* @param i_did The domain ID
* @param i_size The projected size of the domain
*/
MccDomain( DOMAIN_ID i_did, uint32_t i_size = MCC_DOMAIN_SIZE ) :
RuleChipDomain( i_did, i_size )
{}

/**
* @brief Query for an attention of a specific type in this domain
* @param i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
* @return false
* @note This function will always return false. That way PRD will look
* for the attention via the processor chip.
*/
virtual bool Query( ATTENTION_TYPE i_attnType )
{ return false; }

};

} // end namespace PRDF

#endif /* __prdfP9MccDomain_H */
61 changes: 61 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/prdfP9NpuDomain.H
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9NpuDomain.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* [+] 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 */

#ifndef __prdfP9NpuDomain_H
#define __prdfP9NpuDomain_H

#include <prdfRuleChipDomain.H>

namespace PRDF
{

class NpuDomain : public RuleChipDomain
{
public:

/**
* @brief Constructor
* @param i_did The domain ID
* @param i_size The projected size of the domain
*/
NpuDomain( DOMAIN_ID i_did, uint32_t i_size = NPU_DOMAIN_SIZE ) :
RuleChipDomain( i_did, i_size )
{}

/**
* @brief Query for an attention of a specific type in this domain
* @param i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
* @return false
* @note This function will always return false. That way PRD will look
* for the attention via the processor chip.
*/
virtual bool Query( ATTENTION_TYPE i_attnType )
{ return false; }

};

} // end namespace PRDF

#endif /* __prdfP9NpuDomain_H */
61 changes: 61 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/prdfP9OcmbChipDomain.H
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9OcmbChipDomain.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* [+] 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 */

#ifndef __prdfP9OcmbChipDomain_H
#define __prdfP9OcmbChipDomain_H

#include <prdfRuleChipDomain.H>

namespace PRDF
{

class OcmbChipDomain : public RuleChipDomain
{
public:

/**
* @brief Constructor
* @param i_did The domain ID
* @param i_size The projected size of the domain
*/
OcmbChipDomain( DOMAIN_ID i_did, uint32_t i_size = OCMB_DOMAIN_SIZE ) :
RuleChipDomain( i_did, i_size )
{}

/**
* @brief Query for an attention of a specific type in this domain
* @param i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
* @return false
* @note This function will always return false. That way PRD will look
* for the attention via the processor chip.
*/
virtual bool Query( ATTENTION_TYPE i_attnType )
{ return false; }

};

} // end namespace PRDF

#endif /* __prdfP9OcmbChipDomain_H */
61 changes: 61 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/prdfP9OmiDomain.H
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9OmiDomain.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* [+] 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 */

#ifndef __prdfP9OmiDomain_H
#define __prdfP9OmiDomain_H

#include <prdfRuleChipDomain.H>

namespace PRDF
{

class OmiDomain : public RuleChipDomain
{
public:

/**
* @brief Constructor
* @param i_did The domain ID
* @param i_size The projected size of the domain
*/
OmiDomain( DOMAIN_ID i_did, uint32_t i_size = OMI_DOMAIN_SIZE ) :
RuleChipDomain( i_did, i_size )
{}

/**
* @brief Query for an attention of a specific type in this domain
* @param i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
* @return false
* @note This function will always return false. That way PRD will look
* for the attention via the processor chip.
*/
virtual bool Query( ATTENTION_TYPE i_attnType )
{ return false; }

};

} // end namespace PRDF

#endif /* __prdfP9OmiDomain_H */
61 changes: 61 additions & 0 deletions src/usr/diag/prdf/common/plat/p9/prdfP9OmicDomain.H
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
/* IBM_PROLOG_BEGIN_TAG */
/* This is an automatically generated prolog. */
/* */
/* $Source: src/usr/diag/prdf/common/plat/p9/prdfP9OmicDomain.H $ */
/* */
/* OpenPOWER HostBoot Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2018 */
/* [+] 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 */

#ifndef __prdfP9OmicDomain_H
#define __prdfP9OmicDomain_H

#include <prdfRuleChipDomain.H>

namespace PRDF
{

class OmicDomain : public RuleChipDomain
{
public:

/**
* @brief Constructor
* @param i_did The domain ID
* @param i_size The projected size of the domain
*/
OmicDomain( DOMAIN_ID i_did, uint32_t i_size = OMIC_DOMAIN_SIZE ) :
RuleChipDomain( i_did, i_size )
{}

/**
* @brief Query for an attention of a specific type in this domain
* @param i_attnType [MACHINE_CHECK | RECOVERABLE | SPECIAL]
* @return false
* @note This function will always return false. That way PRD will look
* for the attention via the processor chip.
*/
virtual bool Query( ATTENTION_TYPE i_attnType )
{ return false; }

};

} // end namespace PRDF

#endif /* __prdfP9OmicDomain_H */

0 comments on commit e652b19

Please sign in to comment.