diff options
author | Christian Geddes <crgeddes@us.ibm.com> | 2018-01-29 14:49:19 -0600 |
---|---|---|
committer | Christian R. Geddes <crgeddes@us.ibm.com> | 2018-02-17 16:26:17 -0500 |
commit | b542fd6392999e7d521c5dff5a2a2add056db984 (patch) | |
tree | 9e3c9ff1d9c7e902afd65a3cfde7676da795db5f /src/usr/fapi2 | |
parent | e7c2ef327998d6ab868776cdc2c2bb7592b8c17e (diff) | |
download | talos-hostboot-b542fd6392999e7d521c5dff5a2a2add056db984.tar.gz talos-hostboot-b542fd6392999e7d521c5dff5a2a2add056db984.zip |
Enable platSpecialWakeup during IPL time and add support
Previously we only supported platSpecialWakeup at runtime because
we were not worried about needed special wakeup as the cores would
not go into stop state during the IPL. However, now PM code is expecting
bits to be set by the p9 special wakeup hwp so we need to call it during
the IPL. This code makes the handleSpecialWakeup.C/H files compatible
with IPL time build environment and enables the call on the IPL time path
CQ: SW415949
Change-Id: I94cca8a84946bea464b21cb95cdbbb075f766c3d
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52858
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
Diffstat (limited to 'src/usr/fapi2')
-rwxr-xr-x | src/usr/fapi2/fapi2.mk | 1 | ||||
-rw-r--r-- | src/usr/fapi2/plat_utils.C | 6 | ||||
-rwxr-xr-x | src/usr/fapi2/runtime/makefile | 4 |
3 files changed, 3 insertions, 8 deletions
diff --git a/src/usr/fapi2/fapi2.mk b/src/usr/fapi2/fapi2.mk index ee1295ffd..b990be7de 100755 --- a/src/usr/fapi2/fapi2.mk +++ b/src/usr/fapi2/fapi2.mk @@ -55,6 +55,7 @@ EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/ EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/shared/ EXTRAINCDIR += ${HWP_PATH_2}/hwp/memory/lib/utils/ EXTRAINCDIR += ${HWP_PATH_2}/vpd_accessors/ +EXTRAINCDIR += ${ROOTPATH}/src/usr/scom/ include ${ROOTPATH}/src/build/mkrules/verbose.rules.mk define __CLEAN_TARGET diff --git a/src/usr/fapi2/plat_utils.C b/src/usr/fapi2/plat_utils.C index d134582ea..a12423442 100644 --- a/src/usr/fapi2/plat_utils.C +++ b/src/usr/fapi2/plat_utils.C @@ -47,9 +47,7 @@ // remove when get_ring is using the hw image #include <ring_data.H> -#if __HOSTBOOT_RUNTIME - #include "handleSpecialWakeup.H" -#endif +#include "handleSpecialWakeup.H" //****************************************************************************** // Trace descriptors @@ -1135,7 +1133,6 @@ fapi2::ReturnCode platSpecialWakeup(const Target<TARGET_TYPE_ALL>& i_target, fapi2::ReturnCode fapi_rc = fapi2::FAPI2_RC_SUCCESS; FAPI_INF("platSpecialWakeup"); -#ifdef __HOSTBOOT_RUNTIME TARGETING::Target* l_target = reinterpret_cast<TARGETING::Target*>(i_target.get()); @@ -1144,7 +1141,6 @@ fapi2::ReturnCode platSpecialWakeup(const Target<TARGET_TYPE_ALL>& i_target, { fapi_rc.setPlatDataPtr(reinterpret_cast<void *>(err_SW)); } -#endif // On Hostboot, processor cores cannot sleep so return success to the // fapiSpecialWakeup enable/disable calls diff --git a/src/usr/fapi2/runtime/makefile b/src/usr/fapi2/runtime/makefile index 520f216d9..b27316cbe 100755 --- a/src/usr/fapi2/runtime/makefile +++ b/src/usr/fapi2/runtime/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2015,2016 +# Contributors Listed Below - COPYRIGHT 2015,2018 # [+] International Business Machines Corp. # # @@ -33,8 +33,6 @@ ROOTPATH = ../../../.. MODULE = fapi2_rt -EXTRAINCDIR += ${ROOTPATH}/src/usr/scom/runtime - SUBDIRS += test.d include ../fapi2.mk |