diff options
| author | duchen <duchen@us.ibm.com> | 2019-02-04 13:09:15 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-02-14 16:26:27 -0600 |
| commit | a57d9746ec970e5d74269718da7c7e7d012e00ed (patch) | |
| tree | d4ecf4550c3686c18626904c6801f03ecabfeb88 /src/usr/fapi2 | |
| parent | 3229ca9f881b69e6e8df5ff0fabfd30ec1cbb964 (diff) | |
| download | talos-hostboot-a57d9746ec970e5d74269718da7c7e7d012e00ed.tar.gz talos-hostboot-a57d9746ec970e5d74269718da7c7e7d012e00ed.zip | |
Update FAPI2 functions to handle new template parms for multicast support
Include changes 70177, 70867, 70946 and get them compiling
Due note that this will not compile as is because we still need
some changes on the ekb side. List of such changes include:
1) fapi2_hw_access.H: MulticastGroupMapping not defined
2) fapi2_target.H: plat_apply_target_limits() and mcUpdateHandle() not defined
3) multicast_defs.H: MulticastCoreSelect enum not defined
Change-Id: Ib828644d1535c65f4adcf9b3715cf0b1316f5700
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71310
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Tested-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2')
| -rw-r--r-- | src/usr/fapi2/attribute_service.C | 8 | ||||
| -rw-r--r-- | src/usr/fapi2/test/fapi2TestUtils.H | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/usr/fapi2/attribute_service.C b/src/usr/fapi2/attribute_service.C index 52bd4973a..6bf481ba0 100644 --- a/src/usr/fapi2/attribute_service.C +++ b/src/usr/fapi2/attribute_service.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -192,7 +192,8 @@ bool getTargetingAttrHelper(TARGETING::Target * l_pTargTarget, /// See doxygen in H file. /// ReturnCode getTargetingAttr( - const Target< TARGET_TYPE_ALL, plat_target_handle_t >& i_pFapiTarget, + const Target< TARGET_TYPE_ALL, MULTICAST_OR, + plat_target_handle_t >& i_pFapiTarget, const TARGETING::ATTRIBUTE_ID i_targAttrId, const uint32_t i_attrSize, void * o_pAttr) @@ -264,7 +265,8 @@ bool setTargetingAttrHelper(TARGETING::Target * l_pTargTarget, /// See doxygen in H file /// ReturnCode setTargetingAttr( - const Target<TARGET_TYPE_ALL, plat_target_handle_t >& i_pFapiTarget, + const Target<TARGET_TYPE_ALL, MULTICAST_OR, + plat_target_handle_t >& i_pFapiTarget, const TARGETING::ATTRIBUTE_ID i_targAttrId, const uint32_t i_attrSize, void * i_pAttr) diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H index cb88a1d6e..e49cc0f3a 100644 --- a/src/usr/fapi2/test/fapi2TestUtils.H +++ b/src/usr/fapi2/test/fapi2TestUtils.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2015,2018 */ +/* Contributors Listed Below - COPYRIGHT 2015,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -286,10 +286,11 @@ void generateTargets(TARGETING::Target* i_pMasterProcChip, * @retval NULL No parent found * @retval !NULL Parent found, equal to the retval */ -template< TargetType K, typename V = plat_target_handle_t > +template< TargetType K, MulticastType M = MULTICAST_OR, + typename V = plat_target_handle_t > inline V getPervasiveParent(V i_pTarget) { - Target<K,V> fapi2_target(i_pTarget); + Target<K, M, V> fapi2_target(i_pTarget); return static_cast<V>( fapi2_target.template getParent<TARGET_TYPE_PERV>()); } |
