From 1e337a9565c8c08a4a13a145890027a10c043bf0 Mon Sep 17 00:00:00 2001 From: Elizabeth Liner Date: Wed, 7 Feb 2018 16:23:09 -0600 Subject: [PATCH] Moving Sbe Retry Handler work to common file for runtime We want to move the sbe_retry_handler.C and other files associated with it to a common directory and makefile. Change-Id: Ifc725709d23d9eec75d2f91b2be73728c91a8d86 RTC:180241 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53591 Tested-by: Jenkins Server Tested-by: Jenkins OP Build CI Tested-by: Jenkins OP HW Tested-by: FSP CI Jenkins Reviewed-by: Martin Gloff Reviewed-by: Roland Veloz Reviewed-by: Daniel M. Crowell --- src/usr/sbeio/common/common.mk | 26 +++++++++++++++++++ src/usr/sbeio/{ => common}/sbe_attn.C | 4 +-- .../sbeio/{ => common}/sbe_retry_handler.C | 6 +++-- src/usr/sbeio/makefile | 5 ++-- src/usr/sbeio/runtime/makefile | 8 +++--- 5 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 src/usr/sbeio/common/common.mk rename src/usr/sbeio/{ => common}/sbe_attn.C (97%) rename src/usr/sbeio/{ => common}/sbe_retry_handler.C (99%) diff --git a/src/usr/sbeio/common/common.mk b/src/usr/sbeio/common/common.mk new file mode 100644 index 00000000000..397af666f88 --- /dev/null +++ b/src/usr/sbeio/common/common.mk @@ -0,0 +1,26 @@ +# IBM_PROLOG_BEGIN_TAG +# This is an automatically generated prolog. +# +# $Source: src/usr/sbeio/common/common.mk $ +# +# OpenPOWER HostBoot Project +# +# Contributors Listed Below - COPYRIGHT 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 +SBEIO_COMMON_OBJS += sbe_attn.o +SBEIO_COMMON_OBJS += sbe_retry_handler.o diff --git a/src/usr/sbeio/sbe_attn.C b/src/usr/sbeio/common/sbe_attn.C similarity index 97% rename from src/usr/sbeio/sbe_attn.C rename to src/usr/sbeio/common/sbe_attn.C index 248fd8d7c1b..a6fcb05830e 100644 --- a/src/usr/sbeio/sbe_attn.C +++ b/src/usr/sbeio/common/sbe_attn.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/sbeio/sbe_attn.C $ */ +/* $Source: src/usr/sbeio/common/sbe_attn.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2017 */ +/* Contributors Listed Below - COPYRIGHT 2017,2018 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/sbeio/sbe_retry_handler.C b/src/usr/sbeio/common/sbe_retry_handler.C similarity index 99% rename from src/usr/sbeio/sbe_retry_handler.C rename to src/usr/sbeio/common/sbe_retry_handler.C index 0ecf6b62a3a..b18480df4bb 100644 --- a/src/usr/sbeio/sbe_retry_handler.C +++ b/src/usr/sbeio/common/sbe_retry_handler.C @@ -1,7 +1,7 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/sbeio/sbe_retry_handler.C $ */ +/* $Source: src/usr/sbeio/common/sbe_retry_handler.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ @@ -300,7 +300,9 @@ void SbeRetryHandler::main_sbe_handler( TARGETING::Target * i_target ) // In the informational only mode, we just need enough information // to get the SBE RC returned from the HWP. We are running with // the knowledge that the SBE has failed already. - this->sbe_boot_fail_handler(i_target, true); // pass true to have log show up + + // pass true to have log show up + this->sbe_boot_fail_handler(i_target, true); this->iv_currentSBEState = SBE_FAILED_TO_BOOT; } diff --git a/src/usr/sbeio/makefile b/src/usr/sbeio/makefile index 003ad74e12b..da41e88628f 100644 --- a/src/usr/sbeio/makefile +++ b/src/usr/sbeio/makefile @@ -25,6 +25,7 @@ ROOTPATH = ../../.. PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures MODULE = sbeio +include common/common.mk EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2 @@ -55,11 +56,11 @@ OBJS += sbe_getSBEFFDC.o OBJS += sbe_memRegionMgr.o OBJS += sbe_fifo_buffer.o OBJS += sbe_ffdc_package_parser.o -OBJS += sbe_attn.o -OBJS += sbe_retry_handler.o +OBJS += ${SBEIO_COMMON_OBJS} VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv/ VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/ +VPATH += ${ROOTPATH}/src/usr/sbeio/common include ${ROOTPATH}/procedure.rules.mk diff --git a/src/usr/sbeio/runtime/makefile b/src/usr/sbeio/runtime/makefile index 1fc43224794..13fbaed1276 100644 --- a/src/usr/sbeio/runtime/makefile +++ b/src/usr/sbeio/runtime/makefile @@ -31,7 +31,7 @@ PROCEDURES_PATH = ${ROOTPATH}/src/import/chips/p9/procedures MODULE = sbeio_rt - +include ../common/common.mk EXTRAINCDIR += ${ROOTPATH}/src/import/hwpf/fapi2/include EXTRAINCDIR += ${ROOTPATH}/src/include/usr/fapi2 @@ -47,13 +47,13 @@ EXTRAINCDIR += ${PROCEDURES_PATH}/hwp/sbe/ ## Objects unique to HBRT OBJS += rt_sbeio.o OBJS += sbeio_attr_override.o -OBJS += sbe_attn.o -OBJS += sbe_retry_handler.o -#@todo - RTC:180241 - Add in error handlers by creating common mk +OBJS += ${SBEIO_COMMON_OBJS} VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv/ VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/sbe/ VPATH += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/lib/ +VPATH += ../common + include ${ROOTPATH}/procedure.rules.mk include ${ROOTPATH}/src/import/chips/p9/procedures/hwp/sbe/p9_get_sbe_msg_register.mk include ${ROOTPATH}/src/import/chips/p9/procedures/hwp/perv/p9_start_cbs.mk