From 431a3cc0aa10884e9f9f27a12c6d1c97206bc83a Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Thu, 22 Feb 2018 09:59:11 -0600 Subject: Bug fixes for concurrent update of HBRT Fixed a bug where the wrong copy of the attribute was being used after our code update preparation was run. Fixed a bug due to not having enough memory allocated to update the attribute values during the transition. Added space to initial reserved memory to allow for new attributes to be added at runtime. Change-Id: I97c4d20ff1c369398be470fef718bbd001f71c1b CQ: SW417526 ForwardPort: yes Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/54685 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Daniel M. Crowell --- src/include/usr/runtime/rt_targeting.H | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'src/include/usr/runtime') diff --git a/src/include/usr/runtime/rt_targeting.H b/src/include/usr/runtime/rt_targeting.H index 3f1ccb480..9f3d96818 100644 --- a/src/include/usr/runtime/rt_targeting.H +++ b/src/include/usr/runtime/rt_targeting.H @@ -68,11 +68,11 @@ namespace RT_TARG * @param[in] Pointer to current Reserved Memory targeting binary data * @param[in/out] Pointer to new LID Structure targeting binary data * @param[out] Error log userdata2 value associated with non-zero rtn code - * @return 0 on success, else return code + * @return nullptr on success, else error log */ - int saveRestoreAttrs(void *i_rsvdMemPtr, - void *io_lidStructPtr, - uint64_t& o_userdata2); + errlHndl_t saveRestoreAttrs(void *i_rsvdMemPtr, + void *io_lidStructPtr, + uint64_t& o_userdata2); /** * @brief Validate LID Structure against Reserved Memory. Check that the @@ -81,12 +81,14 @@ namespace RT_TARG * match. * @param[in] Pointer to new LID Structure targeting binary data * @param[in] Pointer to current Reserved Memory targeting binary data + * @param[out] Total size of all sections in the new lid * @param[out] Error log userdata2 value associated with non-zero rtn code - * @return 0 on success, else return code + * @return nullptr on success, else error log */ - int validateData(void *i_lidStructPtr, - void *i_rsvdMemPtr, - uint64_t& o_userdata2); + errlHndl_t validateData(void *i_lidStructPtr, + void *i_rsvdMemPtr, + size_t& o_lidTotalSize, + uint64_t& o_userdata2); /** * @brief Apply ATTR_TMP overrides to be available for run time -- cgit v1.2.3