diff options
| author | Matt Derksen <mderkse1@us.ibm.com> | 2018-03-09 14:21:57 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-03-12 15:06:41 -0400 |
| commit | 647eb6eae52c7a876648c5a4d33a8370588812f4 (patch) | |
| tree | a97e7bce77e872bcb8efb378ba702d34f08fe123 | |
| parent | c82b626e6ea1d56c0d25cbd5954064e256135002 (diff) | |
| download | talos-hostboot-647eb6eae52c7a876648c5a4d33a8370588812f4.tar.gz talos-hostboot-647eb6eae52c7a876648c5a4d33a8370588812f4.zip | |
Only call PNOR::init() on systems with BMC
Code to fix SW412798 forgot to check for non-fsp systems.
FSP systems will return an error. 0 size FIRDATA section.
Change-Id: Ic2c2c49707d49b29cc38358ef6ab9dd372e8ffab
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/55373
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
CI-Ready: William G. Hoffa <wghoffa@us.ibm.com>
Tested-by: William G. Hoffa <wghoffa@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
| -rw-r--r-- | src/usr/pnor/runtime/rt_pnor.C | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/usr/pnor/runtime/rt_pnor.C b/src/usr/pnor/runtime/rt_pnor.C index 9d61e304e..02b230456 100644 --- a/src/usr/pnor/runtime/rt_pnor.C +++ b/src/usr/pnor/runtime/rt_pnor.C @@ -27,6 +27,7 @@ #include <stdio.h> #include <targeting/common/targetservice.H> #include <initservice/taskargs.H> +#include <initservice/initserviceif.H> #include <runtime/rt_targeting.H> #include <runtime/interface.h> // g_hostInterfaces, postInitCalls_t @@ -45,6 +46,7 @@ #include "../pnor_utils.H" #include <runtime/common/runtime_utils.H> + // Trace definition extern trace_desc_t* g_trac_pnor; @@ -903,18 +905,21 @@ void initPnor() TRACFCOMP(g_trac_pnor, ENTER_MRK"initPnor"); errlHndl_t l_errl = nullptr; - // call static init() function to save PNOR section into memory - RtPnor::init(l_errl); - if (l_errl) + // Only run PNOR init on non-FSP based systems + if ( !INITSERVICE::spBaseServicesEnabled() ) { - TRACFCOMP(g_trac_pnor,ERR_MRK"initPnor: " - "Failed RtPnor::init() with EID %.8X:%.4X", - ERRL_GETEID_SAFE(l_errl), - ERRL_GETRC_SAFE(l_errl) ); - errlCommit (l_errl, PNOR_COMP_ID); + // call static init() function to save PNOR section into memory + RtPnor::init(l_errl); + if (l_errl) + { + TRACFCOMP(g_trac_pnor,ERR_MRK"initPnor: " + "Failed RtPnor::init() with EID %.8X:%.4X", + ERRL_GETEID_SAFE(l_errl), + ERRL_GETRC_SAFE(l_errl) ); + errlCommit (l_errl, PNOR_COMP_ID); + } } - TRACFCOMP(g_trac_pnor, EXIT_MRK"initPnor"); } |
