From 0d1f65bf28a7e415c830dd8cf57c5e1f8fbd0c1f Mon Sep 17 00:00:00 2001 From: Stephen Glancy Date: Wed, 24 Jul 2019 11:41:49 -0400 Subject: [PATCH] Adds explorer MCBIST address/data traps processing Change-Id: If0a805d0568d19076257a4591dd4ac017da36204 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80910 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Reviewed-by: Louis Stermole Reviewed-by: ANDRE A MARIN Tested-by: PPE CI Tested-by: Hostboot CI Tested-by: HWSV CI Reviewed-by: Jennifer A Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80943 Tested-by: Jenkins OP Build CI Reviewed-by: Daniel M Crowell --- .../common/include/explorer_scom_addresses_fixes.H | 1 + .../common/include/explorer_scom_addresses_fld_fixes.H | 1 + .../procedures/hwp/memory/lib/shared/exp_consts.H | 1 + .../generic/memory/lib/utils/shared/mss_generic_consts.H | 8 ++++++++ 4 files changed, 11 insertions(+) diff --git a/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fixes.H b/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fixes.H index 37ac4d3d0a7..e82bd9dec1e 100644 --- a/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fixes.H +++ b/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fixes.H @@ -3147,5 +3147,6 @@ static const uint64_t EXP_DDR4_PHY_DBYTE9_RXPBDLYTG3_R6 = 0x040659acull; static const uint64_t EXP_DDR4_PHY_DBYTE9_RXPBDLYTG3_R7 = 0x04065dacull; static const uint64_t EXP_DDR4_PHY_DBYTE9_RXPBDLYTG3_R8 = 0x040661acull; static const uint64_t EXPLR_RDF_MCBCM2 = 0x08011c35ull; +static const uint64_t EXPLR_TP_MB_UNIT_TOP_TR1_TRACE_TRCTRL_CONFIG = 0x08010442ull; #endif diff --git a/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fld_fixes.H b/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fld_fixes.H index d96747dada6..bcdee837cc9 100644 --- a/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fld_fixes.H +++ b/src/import/chips/ocmb/explorer/common/include/explorer_scom_addresses_fld_fixes.H @@ -48,5 +48,6 @@ static const uint8_t EXPLR_MCBIST_MBSSYMEC9Q_MODAL_SYMBOL_COUNTER_79 = static const uint8_t EXPLR_MCBIST_MBSSYMEC9Q_MODAL_SYMBOL_COUNTER_79_LEN = 8 ; static const uint8_t EXPLR_RDF_MCBCM2_MCBIST_HALF_COMPARE_MASK = 0 ; static const uint8_t EXPLR_RDF_MCBCM2_MCBIST_HALF_COMPARE_MASK_LEN = 40 ; +static const uint8_t EXPLR_TP_MB_UNIT_TOP_TR1_TRACE_TRCTRL_CONFIG_TRA_MASTER_CLOCK_ENABLE = 22; #endif diff --git a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H index 8d0339a00ab..b37a5008e8e 100644 --- a/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H +++ b/src/import/chips/ocmb/explorer/procedures/hwp/memory/lib/shared/exp_consts.H @@ -128,6 +128,7 @@ enum sizes MAX_SYMBOLS_PER_PORT = 72, MAX_RANKS_DIMM1 = 2, MAX_MRANK_PER_PORT = MAX_DIMM_PER_PORT * MAX_RANK_PER_DIMM, + MAX_BYTES_PER_PORT = MAX_DQ_BITS_PER_PORT / BITS_PER_BYTE, }; #endif diff --git a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H index 1d95e82d5da..e49ca8ecc00 100644 --- a/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H +++ b/src/import/generic/memory/lib/utils/shared/mss_generic_consts.H @@ -115,6 +115,14 @@ enum conversions NIBBLES_PER_BYTE = 2, BITS_PER_NIBBLE = 4, BITS_PER_BYTE = 8, + BIT_POS_FOR_BYTE0 = BITS_PER_BYTE * 0, + BIT_POS_FOR_BYTE1 = BITS_PER_BYTE * 1, + BIT_POS_FOR_BYTE2 = BITS_PER_BYTE * 2, + BIT_POS_FOR_BYTE3 = BITS_PER_BYTE * 3, + BIT_POS_FOR_BYTE4 = BITS_PER_BYTE * 4, + BIT_POS_FOR_BYTE5 = BITS_PER_BYTE * 5, + BIT_POS_FOR_BYTE6 = BITS_PER_BYTE * 6, + BIT_POS_FOR_BYTE7 = BITS_PER_BYTE * 7, // Used by exp_decoder.C for dA to cA DECI_TO_CENTI = 10,