diff options
| author | Nick Bofferding <bofferdn@us.ibm.com> | 2015-01-14 10:13:44 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2015-01-16 13:52:21 -0600 |
| commit | c823e22a4b61d7db26ce7f3a744c5029b1ccf18e (patch) | |
| tree | c01fb27d5252cb1793a8355d4892159bb0756a90 /src/usr/hwpf/hwp/core_activate | |
| parent | 8aac8685ccdff8d11bf648f3bce65704b461cbf2 (diff) | |
| download | talos-hostboot-c823e22a4b61d7db26ce7f3a744c5029b1ccf18e.tar.gz talos-hostboot-c823e22a4b61d7db26ce7f3a744c5029b1ccf18e.zip | |
Fix intermittent deadman timer timeout in host_activate_master
- Flush console traces prior to winkle of master core
- Yield UART task when transmit FIFO doesn't have space
Change-Id: I73905094a4d541b0b0ad7ffa1bcd1619d33f7743
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/15133
Tested-by: Jenkins Server
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/hwpf/hwp/core_activate')
| -rw-r--r-- | src/usr/hwpf/hwp/core_activate/core_activate.C | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/usr/hwpf/hwp/core_activate/core_activate.C b/src/usr/hwpf/hwp/core_activate/core_activate.C index 7b31fa25a..76223dde0 100644 --- a/src/usr/hwpf/hwp/core_activate/core_activate.C +++ b/src/usr/hwpf/hwp/core_activate/core_activate.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2012,2014 */ +/* Contributors Listed Below - COPYRIGHT 2012,2015 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -50,6 +50,7 @@ #include <errl/errludtarget.H> #include <intr/interrupt.H> +#include <console/consoleif.H> // targeting support #include <targeting/common/commontargeting.H> @@ -239,6 +240,9 @@ void* call_host_activate_master( void *io_pArgs ) TRACFCOMP( ISTEPS_TRACE::g_trac_isteps_trace, "call_host_activate_master: put master into winkle..." ); + // Flush any lingering console traces first + CONSOLE::flush(); + int l_rc = cpu_master_winkle( ); if ( l_rc ) { |
