From patchwork Fri Nov 18 05:01:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 696418 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tKmBM0XN1z9syB for ; Fri, 18 Nov 2016 16:04:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZMlz096u"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tKmBL6bvQzDvyq for ; Fri, 18 Nov 2016 16:04:26 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZMlz096u"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pf0-x244.google.com (mail-pf0-x244.google.com [IPv6:2607:f8b0:400e:c00::244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3tKm8B6z3bzDvwD for ; Fri, 18 Nov 2016 16:02:34 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ZMlz096u"; dkim-atps=neutral Received: by mail-pf0-x244.google.com with SMTP id i88so12759011pfk.2 for ; Thu, 17 Nov 2016 21:02:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=UkLHMv5EBXvV7AhBsbIp3cNVBmA3QlaZgDApt6MqkYE=; b=ZMlz096uUCoVFn1Hw+erM2h4PKXwLy9fnqAUObfm8OlbtAKywnU4gKEdxmM4PTtHBZ Aps//Q9yhA036IfmJyBh6h4xiZ+gV4k05r3s5BNXwqQ/SZQ6JrtS6xHRiycT1DIFzUtx wM+IU/9L/lQJSXrX6AMPM8vmA/7lOfBgKaHtaB3p1eBpFXVLDsaBVoWuRR92xL+PpQt5 a8UTVbjNdU9DvGcjMeO0P5uPfDC3657d4xG8xiKcbqKvbKSWaE4rllEkI3L3crMJ9swL qsL9R7aiLHCDNtenpOP3MdYJ0DX22Oe3VNLsXD+N17bA41IuxZb7hptg0hJATOBFUMoe rEFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=UkLHMv5EBXvV7AhBsbIp3cNVBmA3QlaZgDApt6MqkYE=; b=eb7CnrX1e6nJZp+s5H5EXI068z6ZNQghDLLVN4ZuW/LZJS98KZ8IbftgSu/P7DzFig PL2vAgFUKOwi34Mt6/l3lM+jJ3z41NLGaNQ4WZfKcSmjF93HA3GIHuQONP5oW1iSKv6m YnydqqenHxM0N5pGUd30ISF4eozGXzuxs8gAshn/OorSD8/2kPPq1JXbUZVaVr2LfoGh nPoMDXIAeFurmCtxqaFbxoy+1xmKFZzMNuiRB1up/h18jP7rCiFexozzluRpxlC9cAY2 FMe3gklv0rdivS86V5RrEbymsZ/JvQviME3HQwpVXmYN1Wm2XC0EojxYi6PDedR3BQal xr/g== X-Gm-Message-State: ABUngvdRH360n/k8WasaJrw8ewxzzkHUqYAmK8qP01m3SJumUAc4mhssofodr3Er15MDXQ== X-Received: by 10.99.95.86 with SMTP id t83mr15016014pgb.0.1479445353154; Thu, 17 Nov 2016 21:02:33 -0800 (PST) Received: from canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id x90sm12613462pfk.73.2016.11.17.21.02.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 21:02:32 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 18 Nov 2016 16:01:49 +1100 Message-Id: <1479445312-12382-12-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1479445312-12382-1-git-send-email-oohall@gmail.com> References: <1479445312-12382-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [PATCH 11/14] core: use set_opal_console() X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Replaces existing explicit calls to the console driver init functions with a call to set_opal_console() and adds a init_opal_console to the main init path. Signed-off-by: Oliver O'Halloran --- core/init.c | 5 ++--- core/platform.c | 4 +--- hw/fsp/fsp-console.c | 4 +++- platforms/astbmc/common.c | 3 +-- platforms/qemu/qemu.c | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/core/init.c b/core/init.c index 9d4ab602ffa5..81939dd08808 100644 --- a/core/init.c +++ b/core/init.c @@ -896,9 +896,8 @@ void __noreturn __nomcount main_cpu_entry(const void *fdt) /* Secure/Trusted Boot init. We look for /ibm,secureboot in DT */ stb_init(); - /* Setup dummy console nodes if it's enabled */ - if (dummy_console_enabled()) - dummy_console_add_nodes(); + /* Install the OPAL Console handlers */ + init_opal_console(); /* Init SLW related stuff, including fastsleep */ slw_init(); diff --git a/core/platform.c b/core/platform.c index 587816478c79..c70ffc9b5129 100644 --- a/core/platform.c +++ b/core/platform.c @@ -111,9 +111,7 @@ static bool generic_platform_probe(void) static void generic_platform_init(void) { if (uart_enabled()) - uart_setup_opal_console(); - else - force_dummy_console(); + set_opal_console(&uart_opal_con); /* Enable a BT interface if we find one too */ bt_init(); diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index b0fefb6bdd76..009ccce26641 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -384,7 +384,7 @@ static void fsp_close_vserial(struct fsp_msg *msg) set_console(NULL); } #endif - + lock(&fsp_con_lock); if (fs->open) { fs->open = false; @@ -816,6 +816,8 @@ 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) diff --git a/platforms/astbmc/common.c b/platforms/astbmc/common.c index 6e678a10bcec..ce8edeac043c 100644 --- a/platforms/astbmc/common.c +++ b/platforms/astbmc/common.c @@ -138,8 +138,7 @@ void astbmc_init(void) ipmi_set_fw_progress_sensor(IPMI_FW_MOTHERBOARD_INIT); /* Setup UART console for use by Linux via OPAL API */ - if (!dummy_console_enabled()) - uart_setup_opal_console(); + set_opal_console(&uart_opal_con); } int64_t astbmc_ipmi_power_down(uint64_t request) diff --git a/platforms/qemu/qemu.c b/platforms/qemu/qemu.c index 0c583f1cea5a..85ca213c29af 100644 --- a/platforms/qemu/qemu.c +++ b/platforms/qemu/qemu.c @@ -79,8 +79,7 @@ static void qemu_ipmi_setenables(void) static void qemu_init(void) { /* Setup UART console for use by Linux via OPAL API */ - if (!dummy_console_enabled()) - uart_setup_opal_console(); + set_opal_console(&uart_opal_con); /* Setup LPC RTC and use it as time source. Call after * chiptod_init()