From d2f662b237b8fbf89a6737eac2a543e7383a6426 Mon Sep 17 00:00:00 2001 From: Andre Marin Date: Thu, 11 Jul 2019 13:01:31 -0400 Subject: Add missing attributes needed to be set for generic mss_kind Setting DRAM_MFG_ID, RCD_MFG_ID, and MODULE_HEIGHT to eff_config and editing SPD timing values to use common API for calculations that come with values from the EEPROM Change-Id: Ia41f3d176c14b1fc7d70265b105db08750103f7a Original-Change-Id: If33f2f2a49a62f114575ef36d6325fc537d1dc27 Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/79921 Tested-by: FSP CI Jenkins Tested-by: Jenkins Server Tested-by: Hostboot CI Tested-by: HWSV CI Reviewed-by: Louis Stermole Reviewed-by: STEPHEN GLANCY Reviewed-by: Jennifer A Stofer --- src/import/generic/memory/lib/utils/mss_field.H | 7 +++--- .../memory/lib/utils/shared/mss_generic_consts.H | 28 ++++++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/src/import/generic/memory/lib/utils/mss_field.H b/src/import/generic/memory/lib/utils/mss_field.H index 4ea82fb3..41e12cba 100644 --- a/src/import/generic/memory/lib/utils/mss_field.H +++ b/src/import/generic/memory/lib/utils/mss_field.H @@ -327,9 +327,10 @@ inline fapi2::ReturnCode get_field( const fapi2::Target& i_target, typename TT::template COMPARISON_OP() ), F.get_byte(i_data), l_temp, - i_ffdc_codes), - "Failed fail_for_invalid_value() for " TARGIDFORMAT, TARGTID ); - + i_ffdc_codes, + TT::FIELD_STR), + "%s failed check::invalid_value() for %s", + TT::FIELD_STR, spd::c_str(i_target) ); // Output should only change if data check passes o_value = static_cast(l_temp); 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 3465016f..fe40bc68 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 @@ -217,6 +217,12 @@ enum generic_ffdc_codes SET_PRIM_BUS_WIDTH = 0x1069, SET_PRIM_DIE_COUNT = 0x1070, SET_DRAM_DENSITY = 0x1071, + + // Power thermal functions + POWER_LIMIT = 0x1072, + SLOPE = 0x1073, + INTERCEPT = 0x1074, + SET_SI_RD_VREF_DQ = 0x1075, SET_CAC_DELAY_A = 0x1076, SET_CAC_DELAY_B = 0x1077, @@ -240,24 +246,22 @@ enum generic_ffdc_codes SET_DRAM_TRRD_L = 0x1091, SET_DRAM_TRFC = 0x1092, SET_DRAM_TRFC_DLR = 0x1093, - - - // Power thermal functions - POWER_LIMIT = 0x1072, - SLOPE = 0x1073, - INTERCEPT = 0x1074, + SET_DRAM_MFG_ID = 0x1094, // Used in fw_mark_store.H for MSS_INVALID_RANK_PASSED - FWMS_READ = 30, - FWMS_WRITE = 31, + FWMS_READ = 0x1095, + FWMS_WRITE = 0x1096, // Used in hw_mark_store.H for MSS_INVALID_RANK_PASSED - HWMS_READ = 40, - HWMS_WRITE = 41, + HWMS_READ = 0x1097, + HWMS_WRITE = 0x1098, // MSS_INVALID_INDEX_PASSED - SYMBOL_COUNT_READ = 50, - SYMBOL_COUNT_WRITE = 51, + SYMBOL_COUNT_READ = 0x1099, + SYMBOL_COUNT_WRITE = 0x109A, + + SET_RCD_MFG_ID = 0x109B, + SET_DRAM_MODULE_HEIGHT = 0x109C, }; /// -- cgit v1.2.1