diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2018-05-11 16:41:21 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2018-05-24 04:03:19 -0500 |
| commit | 08992151641a24db5ff52ce3a4bd18714d5be700 (patch) | |
| tree | ba2954bedc8f00a4f760e6c05e1175b7615fb82d /hw/fsp/fsp-console.c | |
| parent | a8700b5beeab949819fdaf042cb129ec534c83fd (diff) | |
| download | blackbird-skiboot-08992151641a24db5ff52ce3a4bd18714d5be700.tar.gz blackbird-skiboot-08992151641a24db5ff52ce3a4bd18714d5be700.zip | |
fsp/console: Always establish OPAL console API backend
Currently we only call set_opal_console() to establish the backend
used by the OPAL console API if we find at least one FSP serial
port in HDAT.
On systems where there is none (IPMI only), we fail to set it,
causing the console code to try to use the dummy console causing
an assertion failure during boot due to clashing on the device-tree
node names.
So always set it if an FSP is present
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'hw/fsp/fsp-console.c')
| -rw-r--r-- | hw/fsp/fsp-console.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index 8d845d83..2c6151da 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -850,6 +850,9 @@ void fsp_console_init(void) /* Register poller */ opal_add_poller(fsp_console_poll, NULL); + /* Register OPAL console backend */ + set_opal_console(&fsp_opal_con); + /* Parse serial port data */ serials = dt_find_by_path(dt_root, "ipl-params/fsp-serial"); if (!serials) { @@ -869,8 +872,6 @@ void fsp_console_init(void) } op_display(OP_LOG, OP_MOD_FSPCON, 0x0005); - - set_opal_console(&fsp_opal_con); } static int64_t fsp_console_flush(int64_t terminal __unused) |
