From b98c3c1e765992f267702547dafcf3e20f1efa63 Mon Sep 17 00:00:00 2001 From: "Matt K. Light" Date: Tue, 16 Feb 2016 16:33:17 -0600 Subject: remove unused fapi2 multiscom function Change-Id: Idc69f7d5ad73e33b259b1938b82196d99392be15 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24393 Tested-by: Jenkins Server Reviewed-by: Thi N. Tran Reviewed-by: Richard J. Knight Reviewed-by: Jennifer A. Stofer Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/24669 --- import/hwpf/fapi2/include/fapi2_hw_access.H | 49 ---------------------------- import/hwpf/fapi2/include/plat/hw_access.H | 47 -------------------------- import/hwpf/fapi2/include/return_code_defs.H | 5 +-- 3 files changed, 1 insertion(+), 100 deletions(-) (limited to 'import') diff --git a/import/hwpf/fapi2/include/fapi2_hw_access.H b/import/hwpf/fapi2/include/fapi2_hw_access.H index 2296f415..06b73afc 100644 --- a/import/hwpf/fapi2/include/fapi2_hw_access.H +++ b/import/hwpf/fapi2/include/fapi2_hw_access.H @@ -44,10 +44,6 @@ #include #include -#ifdef FAPI_SUPPORT_MULTI_SCOM - #include -#endif - namespace fapi2 { //-------------------------------------------------------------------------- @@ -192,51 +188,6 @@ inline ReturnCode modifyRing(const Target& i_target, const RingMode i_ringMode = 0); #endif -#ifdef FAPI_SUPPORT_MULTI_SCOM -/// @brief Performs a multiple SCOM operation -/// This interface performs multiple SCOM operations on a chip in the -/// order specified by the input MultiScom object. -/// See fapiMultiScom.H for details of how to populate the MultiScom -/// object with SCOM operations. -/// -/// @tparam K template parameter, passed in target. -/// @param[in] i_target Target to operate on. -/// @param[in,out] io_multiScomObj Reference to a MultiScom object, -/// pre-populated with SingleScomInfo entries -/// to perform multiple SCOMs on input target -/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -/// -/// @note This is a synchronous interface and would return after all the -/// SCOM operations are completed or on the first failed operation -/// -/// @note SCOMs will be performed in the order they were added to the -/// input MultiScom object -/// -/// @note In case of errors, the platform code is responsible to collect -/// and add all the required error info and FFDC into the error data -/// for debugging -/// -/// @note If the SCOM operations added are specific to a processor chip, -/// then the FSI Shift Engine configured in scatter-gather DMA mode -/// extension would be used to execute the SCOM operations in a -/// performance optimize mode. In this mode, the special -/// SCOM_BULK_READ_MODE and SCOM_BULK_WRITE_MODE operations are -/// supported that allow a large bulk of SCOM access (in multiple of -/// 64 bits) for targets that support auto-increment. The -/// SCOM_WRITE_UNDER_MASK operation is not supported in this mode -/// -/// @note If the SCOM operations added are specific to a memory buffer -/// chip, then the regular SCOM engine is used to execute the SCOM -/// operations. SCOM_WRITE_UNDER_MASK operation is supported in -/// this mode, but the special SCOM_BULK_READ_MODE and -/// SCOM_BULK_WRITE_MODE operations are not supported due to -/// hardware limitations. -/// -template< TargetType K > -fapi2::ReturnCode multiScom (const Target& i_target, - MultiScom& io_multiScomObj); -#endif - // -------------------------------------------------------------------------- // NOTE: // Implement platform Spy access functions if platform supports them. diff --git a/import/hwpf/fapi2/include/plat/hw_access.H b/import/hwpf/fapi2/include/plat/hw_access.H index 2d883022..51a057d6 100644 --- a/import/hwpf/fapi2/include/plat/hw_access.H +++ b/import/hwpf/fapi2/include/plat/hw_access.H @@ -311,53 +311,6 @@ inline ReturnCode modifyRing(const Target& i_target, } #endif -#ifdef FAPI_SUPPORT_MULTI_SCOM -/// @brief Performs a multiple SCOM operation -/// This interface performs multiple SCOM operations on a chip in the -/// order specified by the input MultiScom object. -/// See fapiMultiScom.H for details of how to populate the MultiScom -/// object with SCOM operations. -/// -/// @tparam K template parameter, passed in target. -/// @param[in] i_target Target to operate on. -/// @param[in,out] io_multiScomObj Reference to a MultiScom object, -/// pre-populated with SingleScomInfo entries -/// to perform multiple SCOMs on input target -/// @return fapi2::ReturnCode. FAPI2_RC_SUCCESS if success, else error code. -/// -/// @note This is a synchronous interface and would return after all the -/// SCOM operations are completed or on the first failed operation -/// -/// @note SCOMs will be performed in the order they were added to the -/// input MultiScom object -/// -/// @note In case of errors, the platform code is responsible to collect -/// and add all the required error info and FFDC into the error data -/// for debugging -/// -/// @note If the SCOM operations added are specific to a processor chip, -/// then the FSI Shift Engine configured in scatter-gather DMA mode -/// extension would be used to execute the SCOM operations in a -/// performance optimize mode. In this mode, the special -/// SCOM_BULK_READ_MODE and SCOM_BULK_WRITE_MODE operations are -/// supported that allow a large bulk of SCOM access (in multiple of -/// 64 bits) for targets that support auto-increment. The -/// SCOM_WRITE_UNDER_MASK operation is not supported in this mode -/// -/// @note If the SCOM operations added are specific to a memory buffer -/// chip, then the regular SCOM engine is used to execute the SCOM -/// operations. SCOM_WRITE_UNDER_MASK operation is supported in -/// this mode, but the special SCOM_BULK_READ_MODE and -/// SCOM_BULK_WRITE_MODE operations are not supported due to -/// hardware limitations. -/// -template< TargetType K > -fapi2::ReturnCode multiScom (const Target& i_target, - MultiScom& io_multiScomObj) -{ -} -#endif - // -------------------------------------------------------------------------- // NOTE: // Implement platform Spy access functions if platform supports them. diff --git a/import/hwpf/fapi2/include/return_code_defs.H b/import/hwpf/fapi2/include/return_code_defs.H index b2209733..80dfdfba 100644 --- a/import/hwpf/fapi2/include/return_code_defs.H +++ b/import/hwpf/fapi2/include/return_code_defs.H @@ -7,7 +7,7 @@ /* */ /* EKB Project */ /* */ -/* COPYRIGHT 2012,2015 */ +/* COPYRIGHT 2012,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -75,9 +75,6 @@ enum ReturnCodes FAPI2_RC_INVALID_CHIP_EC_FEATURE_GET = FAPI2_RC_FAPI2_MASK | 0x02, ///< HWP requested a chip EC feature with an invalid attribute ID - FAPI2_RC_INVALID_MULTISCOM_LENGTH = FAPI2_RC_FAPI2_MASK | 0x03, - ///< Invalid multiscom parameters - FAPI2_RC_INVALID_PARAMETER = FAPI2_RC_FAPI2_MASK | 0x04, ///< Invalid parameters to a FAPI2 function -- cgit v1.2.1