diff options
Diffstat (limited to 'src/import/generic/memory/lib/spd/common/ddr4')
3 files changed, 1 insertions, 185 deletions
diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H index 7b4c1c300..0910aa2e0 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4.H @@ -106,13 +106,7 @@ class decoder_v1_0 : public decoder // Byte 1 - see factory byte enum // Byte 2 - Entire byte used - - // Byte 3 - HYBRID_MEDIA_START = 1, - HYBRID_MEDIA_LEN = 3, - - HYBRID_START = 0, - HYBRID_LEN = 1, + // Byte 3 - used in the SPD factory // Byte 4 SDRAM_CAPACITY_START = 4, @@ -348,8 +342,6 @@ class decoder_v1_0 : public decoder // Third field is the decoding bit length static constexpr field_t BYTES_USED{0, BYTES_USED_START, BYTES_USED_LEN}; static constexpr field_t TOTAL_BYTES_USED{0, BYTES_TOTAL_START, BYTES_TOTAL_LEN}; - static constexpr field_t HYBRID_MEDIA{3, HYBRID_MEDIA_START, HYBRID_MEDIA_LEN}; - static constexpr field_t HYBRID{3, HYBRID_START, HYBRID_LEN}; static constexpr field_t SDRAM_CAPACITY{4, SDRAM_CAPACITY_START, SDRAM_CAPACITY_LEN}; static constexpr field_t SDRAM_BANKS{4, SDRAM_BANKS_START, SDRAM_BANKS_LEN}; static constexpr field_t BANK_GROUP{4, BANK_GROUP_START, BANK_GROUP_LEN}; @@ -445,28 +437,6 @@ class decoder_v1_0 : public decoder virtual fapi2::ReturnCode number_of_total_bytes( uint16_t& o_value ) const override; /// - /// @brief Decodes hybrid media field from SPD - /// @param[out] o_value - /// @return FAPI2_RC_SUCCESS if okay - /// @note Decodes SPD Byte 3 (bits 6~4) - /// @note Item JC-45-2220.01x - /// @note Page 17 - /// @note DDR4 SPD Document Release 3 - /// - virtual fapi2::ReturnCode hybrid_media( uint8_t& o_value ) const override; - - /// - /// @brief Decodes hybrid field from SPD - /// @param[out] o_value - /// @return FAPI2_RC_SUCCESS if okay - /// @note Decodes SPD Byte 3 (bit 7) - /// @note Item JC-45-2220.01x - /// @note Page 17 - /// @note DDR4 SPD Document Release 3 - /// - virtual fapi2::ReturnCode hybrid( uint8_t& o_value ) const override; - - /// /// @brief Decodes SDRAM density from SPD /// @param[out] o_value SDRAM density in GBs /// @return FAPI2_RC_SUCCESS if okay @@ -1247,28 +1217,6 @@ class decoder_v1_1 : public decoder_v1_0 ///////////////////////// /// - /// @brief Decodes hybrid media field from SPD - /// @param[out] o_value - /// @return FAPI2_RC_SUCCESS if okay - /// @note Decodes SPD Byte 3 (bits 6~4) - /// @note Item JC-45-2220.01x - /// @note Page 17 - /// @note DDR4 SPD Document Release 3 - /// - virtual fapi2::ReturnCode hybrid_media( uint8_t& o_value) const override; - - /// - /// @brief Decodes hybrid field from SPD - /// @param[out] o_value - /// @return FAPI2_RC_SUCCESS if okay - /// @note Decodes SPD Byte 3 (bit 7) - /// @note Item JC-45-2220.01x - /// @note Page 17 - /// @note DDR4 SPD Document Release 3 - /// - virtual fapi2::ReturnCode hybrid( uint8_t& o_value ) const override; - - /// /// @brief Decodes SDRAM density from SPD /// @param[out] o_value SDRAM density in GBs /// @return FAPI2_RC_SUCCESS if okay diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C index 7e7bf4dc7..47071be94 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_0.C @@ -172,45 +172,6 @@ fapi_try_exit: } /// -/// @brief Decodes hybrid media field from SPD -/// @param[out] o_value enum representing hybrid memory type -/// @return FAPI2_RC_SUCCESS if okay -/// @note Decodes SPD Byte 3 (bits 4~6) -/// @note Item JC-45-2220.01x -/// @note Page 17 -/// @note DDR4 SPD Document Release 3 -/// -fapi2::ReturnCode decoder_v1_0::hybrid_media( uint8_t& o_value) const -{ - // For General Section rev 1.0 of the SPD, - // Decodes SPD Byte 3 (bits 4~6) were reserved - // and coded as zeros. There was no concept of hybrid media so this - // is thus hard-wired to zero. - o_value = 0x00; - return fapi2::FAPI2_RC_SUCCESS; - -} - -/// -/// @brief Decodes hybrid field from SPD -/// @param[out] o_value enum representing if module is hybrid -/// @return fapi2::ReturnCode -/// @note Decodes SPD Byte 3 (bit 7) -/// @note Item JC-45-2220.01x -/// @note Page 17 -/// @note DDR4 SPD Document Release 3 -/// -fapi2::ReturnCode decoder_v1_0::hybrid( uint8_t& o_value) const -{ - // For General Section rev 1.0 of the SPD, - // Decodes SPD Byte 3 (bit 7) were reserved - // and coded as zeros. There was no concept of hybrid media so this - // is thus hard-wired to zero. - o_value = 0x00; - return fapi2::FAPI2_RC_SUCCESS; -} - -/// /// @brief Decodes SDRAM density from SPD /// @param[out] o_value SDRAM density in GBs /// @return FAPI2_RC_SUCCESS if okay diff --git a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C index bc48d326b..76ec727c9 100644 --- a/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C +++ b/src/import/generic/memory/lib/spd/common/ddr4/spd_decoder_ddr4_v1_1.C @@ -123,99 +123,6 @@ fapi_try_exit: } /// -/// @brief Decodes hybrid media field from SPD -/// @param[in] iv_target -/// @param[out] o_value enum representing hybrid memory type -/// @return FAPI2_RC_SUCCESS if okay -/// @note Decodes SPD Byte 3 (bits 4~6) -/// @note Item JC-45-2220.01x -/// @note Page 17 -/// @note DDR4 SPD Document Release 3 -/// -fapi2::ReturnCode decoder_v1_1::hybrid_media( uint8_t& o_value ) const -{ - // ========================================================= - // Byte 3 maps - // Item JC-45-2220.01x - // Page 17 - // DDR4 SPD Document Release 3 - // Byte 3 (0x003): Key Byte / Module Type - // ========================================================= - static const std::vector<std::pair<uint8_t, uint8_t> > HYBRID_MEDIA_MAP = - { - //{key, value} - {0, fapi2::ENUM_ATTR_EFF_HYBRID_MEMORY_TYPE_NONE}, - {1, fapi2::ENUM_ATTR_EFF_HYBRID_MEMORY_TYPE_NVDIMM} - }; - - // Extracting desired bits - const uint8_t l_field_bits = extract_spd_field< HYBRID_MEDIA >(iv_target, iv_spd_data); - FAPI_DBG("Field Bits value: %d", l_field_bits); - - // Find map value - bool l_is_val_found = mss::find_value_from_key(HYBRID_MEDIA_MAP, l_field_bits, o_value); - - FAPI_TRY( mss::check::spd::fail_for_invalid_value(iv_target, - l_is_val_found, - HYBRID_MEDIA.iv_byte, - l_field_bits, - "Failed check on Hybrid Media type") ); - - FAPI_INF("%s. Hybrid Media: %d", - mss::c_str(iv_target), - o_value); - -fapi_try_exit: - return fapi2::current_err; -} - -/// -/// @brief Decodes hybrid field from SPD -/// @param[out] o_value enum representing if module is hybrid -/// @return fapi2::FAPI2_RC_SUCCESS if okay -/// @note Decodes SPD Byte 3 (bit 7) -/// @note Item JC-45-2220.01x -/// @note Page 17 -/// @note DDR4 SPD Document Release 3 -/// -fapi2::ReturnCode decoder_v1_1::hybrid( uint8_t& o_value ) const -{ - // ========================================================= - // Byte 3 maps - // Item JC-45-2220.01x - // Page 17 - // DDR4 SPD Document Release 3 - // Byte 3 (0x003): Key Byte / Module Type - // ========================================================= - static const std::vector<std::pair<uint8_t, uint8_t> > HYBRID_MAP = - { - //{key byte, value} - {0, fapi2::ENUM_ATTR_EFF_HYBRID_NOT_HYBRID}, - {1, fapi2::ENUM_ATTR_EFF_HYBRID_IS_HYBRID} - }; - - // Extracting desired bits - const uint8_t l_field_bits = extract_spd_field< HYBRID >(iv_target, iv_spd_data); - FAPI_INF("Field_Bits value: %d", l_field_bits); - - // Find map value - bool l_is_val_found = mss::find_value_from_key(HYBRID_MAP, l_field_bits, o_value); - - FAPI_TRY( mss::check::spd::fail_for_invalid_value(iv_target, - l_is_val_found, - HYBRID.iv_byte, - l_field_bits, - "Failed check on hybrid field") ); - - FAPI_INF("%s. Hybrid: %d", - mss::c_str(iv_target), - o_value); - -fapi_try_exit: - return fapi2::current_err; -} - -/// /// @brief Decodes Secondary SDRAM signal loading /// @param[out] o_value enum representing signal loading type /// @return FAPI2_RC_SUCCESS if okay |
