Skip to content

Commit

Permalink
Add Axone FIR unmasking after p9_chiplet_scominit
Browse files Browse the repository at this point in the history 
git-coreq:hostboot:I039173097619111ae5847660472e75ed9f2d5f1d
Change-Id: I5ea3215259fd975bac6a95fe4e86a7ef4d444659
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/91451
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: Mark Pizzutillo <mark.pizzutillo@ibm.com>
Reviewed-by: Jennifer A Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/91481
Reviewed-by: RAJA DAS <rajadas2@in.ibm.com>
  • Loading branch information
@stermole
stermole authored and RAJA DAS committed Feb 21, 2020
1 parent 099e740 commit 6cad7d0
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 3 deletions.
13 changes: 12 additions & 1 deletion src/import/chips/p9/common/include/p9a_mc_scom_addresses_fixes.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER sbe Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -47,4 +47,15 @@ static const uint64_t P9A_MC_REG1_CMN_CONFIG =

static const uint64_t P9A_MC_REG2_CMN_CONFIG = 0x070133CEull;

static const uint64_t P9A_MCC_DSTLCFG2 = 0x0701090Eull;

static const uint64_t P9A_MCC_USTLFAILMASK = 0x07010A13ull;

static const uint64_t P9A_MC_REG0_OMI_FIR = 0x07013340ull;
static const uint64_t P9A_MC_REG0_OMI_FIR_MASK = 0x07013343ull;
static const uint64_t P9A_MC_REG0_OMI_FIR_ACTION0 = 0x07013346ull;
static const uint64_t P9A_MC_REG0_OMI_FIR_ACTION1 = 0x07013347ull;
static const uint64_t P9A_MC_REG0_OMI_FIR_MASK_AND = 0x07013344ull;
static const uint64_t P9A_MC_REG0_OMI_FIR_MASK_OR = 0x07013345ull;

#endif
19 changes: 18 additions & 1 deletion src/import/chips/p9/common/include/p9a_mc_scom_addresses_fld_fixes.H
View file
Expand Up @@ -5,7 +5,7 @@
/* */
/* OpenPOWER sbe Project */
/* */
/* Contributors Listed Below - COPYRIGHT 2019 */
/* Contributors Listed Below - COPYRIGHT 2019,2020 */
/* [+] International Business Machines Corp. */
/* */
/* */
Expand Down Expand Up @@ -117,4 +117,21 @@ static const uint8_t P9A_MC_REG2_DL0_CONFIG1_CFG_PREIPL_PRBS_ENA = 4;
static const uint8_t P9A_MC_REG2_DL0_CONFIG1_CFG_PREIPL_PRBS_TIME = 5;
static const uint8_t P9A_MC_REG2_DL0_CONFIG1_CFG_PREIPL_PRBS_TIME_LEN = 3;

static const uint8_t P9A_MCC_DSTLFIR_CONFIG_REG_RECOVERABLE_PARITY_ERROR = 10 ;
static const uint8_t P9A_MCC_DSTLFIR_CONFIG_REG_FATAL_PARITY_ERROR = 11 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_A_TIMEOUT_ERROR = 14 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_B_TIMEOUT_ERROR = 15 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_A_BUFFER_OVERUSE_ERROR = 16 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_B_BUFFER_OVERUSE_ERROR = 17 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_A_DL_LINK_DOWN = 18 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_B_DL_LINK_DOWN = 19 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_A_FAIL_ACTION = 20 ;
static const uint8_t P9A_MCC_DSTLFIR_SUBCHANNEL_B_FAIL_ACTION = 21 ;
static const uint8_t P9A_MCC_DSTLFIR_CHANNEL_TIMEOUT_SUBCH_A = 22 ;
static const uint8_t P9A_MCC_DSTLFIR_CHANNEL_TIMEOUT_SUBCH_B = 23 ;
static const uint8_t P9A_MCC_DSTLFIR_SPARE24 = 24 ;
static const uint8_t P9A_MCC_DSTLFIR_SPARE25 = 25 ;
static const uint8_t P9A_MCC_DSTLFIR_INTERNAL_SCOM_ERROR_FIX = 26 ;
static const uint8_t P9A_MCC_DSTLFIR_INTERNAL_SCOM_ERROR_CLONE_FIX = 27 ;

#endif
1 change: 1 addition & 0 deletions src/import/generic/memory/lib/utils/shared/mss_generic_consts.H
View file
Expand Up @@ -1001,6 +1001,7 @@ struct mcTypeTraits<mc_type::EXPLORER>
{
MC_PER_PROC = 2,
MI_PER_MC = 2,
OMIC_PER_MC = 3,
MCC_PER_MI = 2,
OMI_PER_MCC = 2,
OCMB_PER_OMI = 1,
Expand Down
13 changes: 12 additions & 1 deletion src/import/generic/procedures/xml/error_info/generic_error.xml
View file
Expand Up @@ -5,7 +5,7 @@
<!-- -->
<!-- OpenPOWER sbe Project -->
<!-- -->
<!-- Contributors Listed Below - COPYRIGHT 2018,2019 -->
<!-- Contributors Listed Below - COPYRIGHT 2018,2020 -->
<!-- [+] International Business Machines Corp. -->
<!-- -->
<!-- -->
Expand Down Expand Up @@ -1281,4 +1281,15 @@
</callout>
</hwpError>

<hwpError>
<rc>RC_MSS_INVALID_OMIC_POSITION</rc>
<description> An invalid OMIC position was found in FIR unmask function</description>
<ffdc>POSITION</ffdc>
<ffdc>OMIC_TARGET</ffdc>
<callout>
<procedure>CODE</procedure>
<priority>HIGH</priority>
</callout>
</hwpError>

</hwpErrors>

0 comments on commit 6cad7d0

Please sign in to comment.