From 7f716fe1404d8eea1e2d6fe16ad9f3e2f7337feb Mon Sep 17 00:00:00 2001 From: Zane Shelley Date: Thu, 1 Nov 2018 11:51:15 -0500 Subject: PRD: Remove remaining P8 code Change-Id: Icb74c251a718091071c909b1832b58615345dc5d Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68279 Tested-by: Jenkins Server Reviewed-by: Caleb N. Palmer Reviewed-by: Brian J. Stegmiller Reviewed-by: Zane C. Shelley Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/68511 Tested-by: Jenkins OP Build CI Tested-by: FSP CI Jenkins Tested-by: Jenkins OP HW --- src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C | 94 ------------ src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C | 169 --------------------- src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C | 138 ----------------- .../diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk | 77 ---------- 4 files changed, 478 deletions(-) delete mode 100755 src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C delete mode 100644 src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C delete mode 100644 src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C delete mode 100644 src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk (limited to 'src/usr/diag/prdf/plat') diff --git a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C b/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C deleted file mode 100755 index 337332c8c..000000000 --- a/src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C +++ /dev/null @@ -1,94 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/plat/pegasus/prdfP8TodPlugins.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2013,2015 */ -/* [+] 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 prdfP8TodPlugins.C - * @brief defines all the dummy TOD error plugins for hostboot platform - */ -#include -#include -#include -#include -#include -#include -#include - -using namespace TARGETING; - -namespace PRDF -{ - -namespace Proc -{ - -/** Defines TOD parity error plugins for hostboot */ -#define PLUGIN_TOD_UNEXPECTED_ATTN( FUNC ) \ -int32_t FUNC( ExtensibleChip * i_procChip, STEP_CODE_DATA_STRUCT & i_sc ) \ -{ \ - PRDF_ERR( "["#FUNC "] Unexpected attention due to TOD errors on" \ - "Hostboot: HUID=0x%08x", i_procChip->GetId() ); \ - CalloutUtil::defaultError( i_sc ); \ - return SUCCESS; \ -} \ -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, FUNC ); \ -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, FUNC ); - -PLUGIN_TOD_UNEXPECTED_ATTN( clearServiceCallFlag ) -PLUGIN_TOD_UNEXPECTED_ATTN( todNewTopologyIfBackupMDMT ) -PLUGIN_TOD_UNEXPECTED_ATTN( todStepCheckFault ) -PLUGIN_TOD_UNEXPECTED_ATTN( requestTopologySwitch ) - -#undef PLUGIN_TOD_UNEXPECTED_ATTN - -/** - * @brief Checks if TOD errors are disabled on the platform. - * @param i_chip chip reporting TOD logic parity error. - * @param i_stepcode The step code data struct. - * @return SUCCESS - * @note TOD errors are not expected during hostboot and its - * analysis is disabled during HBRT. So, just returning SUCCESS. - * This prevents execution of alternate resolution associated with - * try resolution. - */ -int32_t isTodDisabled( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_stepcode ) -{ - //FIXME RTC Issue 120820: Investigate behavior for manufacturing - //environment. - //On OPAL machine, mask TOD errors on first instance. There - //should not be any service action. - - if( !PlatUtil::ignoreErrorForSapphire( i_stepcode ) ) - { - CalloutUtil::defaultError( i_stepcode ); - } - - return SUCCESS; -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, isTodDisabled ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, isTodDisabled ); - -} //namespace Proc ends - -} //namespace PRDF ends diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C deleted file mode 100644 index f0fb5f23e..000000000 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C +++ /dev/null @@ -1,169 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/plat/pegasus/prdfPlatP8Ex.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2013,2015 */ -/* [+] 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 prdfP8Ex.C - * @brief Contains all the plugin code for the PRD P8 EX chiplet - */ - -#include -#include -#include -#include -#include -#include - -using namespace TARGETING; - -namespace PRDF -{ -namespace Ex -{ -/** - * @brief Set the cause attention type to UNIT_CS for further analysis. - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return SUCCESS - */ -int32_t SetCoreCheckstopCause( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - PRDF_ERR( "[SetCoreCheckstopCause] Unexpected attention in Hostboot: " - "HUID=0x%08x", i_chip->GetId() ); - CalloutUtil::defaultError( i_sc ); - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, SetCoreCheckstopCause); - -/** - * @brief No-op in hostboot - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t CheckCoreCheckstop( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; - -} PRDF_PLUGIN_DEFINE(Ex, CheckCoreCheckstop); - -/** - * @brief No-op in hostboot - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t MaskIfCoreCheckstop( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, MaskIfCoreCheckstop); - -/** - * @brief Restart Trace Arrays that have been stopped on error - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t RestartTraceArray( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, RestartTraceArray); - -/** - * @brief Handle an L3 UE - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t L3UE( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; - -} PRDF_PLUGIN_DEFINE(Ex, L3UE); - -/** - * @brief Handle an L3 CE - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t L3CE( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - // We can get these errors during hostboot, but will wait for runtime - // to attempt repairs - - PlatUtil::ignoreErrorForSapphire( i_sc ); - - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, L3CE); - -/** - * @brief Handle an L2 UE - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t L2UE( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, L2UE); - -/** - * @brief Handle an L2 CE - * @param i_chip Ex chip. - * @param i_sc Step Code data struct - * @return PRD return code - */ -int32_t L2CE( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - // We can get these errors during hostboot, but will wait for runtime - // to attempt repairs - - PlatUtil::ignoreErrorForSapphire( i_sc ); - - return SUCCESS; -} PRDF_PLUGIN_DEFINE(Ex, L2CE); - -/** - * @brief check if both core CS and RE are on at the same time - * and core recoverable is set in COREFIRWOF - * @param i_chip Ex chip. - * @param i_stepcode Step Code data struct - * @return SUCCESS in Hostboot since we don't want to analyze core CS - */ -int32_t CoreRePresent( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_stepcode ) -{ - return SUCCESS; - -} PRDF_PLUGIN_DEFINE(Ex, CoreRePresent); - -} // end namespace Ex -} // end namespace PRDF diff --git a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C b/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C deleted file mode 100644 index 9ab033b8a..000000000 --- a/src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C +++ /dev/null @@ -1,138 +0,0 @@ -/* IBM_PROLOG_BEGIN_TAG */ -/* This is an automatically generated prolog. */ -/* */ -/* $Source: src/usr/diag/prdf/plat/pegasus/prdfPlatP8Proc.C $ */ -/* */ -/* OpenPOWER HostBoot Project */ -/* */ -/* Contributors Listed Below - COPYRIGHT 2013,2015 */ -/* [+] 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 prdfPlatP8Proc.C - * @brief Contains the hostboot specific plugin code for P8 Proc - */ - - -#include -#include -#include -#include -#include - -using namespace TARGETING; - -namespace PRDF -{ - -namespace Proc -{ - -// TODO: RTC 116213 proc_mpipl_check_eligibility() is completely broken so -// reverting this bug fix to the original 810 and 820 behavior (per -// request from Kevin) until proc_mpipl_check_eligibility() is fixed -// in FW830. -/** - * @brief Call HWP and set the right dump type - * @param i_chip P8 chip - * @param i_sc The step code data struct - * @returns Failure or Success - * @note - */ -int32_t analyzeMpIPL( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - PRDF_ERR( "analyzeMpIPL functionality not supported during hostboot: " - "PROC = 0x%08x", i_chip->GetId() ); - - return SUCCESS; -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, analyzeMpIPL ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, analyzeMpIPL ); - -/** - * @brief Handle SLW Malfunction alert - * @param i_chip P8 chip - * @param i_sc The step code data struct - * @returns Failure or Success - * @note - */ -int32_t slwRecovery( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - PRDF_ERR( "slwRecovery functionality not supported during hostboot: " - "PROC = 0x%08x", i_chip->GetId() ); - CalloutUtil::defaultError( i_sc ); - return SUCCESS; -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, slwRecovery ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, slwRecovery ); - -/** - * @brief Callout Peer PSI connected to given Proc target - * @param i_chip P8 chip - * @param i_sc The step code data struct - * @returns Failure or Success - * @note A NOP version of plugin required by FSP PRDF - */ -int32_t calloutPeerPsiBusTgt( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - PRDF_ERR( "[Proc::calloutPeerPsiBusTgt] unexpected call: PSI target not " - "supported in hostboot PROC = 0x%08x", i_chip->GetId() ); - - CalloutUtil::defaultError( i_sc ); - return SUCCESS; -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, calloutPeerPsiBusTgt ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, calloutPeerPsiBusTgt ); - -/** - * @brief Check if we're running in hostboot - * @param i_chip Proc chip. - * @param i_sc Step Code data struct - * @return SUCCESS because this is the Hostboot file - */ -int32_t inHostboot( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - return SUCCESS; -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, inHostboot ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, inHostboot ); - -/** - * @brief Collect NX debug traces - * @param i_chip Proc chip. - * @param i_sc Step Code data struct - * @return SUCCESS - */ -int32_t collectNxTraceArray( ExtensibleChip * i_chip, - STEP_CODE_DATA_STRUCT & i_sc ) -{ - // This error should not occur during Hostboot - // but if it is, no trace collection is needed. - - return SUCCESS; - -} -PRDF_PLUGIN_DEFINE_NS( NaplesProc, Proc, collectNxTraceArray ); -PRDF_PLUGIN_DEFINE_NS( MuranoVeniceProc, Proc, collectNxTraceArray ); - -}//namespace Proc ends - -}//namespace PRDF ends diff --git a/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk b/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk deleted file mode 100644 index e9eb6ee33..000000000 --- a/src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk +++ /dev/null @@ -1,77 +0,0 @@ -# IBM_PROLOG_BEGIN_TAG -# This is an automatically generated prolog. -# -# $Source: src/usr/diag/prdf/plat/pegasus/prdf_plat_p8_hb_only.mk $ -# -# OpenPOWER HostBoot Project -# -# Contributors Listed Below - COPYRIGHT 2016 -# [+] 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 - -# NOTE: PRD_SRC_PATH and PRD_INC_PATH must be defined before including this file - -################################################################################ -# Paths common to both IPL and runtime -################################################################################ - -prd_vpath += ${PRD_SRC_PATH}/plat/pegasus - -prd_incpath += ${PRD_SRC_PATH}/plat/pegasus - -################################################################################ -# Hostboot only object files common to both IPL and runtime -################################################################################ - -# plat/pegasus/ (rule plugin related) -prd_rule_plugin += prdfP8TodPlugins.o -prd_rule_plugin += prdfPlatCenMemUtils.o -prd_rule_plugin += prdfPlatCenPll.o -prd_rule_plugin += prdfPlatP8Ex.o -prd_rule_plugin += prdfPlatP8Proc.o - -################################################################################ -# Hostboot only object files (IPL only) -################################################################################ - -ifneq (${HOSTBOOT_RUNTIME},1) - -# plat/pegasus/ (non-rule plugin related) -prd_obj += prdfCenMbaIplCeStats.o -prd_obj += prdfCenMbaTdCtlr_ipl.o -prd_obj += prdfDramRepairs.o -prd_obj += prdfMbaDomain.o -prd_obj += prdfPlatCalloutUtil.o - -# plat/pegasus/ (rule plugin related) -prd_rule_plugin += prdfPlatCenMba_ipl.o - -endif - -################################################################################ -# Hostboot only object files (runtime only) -################################################################################ - -ifeq (${HOSTBOOT_RUNTIME},1) - -# common/plat/pegasus/ -prd_obj += prdfCenMbaDynMemDealloc_rt.o -prd_obj += prdfCenMbaTdCtlr_rt.o -prd_obj += prdfCenMbaTdRankData_rt.o - -endif - -- cgit v1.2.1