diff options
Diffstat (limited to 'src/import/generic/memory/lib/utils/power_thermal')
| -rw-r--r-- | src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H | 18 | ||||
| -rw-r--r-- | src/import/generic/memory/lib/utils/power_thermal/gen_throttle.H | 10 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H b/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H index e72173146..f2d6370be 100644 --- a/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H +++ b/src/import/generic/memory/lib/utils/power_thermal/gen_decoder.H @@ -272,7 +272,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_SIZE == l_uint32_buf) { - l_mask.setBit(TT::DIMM_SIZE_START, TT::DIMM_SIZE_LEN); + l_mask.setBit<TT::DIMM_SIZE_START, TT::DIMM_SIZE_LEN>(); } //DRAM_GEN wildcard @@ -283,7 +283,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_GEN == l_uint8_buf) { - l_mask.setBit(TT::DRAM_GEN_START, TT::DRAM_GEN_LEN); + l_mask.setBit<TT::DRAM_GEN_START, TT::DRAM_GEN_LEN>(); } //DIMM_TYPE wildcard @@ -294,7 +294,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_TYPE == l_uint8_buf) { - l_mask.setBit(TT::DIMM_TYPE_START, TT::DIMM_TYPE_LEN); + l_mask.setBit<TT::DIMM_TYPE_START, TT::DIMM_TYPE_LEN>(); } //DRAM_WIDTH wildcard @@ -305,7 +305,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_WIDTH == l_uint8_buf) { - l_mask.setBit(TT::DRAM_WIDTH_START, TT::DRAM_WIDTH_LEN); + l_mask.setBit<TT::DRAM_WIDTH_START, TT::DRAM_WIDTH_LEN>(); } //DRAM_DENSITY wildcard @@ -316,7 +316,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_DENSITY == l_uint8_buf) { - l_mask.setBit(TT::DRAM_DENSITY_START, TT::DRAM_DENSITY_LEN); + l_mask.setBit<TT::DRAM_DENSITY_START, TT::DRAM_DENSITY_LEN>(); } //DRAM_STACK_TYPE wildcard @@ -327,7 +327,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_STACK_TYPE == l_uint8_buf) { - l_mask.setBit(TT::DRAM_STACK_TYPE_START, TT::DRAM_STACK_TYPE_LEN); + l_mask.setBit<TT::DRAM_STACK_TYPE_START, TT::DRAM_STACK_TYPE_LEN>(); } //DRAM_MFGID wildcard @@ -338,7 +338,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_MFGID == l_uint16_buf) { - l_mask.setBit(TT::DRAM_MFGID_START, TT::DRAM_MFGID_LEN); + l_mask.setBit<TT::DRAM_MFGID_START, TT::DRAM_MFGID_LEN>(); } @@ -352,7 +352,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_PORT == l_uint8_buf) { - l_mask.setBit(TT::DIMMS_PER_PORT_START, TT::DIMMS_PER_PORT_LEN); + l_mask.setBit<TT::DIMMS_PER_PORT_START, TT::DIMMS_PER_PORT_LEN>(); } } @@ -366,7 +366,7 @@ fapi2::ReturnCode generate_wildcard_mask(const uint32_t i_hash, uint32_t& o_mask if(ANY_HEIGHT == l_uint8_buf) { - l_mask.setBit(TT::DIMM_MODULE_HEIGHT_START, TT::DIMM_MODULE_HEIGHT_LEN); + l_mask.setBit<TT::DIMM_MODULE_HEIGHT_START, TT::DIMM_MODULE_HEIGHT_LEN>(); } } diff --git a/src/import/generic/memory/lib/utils/power_thermal/gen_throttle.H b/src/import/generic/memory/lib/utils/power_thermal/gen_throttle.H index 893a7e37b..378643e4e 100644 --- a/src/import/generic/memory/lib/utils/power_thermal/gen_throttle.H +++ b/src/import/generic/memory/lib/utils/power_thermal/gen_throttle.H @@ -41,6 +41,7 @@ #include <generic/memory/lib/utils/power_thermal/gen_throttle_traits.H> #include <generic/memory/lib/utils/count_dimm.H> #include <generic/memory/lib/mss_generic_system_attribute_getters.H> +#include <generic/memory/lib/mss_generic_system_attribute_setters.H> #include <generic/memory/lib/mss_generic_attribute_setters.H> #include <generic/memory/lib/utils/mss_math.H> #include <generic/memory/lib/utils/pos.H> @@ -1110,6 +1111,7 @@ fapi2::ReturnCode equalize_throttles (const std::vector< fapi2::Target<T> >& i_t if (mss::count_dimm(l_port) == 0) { + FAPI_INF("Seeing no DIMMs on %s -- skipping", mss::c_str(l_port)); continue; } @@ -1140,6 +1142,7 @@ fapi2::ReturnCode equalize_throttles (const std::vector< fapi2::Target<T> >& i_t if (mss::count_dimm(l_port) == 0) { + FAPI_INF("Seeing no DIMMs on %s -- skipping", mss::c_str(l_port)); continue; } @@ -1149,7 +1152,7 @@ fapi2::ReturnCode equalize_throttles (const std::vector< fapi2::Target<T> >& i_t l_fin_slot = l_min_slot; l_fin_port = l_min_port; - //Need to create throttle object for each mca in order to get dimm configuration and power curves + //Need to create throttle object for each port in order to get dimm configuration and power curves //To calculate the slot/port utilization and total port power consumption fapi2::ReturnCode l_rc = fapi2::FAPI2_RC_SUCCESS; @@ -1179,10 +1182,9 @@ fapi2::ReturnCode equalize_throttles (const std::vector< fapi2::Target<T> >& i_t { //Need this because of pos traits and templating stuff uint64_t l_fail = mss::fapi_pos(l_port); + //Set the failing port. OCC just needs one failing port, doesn't need all of them - FAPI_TRY( FAPI_ATTR_SET( fapi2::ATTR_MSS_MEM_PORT_POS_OF_FAIL_THROTTLE, - fapi2::Target<fapi2::TARGET_TYPE_SYSTEM>(), - l_fail) ); + FAPI_TRY( attr::set_port_pos_of_fail_throttle(l_fail) ); FAPI_ASSERT_NOEXIT( false, fapi2::MSS_CALC_PORT_POWER_EXCEEDS_MAX() |
