diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2019-02-12 15:50:32 -0600 |
|---|---|---|
| committer | Daniel M. Crowell <dcrowell@us.ibm.com> | 2019-03-01 15:11:35 -0600 |
| commit | 518a05ca5136d3b2149ed6502871a7de52d9b794 (patch) | |
| tree | a5e34bca1df9081380129454e76472f9399c43ab /src | |
| parent | b1c1b2cc5e78267fadb9001587f66566cf19159e (diff) | |
| download | blackbird-hostboot-518a05ca5136d3b2149ed6502871a7de52d9b794.tar.gz blackbird-hostboot-518a05ca5136d3b2149ed6502871a7de52d9b794.zip | |
Move nvdimm_update call to istep 21.1
istep20 is not called on FSP-based systems,
so the update call needed to be moved to 21.1.
This was selected because it requires lids.
Change-Id: I2378eb1629e982913a3abe8b652b436edd692439
RTC: 201197
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/71859
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-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>
Reviewed-by: Corey V. Swenson <cswenson@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr/isteps/istep20/call_host_load_payload.C | 10 | ||||
| -rw-r--r-- | src/usr/isteps/istep20/makefile | 1 | ||||
| -rw-r--r-- | src/usr/isteps/istep21/call_host_runtime_setup.C | 14 | ||||
| -rw-r--r-- | src/usr/isteps/istep21/call_nvdimm_update.C (renamed from src/usr/isteps/istep20/call_nvdimm_update.C) | 4 | ||||
| -rw-r--r-- | src/usr/isteps/istep21/call_nvdimm_update.H (renamed from src/usr/isteps/istep20/call_nvdimm_update.H) | 4 | ||||
| -rw-r--r-- | src/usr/isteps/istep21/makefile | 1 |
6 files changed, 17 insertions, 17 deletions
diff --git a/src/usr/isteps/istep20/call_host_load_payload.C b/src/usr/isteps/istep20/call_host_load_payload.C index 26dab532b..44e7672f4 100644 --- a/src/usr/isteps/istep20/call_host_load_payload.C +++ b/src/usr/isteps/istep20/call_host_load_payload.C @@ -40,10 +40,6 @@ #include <xz/xz.h> #include <config.h> -#ifdef CONFIG_NVDIMM -#include "call_nvdimm_update.H" -#endif - using namespace ERRORLOG; using namespace ISTEP; @@ -134,12 +130,6 @@ void* call_host_load_payload (void *io_pArgs) } } -#ifdef CONFIG_NVDIMM - // Update the NVDIMM controller code, if necessary - // Need to do this after LIDs are accessible - NVDIMM_UPDATE::call_nvdimm_update(); -#endif - }while(0); return l_err; diff --git a/src/usr/isteps/istep20/makefile b/src/usr/isteps/istep20/makefile index 5a656bd3b..f98bb7e9b 100644 --- a/src/usr/isteps/istep20/makefile +++ b/src/usr/isteps/istep20/makefile @@ -26,6 +26,5 @@ ROOTPATH = ../../../.. MODULE = istep20 OBJS += call_host_load_payload.o -OBJS += $(if $(CONFIG_NVDIMM),call_nvdimm_update.o,) include ${ROOTPATH}/config.mk diff --git a/src/usr/isteps/istep21/call_host_runtime_setup.C b/src/usr/isteps/istep21/call_host_runtime_setup.C index 7ff75e886..c9c302123 100644 --- a/src/usr/isteps/istep21/call_host_runtime_setup.C +++ b/src/usr/isteps/istep21/call_host_runtime_setup.C @@ -66,6 +66,10 @@ #include "call_update_ucd_flash.H" #endif +#ifdef CONFIG_NVDIMM +#include "call_nvdimm_update.H" +#endif + using namespace ERRORLOG; using namespace ISTEP; using namespace ISTEP_ERROR; @@ -705,6 +709,12 @@ void* call_host_runtime_setup (void *io_pArgs) break; } +#ifdef CONFIG_NVDIMM + // Update the NVDIMM controller code, if necessary + // Need to do this after LIDs are accessible + NVDIMM_UPDATE::call_nvdimm_update(); +#endif + #ifdef CONFIG_START_OCC_DURING_BOOT bool l_activatePM = TARGETING::is_sapphire_load(); #else @@ -746,7 +756,7 @@ void* call_host_runtime_setup (void *io_pArgs) } #endif } - // No support for OCC + // No support for OCC else if( !Util::isSimicsRunning() ) { //Shouldnt clear this ATTR_PM_FIRINIT_DONE_ONCE_FLAG @@ -836,7 +846,7 @@ void* call_host_runtime_setup (void *io_pArgs) break; } } - + // Update the MDRT Count from Attribute TargetService& l_targetService = targetService(); Target* l_sys = nullptr; diff --git a/src/usr/isteps/istep20/call_nvdimm_update.C b/src/usr/isteps/istep21/call_nvdimm_update.C index 7a1817faf..1204adb61 100644 --- a/src/usr/isteps/istep20/call_nvdimm_update.C +++ b/src/usr/isteps/istep21/call_nvdimm_update.C @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep20/call_nvdimm_update.C $ */ +/* $Source: src/usr/isteps/istep21/call_nvdimm_update.C $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/isteps/istep20/call_nvdimm_update.H b/src/usr/isteps/istep21/call_nvdimm_update.H index 70922f3d8..bc461d72f 100644 --- a/src/usr/isteps/istep20/call_nvdimm_update.H +++ b/src/usr/isteps/istep21/call_nvdimm_update.H @@ -1,11 +1,11 @@ /* IBM_PROLOG_BEGIN_TAG */ /* This is an automatically generated prolog. */ /* */ -/* $Source: src/usr/isteps/istep20/call_nvdimm_update.H $ */ +/* $Source: src/usr/isteps/istep21/call_nvdimm_update.H $ */ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2018 */ +/* Contributors Listed Below - COPYRIGHT 2018,2019 */ /* [+] International Business Machines Corp. */ /* */ /* */ diff --git a/src/usr/isteps/istep21/makefile b/src/usr/isteps/istep21/makefile index 1ba8edd32..41db2a612 100644 --- a/src/usr/isteps/istep21/makefile +++ b/src/usr/isteps/istep21/makefile @@ -43,5 +43,6 @@ OBJS += freqAttrData.o OBJS += call_host_verify_hdat.o OBJS += call_host_start_payload.o OBJS += $(if $(CONFIG_UCD_FLASH_UPDATES),call_update_ucd_flash.o,) +OBJS += $(if $(CONFIG_NVDIMM),call_nvdimm_update.o,) include ${ROOTPATH}/config.mk |
