diff options
| author | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2017-10-27 16:20:45 +0530 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2017-10-31 13:39:44 +1100 |
| commit | d4172005b25f4247d07c2d81deeddd3a323d8b41 (patch) | |
| tree | a380a43119978f36a61ec1ee3db0f633ac1492cc | |
| parent | 43290f90e46d632ed5a314292c317e6f813c3b74 (diff) | |
| download | skiboot-d4172005b25f4247d07c2d81deeddd3a323d8b41.zip skiboot-d4172005b25f4247d07c2d81deeddd3a323d8b41.tar.gz skiboot-d4172005b25f4247d07c2d81deeddd3a323d8b41.tar.bz2 | |
FSP/CONSOLE: Disable notification on unresponsive consoles
Commit fd6b71fc fixed the situation where ipmi console was open (hvc0) but got
data on different console (hvc1).
During FSP R/R OPAL closes all consoles. After R/R complete FSP requests to
open hvc1 and sends data on this. If hvc1 registration failed or not opened in
host kernel then it will not read data and results in RCU stalls.
Note that this is workaround for older kernel where we don't have separate irq
for each console. Latest kernel works fine without this patch.
CC: stable
CC: Sam Mendoza-Jonas <sam@mendozajonas.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
(cherry picked from commit c9cc5ef5772ebfbfff978f1c25763d733e45752c)
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
| -rw-r--r-- | hw/fsp/fsp-console.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index cb96dd1..6c06610 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -701,6 +701,7 @@ static int64_t fsp_console_read(int64_t term_number, int64_t *length, struct fsp_serbuf_hdr *sb; bool pending = false; uint32_t old_nin, n, i, chunk, req = *length; + int rc = OPAL_SUCCESS; if (term_number < 0 || term_number >= MAX_SERIAL) return OPAL_PARAMETER; @@ -709,8 +710,8 @@ static int64_t fsp_console_read(int64_t term_number, int64_t *length, return OPAL_PARAMETER; lock(&fsp_con_lock); if (!fs->open) { - unlock(&fsp_con_lock); - return OPAL_CLOSED; + rc = OPAL_CLOSED; + goto clr_flag; } if (fs->waiting) fs->waiting = 0; @@ -741,6 +742,7 @@ static int64_t fsp_console_read(int64_t term_number, int64_t *length, buffer[4], buffer[5], buffer[6], buffer[7]); #endif /* OPAL_DEBUG_CONSOLE_IO */ +clr_flag: /* Might clear the input pending flag */ for (i = 0; i < MAX_SERIAL && !pending; i++) { struct fsp_serial *fs = &fsp_serials[i]; @@ -769,7 +771,7 @@ static int64_t fsp_console_read(int64_t term_number, int64_t *length, unlock(&fsp_con_lock); - return OPAL_SUCCESS; + return rc; } void fsp_console_poll(void *data __unused) |