From 357441ef8b732b8f2b0a697d2ae7c368b3646649 Mon Sep 17 00:00:00 2001 From: Louis Stermole Date: Thu, 11 Apr 2019 17:06:23 -0400 Subject: Add p9a_mss_freq_system procedure Change-Id: I84317d4886e90aece64ada26d3d7d53ba0868f1e Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76023 Tested-by: Jenkins Server Tested-by: FSP CI Jenkins Tested-by: PPE CI Reviewed-by: STEPHEN GLANCY Tested-by: HWSV CI Tested-by: Hostboot CI Reviewed-by: ANDRE A. MARIN Dev-Ready: Christian R. Geddes Reviewed-by: Jennifer A. Stofer Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/76104 Reviewed-by: Christian R. Geddes --- .../hwp/memory/lib/freq/axone_mss_freq.C | 4 +- .../procedures/hwp/memory/lib/freq/axone_sync.C | 42 ++++++++-------- .../procedures/hwp/memory/lib/freq/axone_sync.H | 48 ++++++------------ .../p9a/procedures/hwp/memory/p9a_mss_eff_config.C | 2 +- .../procedures/hwp/memory/p9a_mss_freq_system.C | 58 +++++++++++++++++++--- .../procedures/hwp/memory/p9a_mss_freq_system.H | 8 +-- .../procedures/hwp/memory/p9a_mss_freq_system.mk | 4 +- 7 files changed, 98 insertions(+), 68 deletions(-) (limited to 'src/import/chips/p9a/procedures') diff --git a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_mss_freq.C b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_mss_freq.C index 08317cb8a..a75af9024 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_mss_freq.C +++ b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_mss_freq.C @@ -292,10 +292,12 @@ fapi2::ReturnCode check_freq_support_vpd( const fapi2::Ta fapi2::VPDInfo l_vpd_info(TT::VPD_BLOB); const auto& l_vpd_target = mss::find_target(i_target); + uint32_t l_omi_freq = 0; l_vpd_info.iv_is_config_ffdc_enabled = false; - FAPI_TRY(convert_ddr_freq_to_omi_freq(i_target, i_proposed_freq, l_vpd_info.iv_omi_freq_mhz)); + FAPI_TRY(convert_ddr_freq_to_omi_freq(i_target, i_proposed_freq, l_omi_freq)); + l_vpd_info.iv_omi_freq_mhz = l_omi_freq; FAPI_INF("Setting VPD info OMI frequency: %d Gbps, for DDR frequency %d MT/s", l_vpd_info.iv_omi_freq_mhz, i_proposed_freq); diff --git a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C index 8fd3c679b..97f95c7b8 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C +++ b/src/import/chips/p9a/procedures/hwp/memory/lib/freq/axone_sync.C @@ -156,7 +156,7 @@ fapi_try_exit: /// bool deconfigure(const fapi2::Target& i_target, const uint64_t i_dimm_speed, - const uint32_t i_max_freq) + const uint64_t i_max_freq) { bool l_is_hw_deconfigured = (i_dimm_speed != i_max_freq); @@ -174,44 +174,44 @@ bool deconfigure(const fapi2::Target& i_target, } /// -/// @brief Selects synchronous mode and performs requirements enforced by selected port frequency +/// @brief Selects OMI frequency based on selected port frequencies /// @param[in] i_freq_map dimm speed mapping /// @param[in] i_equal_dimm_speed tracks whether map has equal dimm speeds /// @param[in] i_omi_freq OMI frequency -/// @param[out] o_selected_sync_mode final synchronous mode -/// @param[out] o_selected_omi_freq final freq selected, only valid if final sync mode is in-sync +/// @param[out] o_selected_omi_freq final freq selected /// @return FAPI2_RC_SUCCESS iff successful /// -fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target, uint64_t >& i_freq_map, - const speed_equality i_equal_dimm_speed, - const uint32_t i_omi_freq, - uint8_t& o_selected_sync_mode, - uint64_t& o_selected_omi_freq) +fapi2::ReturnCode select_omi_freq(const std::map< fapi2::Target, uint64_t >& i_freq_map, + const speed_equality i_equal_dimm_speed, + const uint32_t i_omi_freq, + uint32_t& o_selected_omi_freq) { - FAPI_INF("---- In select_sync_mode ----"); + FAPI_INF("---- In select_omi_freq ----"); switch(i_equal_dimm_speed) { - // If we have a port which has resolved to equal speeds ... + // If we resolved to equal speeds ... case speed_equality::EQUAL_DIMM_SPEEDS: { // Return back the resulting speed. It doesn't matter which we select from the map as they're all equal // If we end up not in sync in the conditional below, thats ok - this parameter is ignored by the // caller if we're not in sync mode const auto l_ddr_freq = i_freq_map.begin()->second; - FAPI_TRY(convert_ddr_freq_to_omi_freq(i_freq_map.begin()->first, l_ddr_freq, o_selected_omi_freq)); + FAPI_TRY(convert_ddr_freq_to_omi_freq(i_freq_map.begin()->first, + l_ddr_freq, + o_selected_omi_freq)); // When we selected ATTR_MSS_FREQ, we made sure that we didn't // select a DIMM freq the OMI couldn't support. - o_selected_sync_mode = fapi2::ENUM_ATTR_MC_SYNC_MODE_IN_SYNC; + +#ifndef __HOSTBOOT_MODULE // On Cronus if the o_selected_omi_freq != i_omi_freq we've got a mismatch. Note that p9a_mss_freq ensures // we don't select an invalid freq, but doesn't ensure we select the current OMI freq. -#ifndef __HOSTBOOT_MODULE FAPI_ASSERT(o_selected_omi_freq == i_omi_freq, fapi2::P9A_MSS_FAILED_SYNC_MODE() .set_OMI_FREQ(i_omi_freq) .set_MEM_FREQ(o_selected_omi_freq), - "The DIMM freq (%d) and the OMI freq (%d) don't align", + "The OMI freq selected by DIMM speed (%d) and the currently selected OMI freq (%d) don't align", o_selected_omi_freq, i_omi_freq); #endif return fapi2::FAPI2_RC_SUCCESS; @@ -223,13 +223,14 @@ fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target l_fastest_port_target = i_freq_map.begin()->first; std::for_each(i_freq_map.begin(), i_freq_map.end(), - [&l_max_dimm_speed, &l_fastest_port_target](const std::pair, uint64_t>& m) + [&l_max_dimm_speed, &l_fastest_port_target] + (const std::pair, uint64_t>& m) { l_max_dimm_speed = std::max(l_max_dimm_speed, m.second); l_fastest_port_target = m.first; @@ -241,15 +242,16 @@ fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target #include #include +#include #include #include #include @@ -99,18 +100,19 @@ fapi_try_exit: /// inline fapi2::ReturnCode convert_ddr_freq_to_omi_freq(const fapi2::Target& i_target, const uint64_t i_ddr_freq, - uint64_t& o_omi_freq) + uint32_t& o_omi_freq) { using TT = mss::frequency_traits; constexpr uint64_t ROUND_UNITS = 10; + uint64_t l_omi_freq = 0; // Get the OMI to DDR freq ratio uint8_t l_ratio[TT::MAX_DIMM_PER_PORT] = {0}; FAPI_TRY(mss::attr::get_host_to_ddr_speed_ratio(i_target, l_ratio)); // Multiply by the ratio and round to the nearest 10GBPS - FAPI_TRY(mss::divide_and_round((i_ddr_freq * l_ratio[0]), ROUND_UNITS, o_omi_freq)); - o_omi_freq *= ROUND_UNITS; + FAPI_TRY(mss::divide_and_round((i_ddr_freq * l_ratio[0]), ROUND_UNITS, l_omi_freq)); + o_omi_freq = ROUND_UNITS * l_omi_freq; FAPI_DBG("For ratio %d and DDR freq %d, corresponding OMI freq is %d", l_ratio[0], i_ddr_freq, o_omi_freq); fapi_try_exit: @@ -125,7 +127,7 @@ fapi_try_exit: /// @return FAPI2_RC_SUCCESS iff successful /// inline fapi2::ReturnCode convert_omi_freq_to_ddr_freq(const fapi2::Target& i_target, - const uint64_t i_omi_freq, + const uint32_t i_omi_freq, uint64_t& o_ddr_freq) { using TT = mss::frequency_traits; @@ -134,7 +136,7 @@ inline fapi2::ReturnCode convert_omi_freq_to_ddr_freq(const fapi2::Target(l_ratio[0]), o_ddr_freq), + FAPI_TRY(mss::divide_and_round(static_cast(i_omi_freq), static_cast(l_ratio[0]), o_ddr_freq), "%s freq system saw a zero Host (OMI) to DDR frequency ratio", mss::c_str(i_target)); FAPI_DBG( "For ratio %d and OMI freq %d, corresponding DDR freq is %d", l_ratio[0], i_omi_freq, o_ddr_freq); @@ -142,26 +144,6 @@ fapi_try_exit: return fapi2::current_err; } -/// -/// @brief Checks to see if a passed in value could be a valid OMI frequency -/// @param[in] i_target the port target -/// @param[in] i_proposed_freq a frequency value that is to be checked -/// @param[out] o_valid boolean whether the value is a valid OMI frequency -/// @return FAPI2_RC_SUCCESS iff successful -/// -inline fapi2::ReturnCode is_omi_freq_valid (const fapi2::Target& i_target, - const uint64_t i_proposed_freq, - uint64_t& o_valid) -{ - uint64_t l_proposed_omi_freq = 0; - FAPI_TRY(convert_ddr_freq_to_omi_freq(i_target, i_proposed_freq, l_proposed_omi_freq)); - - o_valid = std::binary_search(AXONE_OMI_FREQS.begin(), AXONE_OMI_FREQS.end(), l_proposed_omi_freq); - -fapi_try_exit: - return fapi2::current_err; -} - /// /// @brief Retrieves a mapping of MSS frequency values per port target /// @param[in] i_targets vector of port targets @@ -182,22 +164,20 @@ fapi2::ReturnCode dimm_speed_map(const std::vector< fapi2::Target& i_target, const uint64_t i_dimm_speed, - const uint32_t i_omi_freq); + const uint64_t i_omi_freq); /// -/// @brief Selects synchronous mode and performs requirements enforced by selected port frequency +/// @brief Selects OMI frequency based on selected port frequencies /// @param[in] i_freq_map dimm speed mapping /// @param[in] i_equal_dimm_speed tracks whether map has equal dimm speeds /// @param[in] i_omi_freq OMI frequency -/// @param[out] o_selected_sync_mode final synchronous mode -/// @param[out] o_selected_omi_freq final freq selected, only valid if final sync mode is in-sync +/// @param[out] o_selected_omi_freq final freq selected /// @return FAPI2_RC_SUCCESS iff successful /// -fapi2::ReturnCode select_sync_mode(const std::map< fapi2::Target, uint64_t >& i_freq_map, - const speed_equality i_equal_dimm_speed, - const uint32_t i_omi_freq, - uint8_t& o_selected_sync_mode, - uint64_t& o_selected_omi_freq); +fapi2::ReturnCode select_omi_freq(const std::map< fapi2::Target, uint64_t >& i_freq_map, + const speed_equality i_equal_dimm_speed, + const uint32_t i_omi_freq, + uint32_t& o_selected_omi_freq); }// mss diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C index 49c7c4e56..3bbf0ea9f 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_eff_config.C @@ -64,7 +64,7 @@ fapi2::ReturnCode p9a_mss_eff_config( const fapi2::Target(dimm), l_freq) ); FAPI_TRY( mss::convert_ddr_freq_to_omi_freq(mss::find_target(dimm), l_freq, l_omi_freq)); diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.C b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.C index cc23976d8..adddd1ca2 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.C +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -35,13 +35,59 @@ // fapi2 #include +#include +#include +#include +extern "C" +{ /// /// @brief Matches OMI freq with DDR freq -/// @param[in] i_target controller (e.g. MC) +/// @param[in] i_target PROC_CHIP target /// @return FAPI2_RC_SUCCESS iff ok /// -fapi2::ReturnCode p9a_mss_freq_system( const fapi2::Target& i_target ) -{ - return fapi2::FAPI2_RC_SUCCESS; -} + fapi2::ReturnCode p9a_mss_freq_system( const fapi2::Target& i_target ) + { + const auto& l_ports = mss::find_targets(i_target); + + // If there are no DIMM we don't need to bother. In fact, we can't as we didn't setup + // attributes for the PHY, etc. If there is even one DIMM on this proc, + // we do the right thing. + if (mss::count_dimm(l_ports) == 0) + { + FAPI_INF("... skipping freq_system - no DIMM ..."); + return fapi2::FAPI2_RC_SUCCESS; + } + + std::map< fapi2::Target, uint64_t > l_freq_map; + uint32_t l_omi_freq = 0; + uint32_t l_selected_omi_freq = 0; + mss::speed_equality l_equal_dimm_speed; + + // Get OMI freq + FAPI_TRY( FAPI_ATTR_GET(fapi2::ATTR_FREQ_OMI_MHZ, i_target, l_omi_freq) ); + + FAPI_INF("Retrieved omi freq %d", l_omi_freq); + + // Populate dimm speed map + FAPI_TRY( mss::dimm_speed_map(l_ports, l_freq_map, l_equal_dimm_speed), + "Failed to get dimm speed mapping" ); + + FAPI_INF("Dimm speed for all OCMBs are the same : %s", + uint8_t(l_equal_dimm_speed) ? "true" : "false"); + + // Select OMI freq, or check in the case of Cronus + FAPI_TRY( mss::select_omi_freq(l_freq_map, + l_equal_dimm_speed, + l_omi_freq, + l_selected_omi_freq) ); + + // Set attributes. + FAPI_INF("%s: Setting recommended OMI frequency in ATTR_FREQ_OMI_MHZ to %d", mss::c_str(i_target), l_selected_omi_freq); + FAPI_TRY( FAPI_ATTR_SET(fapi2::ATTR_FREQ_OMI_MHZ, i_target, l_selected_omi_freq) ); + + fapi_try_exit: + return fapi2::current_err; + } + +} //extern "C" diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.H b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.H index cbf2d718c..31389feff 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.H +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -39,17 +39,17 @@ #include #include -typedef fapi2::ReturnCode (*p9a_mss_freq_system_FP_t) (const fapi2::Target&); +typedef fapi2::ReturnCode (*p9a_mss_freq_system_FP_t) (const fapi2::Target&); extern "C" { /// /// @brief Matches OMI freq with DDR freq - /// @param[in] i_target controller (e.g. MC) + /// @param[in] i_target PROC_CHIP target /// @return FAPI2_RC_SUCCESS iff ok /// - fapi2::ReturnCode p9a_mss_freq_system(const fapi2::Target& i_target); + fapi2::ReturnCode p9a_mss_freq_system(const fapi2::Target& i_target); } #endif diff --git a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.mk b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.mk index 2e399418e..baacd38d6 100644 --- a/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.mk +++ b/src/import/chips/p9a/procedures/hwp/memory/p9a_mss_freq_system.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2018 +# Contributors Listed Below - COPYRIGHT 2018,2019 # [+] International Business Machines Corp. # # @@ -27,5 +27,5 @@ -include 00p9a_common.mk PROCEDURE=p9a_mss_freq_system -$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) +$(eval $(call ADD_P9A_MEMORY_INCDIRS,$(PROCEDURE))) $(call BUILD_PROCEDURE) -- cgit v1.2.1