From patchwork Fri Nov 18 05:01:50 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: 696419 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 3tKmBX4mwjz9syB for ; Fri, 18 Nov 2016 16:04:36 +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="T8p3/WHj"; 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 3tKmBX3kj4zDw08 for ; Fri, 18 Nov 2016 16:04:36 +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="T8p3/WHj"; 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 3tKm8F2GThzDvwv for ; Fri, 18 Nov 2016 16:02:37 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="T8p3/WHj"; dkim-atps=neutral Received: by mail-pf0-x244.google.com with SMTP id y68so12808858pfb.1 for ; Thu, 17 Nov 2016 21:02:37 -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=C5R3M07Py5oC853zLFPcb5+6FJ0VV1AMfFUGNyu7YKo=; b=T8p3/WHjzE/s2hWUm0/q9ql0nF8YK0z79l5BfdBYyfTpyGbOP5hBArF1Esr6XOXGC0 xAeXbyIZUGBnrMJCHQDHOY7KFX1V3xUCUbJIFZKzLrldZe6U7aJOeDftO4PJ+9AlYlg6 ZLm146kAUNSeUM93aCblBTma3I9yaw1F2wGPzkX3e+04AMZMs8UcuAntGxKy+xPKJxC7 hUYXpc1CWeVE4Ixmo6BsaftuwYmPSBFgnOs6WIXlh5Pcb+Znm61+hc/W3yvodIQVVOKw qjT0vYbmE8v3pzttH6H6hZ8qaigyAhFcC/QISmnZavFxsrgM3p1bD6yy3e4geLi3OnnA b0kA== 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=C5R3M07Py5oC853zLFPcb5+6FJ0VV1AMfFUGNyu7YKo=; b=bL5UUNl2KJMb2QC2pll+fhP9rScGKWo/xQL7x8bAWIAOYtl7ijY2NAXGb1SdpWRt/O WPgXZG/o6AKu2u9DOImSxmW9U6VvECx7sY0Qoj0HfqLLVQEh/AgcCXwKtYPpIjo0sjd9 pVGgw8dNNmfcDIGN55hBt1ujb3U9RN6akFi2STCf8BdiBPA8Xa743UYppnKb2QG98mQz LVYECLHuuGWscP6/OYftJcZ7eVRruVMbxtmj8B93ospgG7WEPohDMScfQE2GVzo6LYqB 2SxmuD97U4SSIHpOFhslhPFZvURsvrWh7kn/M7bXF7sNJACqn5+WGXeNmuSqsQGeVfcB sbjQ== X-Gm-Message-State: ABUngvdt+9L96nF9aS6FQUsU49oP+3V9eYJZSKLqYlKkW+5BxeFrlLiVbxli5upFMOO5eQ== X-Received: by 10.98.149.81 with SMTP id p78mr9278804pfd.95.1479445355232; Thu, 17 Nov 2016 21:02:35 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 21:02:34 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 18 Nov 2016 16:01:50 +1100 Message-Id: <1479445312-12382-13-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 12/14] console: remove opal_call overwrites 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" These are no longer needed. Signed-off-by: Oliver O'Halloran --- core/console.c | 4 ---- hw/fsp/fsp-console.c | 5 ----- hw/lpc-uart.c | 8 -------- 3 files changed, 17 deletions(-) diff --git a/core/console.c b/core/console.c index dc632151049b..f67524726486 100644 --- a/core/console.c +++ b/core/console.c @@ -389,7 +389,6 @@ static int64_t dummy_console_write(int64_t term_number, int64_t *length, return OPAL_SUCCESS; } -opal_call(OPAL_CONSOLE_WRITE, dummy_console_write, 3); static int64_t dummy_console_write_buffer_space(int64_t term_number, int64_t *length) @@ -405,7 +404,6 @@ static int64_t dummy_console_write_buffer_space(int64_t term_number, return OPAL_SUCCESS; } -opal_call(OPAL_CONSOLE_WRITE_BUFFER_SPACE, dummy_console_write_buffer_space, 2); static int64_t dummy_console_read(int64_t term_number, int64_t *length, uint8_t *buffer) @@ -421,13 +419,11 @@ static int64_t dummy_console_read(int64_t term_number, int64_t *length, return OPAL_SUCCESS; } -opal_call(OPAL_CONSOLE_READ, dummy_console_read, 3); static int64_t dummy_console_flush(int64_t term_number __unused) { return OPAL_UNSUPPORTED; } -opal_call(OPAL_CONSOLE_FLUSH, dummy_console_flush, 1); static void dummy_console_poll(void *data __unused) { diff --git a/hw/fsp/fsp-console.c b/hw/fsp/fsp-console.c index 009ccce26641..57679d6949f2 100644 --- a/hw/fsp/fsp-console.c +++ b/hw/fsp/fsp-console.c @@ -783,11 +783,6 @@ void fsp_console_init(void) if (!fsp_present()) return; - opal_register(OPAL_CONSOLE_READ, fsp_console_read, 3); - opal_register(OPAL_CONSOLE_WRITE_BUFFER_SPACE, - fsp_console_write_buffer_space, 2); - opal_register(OPAL_CONSOLE_WRITE, fsp_console_write, 3); - /* Wait until we got the intf query before moving on */ while (!got_intf_query) opal_run_pollers(); diff --git a/hw/lpc-uart.c b/hw/lpc-uart.c index 4b068b72b2e8..0800a7d8371d 100644 --- a/hw/lpc-uart.c +++ b/hw/lpc-uart.c @@ -450,14 +450,6 @@ void uart_setup_opal_console(void) /* Allocate an input buffer */ in_buf = zalloc(IN_BUF_SIZE); out_buf = zalloc(OUT_BUF_SIZE); - prlog(PR_DEBUG, "UART: Enabled as OS console\n"); - - /* Register OPAL APIs */ - opal_register(OPAL_CONSOLE_READ, uart_opal_read, 3); - opal_register(OPAL_CONSOLE_WRITE_BUFFER_SPACE, - uart_opal_write_buffer_space, 2); - opal_register(OPAL_CONSOLE_WRITE, uart_opal_write, 3); - opal_register(OPAL_CONSOLE_FLUSH, uart_opal_flush, 1); opal_add_poller(uart_console_poll, NULL); }