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/console | |
| parent | 8aac8685ccdff8d11bf648f3bce65704b461cbf2 (diff) | |
| download | blackbird-hostboot-c823e22a4b61d7db26ce7f3a744c5029b1ccf18e.tar.gz blackbird-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/console')
| -rw-r--r-- | src/usr/console/uart.C | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/usr/console/uart.C b/src/usr/console/uart.C index 385a05cd9..aa85df50b 100644 --- a/src/usr/console/uart.C +++ b/src/usr/console/uart.C @@ -5,9 +5,9 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ -/* [+] International Business Machines Corp. */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] Google Inc. */ +/* [+] International Business Machines Corp. */ /* */ /* */ /* Licensed under the Apache License, Version 2.0 (the "License"); */ @@ -27,6 +27,7 @@ #include <devicefw/userif.H> #include <lpc/lpcif.H> #include <kernel/console.H> +#include <sys/task.h> #include <sys/time.h> #include <errl/errlmanager.H> #include <hwas/common/hwasCallout.H> @@ -132,6 +133,7 @@ namespace CONSOLE break; } nanosleep(0, DELAY_NS); + task_yield(); loops++; } while( loops < DELAY_LOOPS); |
