diff options
| -rw-r--r-- | src/usr/diag/prdf/common/plat/cen/prdfCenMbaDomain.H | 11 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/cen/prdfCenMbaDomain_ipl.C | 79 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk | 13 | ||||
| -rw-r--r-- | src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.C | 34 | ||||
| -rwxr-xr-x | src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.H | 12 |
5 files changed, 5 insertions, 144 deletions
diff --git a/src/usr/diag/prdf/common/plat/cen/prdfCenMbaDomain.H b/src/usr/diag/prdf/common/plat/cen/prdfCenMbaDomain.H index 4d352c1d7..4611501b6 100644 --- a/src/usr/diag/prdf/common/plat/cen/prdfCenMbaDomain.H +++ b/src/usr/diag/prdf/common/plat/cen/prdfCenMbaDomain.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2018 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -62,15 +62,8 @@ class MbaDomain : public RuleChipDomain */ void handleRrFo(); - #elif defined(__HOSTBOOT_MODULE) // IPL only - - /** - * @brief Starts memory background scrubbing for each MBA in the node. - * @param Non-SUCCESS if an internal function failed, SUCCESS otherwise. - */ - int32_t startScrub(); - #endif + }; } // end namespace PRDF diff --git a/src/usr/diag/prdf/plat/cen/prdfCenMbaDomain_ipl.C b/src/usr/diag/prdf/plat/cen/prdfCenMbaDomain_ipl.C deleted file mode 100644 index 3570d79a6..000000000 --- a/src/usr/diag/prdf/plat/cen/prdfCenMbaDomain_ipl.C +++ /dev/null @@ -1,79 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/plat/cen/prdfCenMbaDomain_ipl.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2013,2018 */ -/* [+] 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 prdfCenMbaDomain.C - * @brief chip Plug-in code for mcbist domain - */ - -#include <prdfCenMbaDomain.H> - -// Framework includes -#include <prdfExtensibleChip.H> -#include <prdfPlatServices.H> -#include <prdfTrace.H> - -// Platform includes -#include <prdfMemBgScrub.H> - -using namespace TARGETING; - -namespace PRDF -{ - -using namespace PlatServices; - -int32_t MbaDomain::startScrub() -{ - #define PRDF_FUNC "[MbaDomain::startScrub] " - - int32_t o_rc = SUCCESS; - - do - { - // Iterate all MBAs in the domain. - for ( uint32_t i = 0; i < GetSize(); ++i ) - { - RuleChip * mbaChip = LookUp(i); - - // Start background scrub - int32_t l_rc = PRDF::startInitialBgScrub<TYPE_MBA>(mbaChip); - if ( SUCCESS != l_rc ) - { - PRDF_ERR( PRDF_FUNC "startInitialBgScrub() failed: MBA=0x%08x", - mbaChip->getHuid() ); - o_rc = FAIL; continue; // Keep going. - } - } - - } while (0); - - return o_rc; - - #undef PRDF_FUNC -} - -} // end namespace PRDF - diff --git a/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk b/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk index 8468f2ed4..541d0597d 100644 --- a/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk +++ b/src/usr/diag/prdf/plat/cen/prdf_plat_cen_hb_only.mk @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2016,2018 +# Contributors Listed Below - COPYRIGHT 2016,2019 # [+] International Business Machines Corp. # # @@ -41,17 +41,6 @@ prd_incpath += ${PRD_SRC_PATH}/plat/cen prd_rule_plugin += prdfCenMembuf.o ################################################################################ -# Hostboot only object files (IPL only) -################################################################################ - -ifneq (${HOSTBOOT_RUNTIME},1) - -# plat/cen/ (non-rule plugin related) -prd_obj += prdfCenMbaDomain_ipl.o - -endif - -################################################################################ # Hostboot only object files (runtime only) ################################################################################ diff --git a/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.C b/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.C index 88c72fdf3..39d227264 100644 --- a/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.C +++ b/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -44,38 +44,6 @@ namespace PRDF using namespace PlatServices; -#ifndef __HOSTBOOT_RUNTIME -int32_t McbistDomain::startScrub() -{ - #define PRDF_FUNC "[McbistDomain::startScrub] " - - PRDF_ENTER( PRDF_FUNC ); - - int32_t o_rc = SUCCESS; - - // Iterate all MCBISTs in the domain. - for ( uint32_t i = 0; i < GetSize(); ++i ) - { - RuleChip * mcbistChip = LookUp(i); - - // Start background scrub - int32_t l_rc = PRDF::startInitialBgScrub<TYPE_MCBIST>(mcbistChip); - if ( SUCCESS != l_rc ) - { - PRDF_ERR( PRDF_FUNC "startInitialBgScrub() failed: " - "MCBIST=0x%08x", mcbistChip->GetId() ); - o_rc = FAIL; continue; // Keep going. - } - } - - PRDF_EXIT( PRDF_FUNC "prdf: McbistDomain::startScrub exit" ); - - return o_rc; - - #undef PRDF_FUNC -} -#endif - #ifdef __HOSTBOOT_RUNTIME void McbistDomain::handleRrFo() { diff --git a/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.H b/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.H index 1e9b15d7e..43b9c5840 100755 --- a/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.H +++ b/src/usr/diag/prdf/plat/mem/prdfP9McbistDomain.H @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2016,2017 */ +/* Contributors Listed Below - COPYRIGHT 2016,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -64,16 +64,6 @@ class McbistDomain : public RuleChipDomain #endif - #ifndef __HOSTBOOT_RUNTIME - - /** - * @brief Starts memory background scrubbing for all memory. - * @param Non-SUCCESS if an internal function failed, SUCCESS otherwise. - */ - int32_t startScrub(); - - #endif - }; } // end namespace PRDF |
