diff options
6 files changed, 74 insertions, 33 deletions
diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C index 8a77bde42..547052405 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.C @@ -391,7 +391,7 @@ struct EffGroupingDmiAttrs uint8_t iv_unitPos = 0; // Dimm size behind this DMI - uint32_t iv_dimmSize = 0; + uint64_t iv_dimmSize = 0; // The membuf chip associated with this DMI // (for deconfiguring if cannot group) @@ -415,15 +415,9 @@ fapi2::ReturnCode EffGroupingDmiAttrs::getAttrs( iv_membuf = l_attachedMembuf.front(); // Get the amount of memory behind this DMI target - -//TODO: RTC 173371 -// Need Memory team's supports for function to be called on a DMI target. -#if 0 FAPI_TRY(mss::eff_memory_size(i_target, iv_dimmSize), "Error returned from eff_memory_size, l_rc 0x%.8X", (uint64_t)fapi2::current_err); -#endif - } // Get the DMI unit position @@ -431,14 +425,6 @@ fapi2::ReturnCode EffGroupingDmiAttrs::getAttrs( "Error getting DMI ATTR_CHIP_UNIT_POS, l_rc 0x%.8X", (uint64_t)fapi2::current_err); - -//TODO: RTC 173371 -// Force data for testing on AWAN - if ( (iv_unitPos >= 2) && (iv_unitPos <= 5) ) - { - iv_dimmSize = 64; - } - // Display this DMI's attribute info FAPI_INF("EffGroupingDmiAttrs::getAttrs: DMI %d, Centaur attached %d, " "iv_dimmSize %d GB ", diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk index ebea24153..1d46f867a 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_eff_grouping.mk @@ -23,8 +23,10 @@ # # IBM_PROLOG_END_TAG +# Include the macros and things for MSS procedures PROCEDURE=p9_mss_eff_grouping +lib$(PROCEDURE)_DEPLIBS+=cen OBJS+=p9_fbc_utils.o -$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)/chips/p9/procedures/hwp/memory/) $(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)) $(call BUILD_PROCEDURE) + diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C index 797570e3a..593737a69 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.C @@ -282,7 +282,7 @@ fapi2::ReturnCode getMcMemSize( // Get the amount of memory behind this MCA target FAPI_TRY(mss::eff_memory_size(l_mca, l_mcaSize), - "Error returned from eff_memory_size, l_rc 0x%.8X", + "Error returned from eff_memory_size - MCA, l_rc 0x%.8X", (uint64_t)fapi2::current_err); FAPI_INF("MCA %u: Total DIMM size %lu GB", l_mcaPos, l_mcaSize); @@ -315,21 +315,10 @@ fapi2::ReturnCode getMcMemSize( "Error getting ATTR_CHIP_UNIT_POS, l_rc 0x%.8X", (uint64_t)fapi2::current_err); -//TODO: RTC 173371 -// Need Memory team's supports for function to be called on a DMI target. -#if 0 // Get the amount of memory behind this DMI target FAPI_TRY(mss::eff_memory_size(l_dmi, l_dmiSize), - "Error returned from eff_memory_size, l_rc 0x%.8X", + "Error returned from eff_memory_size - DMI, l_rc 0x%.8X", (uint64_t)fapi2::current_err); -#endif - -//TODO: RTC 173371 -// Fake data to test code on an AWAN - if ( (l_dmiPos >= 2) && (l_dmiPos <= 5) ) - { - l_dmiSize = 64; - } FAPI_INF("DMI %u: Total DIMM size %lu GB", l_dmiPos, l_dmiSize); o_mcSize += l_dmiSize; diff --git a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk index b06a04075..f8299de1c 100644 --- a/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk +++ b/src/import/chips/p9/procedures/hwp/nest/p9_mss_setup_bars.mk @@ -24,8 +24,7 @@ # IBM_PROLOG_END_TAG # Include the macros and things for MSS procedures --include 00common.mk - PROCEDURE=p9_mss_setup_bars -$(eval $(call ADD_MEMORY_INCDIRS,$(PROCEDURE))) +lib$(PROCEDURE)_DEPLIBS+=cen +$(call ADD_MODULE_INCDIR,$(PROCEDURE),$(ROOTPATH)) $(call BUILD_PROCEDURE) diff --git a/src/usr/isteps/hb_temp_p9c_hwp_supports.C b/src/usr/isteps/hb_temp_p9c_hwp_supports.C new file mode 100644 index 000000000..c126a5d50 --- /dev/null +++ b/src/usr/isteps/hb_temp_p9c_hwp_supports.C @@ -0,0 +1,61 @@ +/* IBM_PROLOG_BEGIN_TAG */ +/* This is an automatically generated prolog. */ +/* */ +/* $Source: src/usr/isteps/hb_temp_p9c_hwp_supports.C $ */ +/* */ +/* OpenPOWER HostBoot Project */ +/* */ +/* Contributors Listed Below - COPYRIGHT 2017 */ +/* [+] International Business Machines Corp. */ +/* */ +/* */ +/* Licensed under the Apache License, Version 2.0 (the "License"); */ +/* you may not use this file except in compliance with the License. */ +/* You may obtain a copy of the License at */ +/* */ +/* http://www.apache.org/licenses/LICENSE-2.0 */ +/* */ +/* Unless required by applicable law or agreed to in writing, software */ +/* distributed under the License is distributed on an "AS IS" BASIS, */ +/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */ +/* implied. See the License for the specific language governing */ +/* permissions and limitations under the License. */ +/* */ +/* IBM_PROLOG_END_TAG */ +/** + * + * @file hb_temp_p9c_hwp_supports.C + * + * TODO: RTC 176018 + * + * Contains the dummy functions to temporarily allow successful HB compilation + * when HWPs call Cumulus related libraries. + * + * This file is to be removed once Hostboot imports Cumulus lib code from EKB. + * + */ + +/******************************************************************************/ +// Includes +/******************************************************************************/ +#include <stdint.h> +#include <fapi2.H> +#include <generic/memory/lib/utils/memory_size.H> + +namespace mss +{ + +/// +/// @brief Return the total memory size behind a DMI +/// @param[in] i_target the DMI target +/// @param[out] o_size the size of memory in GB behind the target +/// @return FAPI2_RC_SUCCESS if ok +/// +template<> +fapi2::ReturnCode eff_memory_size( const fapi2::Target<fapi2::TARGET_TYPE_DMI>& i_target, uint64_t& o_size ) +{ + o_size = 0; + return fapi2::FAPI2_RC_SUCCESS; +} + +}
\ No newline at end of file diff --git a/src/usr/isteps/makefile b/src/usr/isteps/makefile index 872d082f1..fa13d4230 100644 --- a/src/usr/isteps/makefile +++ b/src/usr/isteps/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2016 +# Contributors Listed Below - COPYRIGHT 2011,2017 # [+] International Business Machines Corp. # # @@ -49,6 +49,10 @@ OBJS += hwpistepud.o OBJS += istepHelperFuncs.o OBJS += pbusLinkSvc.o +#TODO: RTC 176018 +EXTRAINCDIR += ${ROOTPATH}/src/import/ +OBJS += hb_temp_p9c_hwp_supports.o + OBJS += $(if $(CONFIG_OPENPOWER_VOLTMSG),openpower_vddr.o,hbToHwsvVoltageMsg.o) EXTRAINCDIR += ${ROOTPATH}/src/usr/initservice/istepdispatcher |
