diff options
| author | Marty Gloff <mgloff@us.ibm.com> | 2018-01-04 13:10:25 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2018-01-16 12:23:56 -0500 |
| commit | 6c769aede36330e33939870110b274fb78461d10 (patch) | |
| tree | 8b959c803464cc76ef8206a6bae342e6be6af12e /src/include/usr/targeting | |
| parent | 5343e0808f17b7c3d93bf3b18e211c73970fa9ff (diff) | |
| download | talos-hostboot-6c769aede36330e33939870110b274fb78461d10.tar.gz talos-hostboot-6c769aede36330e33939870110b274fb78461d10.zip | |
Concurrent code update of HBRT - Enable Interface for Host
Includes changes to enable the host interface for HBRT concurrent update.
Also includes some changes for fixing prior review comments, for fixing
bugs found in end-to-end testing, and for removing temporary code used
when the LID was unavailable.
Change-Id: I221bbd299567c8b0dad058cae4620b94f7bff7c8
RTC: 181285
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51498
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: Brian E. Bakke <bbakke@us.ibm.com>
Reviewed-by: Matt Derksen <mderkse1@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/include/usr/targeting')
| -rw-r--r-- | src/include/usr/targeting/attrrp.H | 9 | ||||
| -rw-r--r-- | src/include/usr/targeting/common/target.H | 8 | ||||
| -rw-r--r-- | src/include/usr/targeting/common/targetservice.H | 4 | ||||
| -rw-r--r-- | src/include/usr/targeting/common/targreasoncodes.H | 5 |
4 files changed, 15 insertions, 11 deletions
diff --git a/src/include/usr/targeting/attrrp.H b/src/include/usr/targeting/attrrp.H index 1d5698d74..fefb94d4b 100644 --- a/src/include/usr/targeting/attrrp.H +++ b/src/include/usr/targeting/attrrp.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -74,7 +74,8 @@ class AttrRP #ifdef __HOSTBOOT_RUNTIME friend int RT_TARG::saveRestoreAttrs(void *, - void *); + void *, + uint64_t&); #endif public: @@ -237,7 +238,7 @@ class AttrRP /** * @brief Initialize the attribute resource provider * - * @par Detailed Description" + * @par Detailed Description: * Ensures member variables are initialized to sane values. */ AttrRP() @@ -255,7 +256,7 @@ class AttrRP /** * @brief Initialize temporary attribute resource provider * - * @par Detailed Description" + * @par Detailed Description: * Ensures member variables are initialized to sane values. */ AttrRP(TargetingHeader* i_header) diff --git a/src/include/usr/targeting/common/target.H b/src/include/usr/targeting/common/target.H index 6d7a0dafd..1c8ad3441 100644 --- a/src/include/usr/targeting/common/target.H +++ b/src/include/usr/targeting/common/target.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -59,7 +59,8 @@ namespace RT_TARG { void adjustTargeting4Runtime(); int saveRestoreAttrs(void *i_rsvdMemPtr, - void *io_lidStructPtr); + void *io_lidStructPtr, + uint64_t& o_userdata2); } #endif @@ -661,7 +662,8 @@ class Target #ifdef __HOSTBOOT_RUNTIME friend void RT_TARG::adjustTargeting4Runtime(); friend int RT_TARG::saveRestoreAttrs(void *, - void *); + void *, + uint64_t&); #endif diff --git a/src/include/usr/targeting/common/targetservice.H b/src/include/usr/targeting/common/targetservice.H index 39f1e0822..b63c25fb5 100644 --- a/src/include/usr/targeting/common/targetservice.H +++ b/src/include/usr/targeting/common/targetservice.H @@ -724,7 +724,7 @@ class TargetService * * @param[out] o_maxTargets maximum targets in the range * - * @param[in] i_nodeId, node ID for the target. Defaults to 0. + * @param[in] i_nodeId, node ID for the target. * * @pre TargetService must be initialized. * @@ -736,7 +736,7 @@ class TargetService TargetRangeFilter getTargetRangeFilter(void *i_attrData, AttrRP *i_attrRP, uint32_t &o_maxTargets, - NODE_ID i_nodeId = 0); + NODE_ID i_nodeId); /** * @brief Returns Target Attribute information. diff --git a/src/include/usr/targeting/common/targreasoncodes.H b/src/include/usr/targeting/common/targreasoncodes.H index 1c0fb4c8c..f7bcdbc6b 100644 --- a/src/include/usr/targeting/common/targreasoncodes.H +++ b/src/include/usr/targeting/common/targreasoncodes.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2017 */ +/* Contributors Listed Below - COPYRIGHT 2012,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,7 +50,7 @@ enum TargetingModuleId TARG_APPLY_ATTR_OVER = 0x0A, TARG_HANDLE_ENUM_CHECK_FAILURE = 0x0B, TARG_HANDLE_RANGE_CHECK_FAILURE = 0x0C, - TARG_RT_SAVE_RESTORE_ATTRS = 0x0D, + TARG_RT_HBRT_UPDATE_PREP = 0x0D, }; enum TargetingReasonCode @@ -78,6 +78,7 @@ enum TargetingReasonCode TARG_RC_MM_BLOCK_UNMAP_FAIL = TARG_COMP_ID | 0x15, TARG_RC_ATTRIBUTE_ENUM_CHECK_FAIL = TARG_COMP_ID | 0x16, TARG_RC_ATTRIBUTE_RANGE_CHECK_FAIL = TARG_COMP_ID | 0x17, + TARG_RC_CONCURRENT_CODE_UPDATE_FAIL = TARG_COMP_ID | 0x18, }; }; // End TARGETING namespace |
