diff options
author | Swathi Madhuri Bhattiprolu <bhmadhur@in.ibm.com> | 2018-01-08 03:38:04 -0600 |
---|---|---|
committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-01-31 09:38:28 -0500 |
commit | d999ed144f949e318fbd0523f0dfaa56d291596f (patch) | |
tree | 3fcab2e8f602c8ac442e8eb27f4b0b8a816b40e5 /src/usr/initservice/istepdispatcher | |
parent | 82805770e03584fbe18df365600d5090b170d364 (diff) | |
download | talos-hostboot-d999ed144f949e318fbd0523f0dfaa56d291596f.tar.gz talos-hostboot-d999ed144f949e318fbd0523f0dfaa56d291596f.zip |
Re-enable base multi-drawer ipl support
Changes include:
- Establish System SMP
- host_coalesce_host message processing
- host_sys_fab_iovalid_processing
- smp_unfencing_inter_enclosure_abus_links
Change-Id: I83fea15f0d14c9cbc9a884ece5a2e7ce01e888bb
RTC:164474
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/51598
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>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/initservice/istepdispatcher')
-rw-r--r-- | src/usr/initservice/istepdispatcher/istepdispatcher.C | 22 | ||||
-rw-r--r-- | src/usr/initservice/istepdispatcher/makefile | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/src/usr/initservice/istepdispatcher/istepdispatcher.C b/src/usr/initservice/istepdispatcher/istepdispatcher.C index a164544d8..06c45e640 100644 --- a/src/usr/initservice/istepdispatcher/istepdispatcher.C +++ b/src/usr/initservice/istepdispatcher/istepdispatcher.C @@ -66,6 +66,8 @@ #include <isteps/hwpisteperror.H> #include <pnor/pnorif.H> #include <lpc/lpcif.H> +#include <istep18/establish_system_smp.H> + #ifdef CONFIG_BMC_IPMI #include <ipmi/ipmiwatchdog.H> //IPMI watchdog timer #include <ipmi/ipmipowerstate.H> //IPMI System ACPI Power State @@ -2066,10 +2068,9 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg) // Create child thread so that if there are problems, the istep // dispatcher code continues - // @TODO RTC:133831 - //tid_t l_progTid = task_create( - // ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg); - tid_t l_progTid = 1; + tid_t l_progTid = task_create( + ESTABLISH_SYSTEM_SMP::host_sys_fab_iovalid_processing,io_pMsg); + assert( l_progTid > 0 ); // wait here for the task to end. // status of the task ( OK or Crashed ) is returned in l_childsts @@ -2124,9 +2125,8 @@ void IStepDispatcher::handleProcFabIovalidMsg(msg_t * & io_pMsg) "Returned from cpu_all_winkle." ); } - // Re-enable p8_cpu_special_wakeup - // @TODO RTC:133831 - //err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup(); + // Re-enable cpu special wakeup + err = ESTABLISH_SYSTEM_SMP::enableSpecialWakeup(); if (err) { TRACFCOMP( g_trac_initsvc, @@ -2536,9 +2536,8 @@ errlHndl_t IStepDispatcher::handleCoalesceHostMsg() // Ensure the library is loaded - //@TODO RTC:164474 - //errlHndl_t err = VFS::module_load("libestablish_system_smp.so"); - errlHndl_t err = NULL; + errlHndl_t err = VFS::module_load("libestablish_system_smp.so"); + if (err) { TRACFCOMP(g_trac_initsvc, "handleCoalesceHostMsg: Error loading module, PLID = 0x%x", @@ -2546,8 +2545,7 @@ errlHndl_t IStepDispatcher::handleCoalesceHostMsg() } else { - //@TODO RTC:164474 - //err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host(); + err = ESTABLISH_SYSTEM_SMP::call_host_coalesce_host(); if (err) { TRACFCOMP(g_trac_initsvc, "handleCoalesceHostMsg: Error with " diff --git a/src/usr/initservice/istepdispatcher/makefile b/src/usr/initservice/istepdispatcher/makefile index 904355860..52becfd3a 100644 --- a/src/usr/initservice/istepdispatcher/makefile +++ b/src/usr/initservice/istepdispatcher/makefile @@ -5,7 +5,7 @@ # # OpenPOWER HostBoot Project # -# Contributors Listed Below - COPYRIGHT 2011,2017 +# Contributors Listed Below - COPYRIGHT 2011,2018 # [+] International Business Machines Corp. # # @@ -34,6 +34,7 @@ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/common/utils/imageProcs/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/ffdc/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/common/include/ EXTRAINCDIR += ${ROOTPATH}/src/import/chips/p9/procedures/hwp/nest/ +EXTRAINCDIR += ${ROOTPATH}/src/usr/isteps VPATH = ${ROOTPATH}/src/usr/initservice/bootconfig/ |