From patchwork Wed Dec 21 04:52:27 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: 707641 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tk2Nn5k3Qz9t0q for ; Wed, 21 Dec 2016 15:53:45 +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="lGFZpo3w"; 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 3tk2Nn4gHlzDwZ4 for ; Wed, 21 Dec 2016 15:53:45 +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="lGFZpo3w"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::242]) (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 3tk2Mr2Zf1zDwXF for ; Wed, 21 Dec 2016 15:52:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lGFZpo3w"; dkim-atps=neutral Received: by mail-pg0-x242.google.com with SMTP id i5so5166985pgh.2 for ; Tue, 20 Dec 2016 20:52:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=evk8Zp0dYE5jZ89iR8etNzT0Nt64xAHvXQp9aiv6T9s=; b=lGFZpo3w9M1kjFi/1g5IW9OYXhsawtvNVVX6bUq0OHsHIDo1/TEuh87okHp2A1eLNC H/tRSXjG7CoVBw0uyczS+AznyMubf+2/VTnjO3PrndoUBNOfxcXKtj9Q5UcDxWY7hqfs S09MiAmJaZup+OlHBTpKsS+qmzO8mNDJ/LxV9eI3KWA+jE1XlRQV4BIrjWHq15wFPxYF OMDK9nq+/9zMo8AaPuZVGr+FeuzxFkaye69cIBpuYP73TUdTgvU0NNFh09h7jBTYCf8B +4H3GP9mhAz+VZpRuC3PCBj2nFrDqPjSHqf/zKPbdZeo389Kc4T+FmEtKjI5qk5zS03z QZHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=evk8Zp0dYE5jZ89iR8etNzT0Nt64xAHvXQp9aiv6T9s=; b=dqggdf/9Au/mIJUU4rClcmJ4ThTvB9q3hwHcoMAl6LuX+9/NIcJyMysn7MVyCq1Zdu ydxUFFMRN20UCcWKTwKWYFJQrDmE/mpvl8dus+a2dklvWUlqbDpaGPYUhxVn+cp0si1g ihz9zUfrFY/BNmaPHrEDFbWJNbbd04k6xhRF1hxHR4NEhlkVyJLZkdaUALeehd04ByM4 S8y4ZVrwOF/brzhrh/j5ITmoyI+ruch5gZhiDrmXPn4KCb5YAAh2dqZ8tSIl9xARsI1Z +IxunDSA1gGINV/E3/Sp6SxNvJ44UrlGhbXoXbR3f85IINJ5NlT5Q0pJGgRomrZr5buk 8lAw== X-Gm-Message-State: AIkVDXI9T8v5weGJgDnnsv9RwpHl2q5wvdr/UEQbGhI2rjV28H5umFaelMN4dmDs0JcMcA== X-Received: by 10.99.140.12 with SMTP id m12mr4574855pgd.174.1482295974458; Tue, 20 Dec 2016 20:52:54 -0800 (PST) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id 29sm1289001pfo.58.2016.12.20.20.52.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Dec 2016 20:52:54 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Wed, 21 Dec 2016 15:52:27 +1100 Message-Id: <1482295952-30060-6-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482295952-30060-1-git-send-email-oohall@gmail.com> References: <1482295952-30060-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [PATCH v3 05/10] console: move mambo con_ops into the platform 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" There's no need for this to be in the skiboot core console code. Also do a few cleanups while we're shovling code around. Signed-off-by: Oliver O'Halloran Reviewed-by: Andrew Donnellan --- v2 -> v3: Removed redundant functions --- core/console.c | 42 --------------------------- include/console.h | 3 +- platforms/mambo/Makefile.inc | 2 +- platforms/mambo/console.c | 68 ++++++++++++++++++++++++++++++++++++++++++++ platforms/mambo/mambo.c | 10 ------- 5 files changed, 70 insertions(+), 55 deletions(-) create mode 100644 platforms/mambo/console.c diff --git a/core/console.c b/core/console.c index 10f105d437fe..bb0bdef13f7d 100644 --- a/core/console.c +++ b/core/console.c @@ -61,48 +61,6 @@ void force_dummy_console(void) NULL, 0); } - -static int mambo_char = -1; - -static bool mambo_con_poll_read(void) -{ - if (mambo_char < 0) - mambo_char = mambo_console_read(); - return mambo_char >= 0; -} - -static size_t mambo_con_read(char *buf, size_t len) -{ - size_t count = 0; - - while(count < len) { - if (!mambo_con_poll_read()) - break; - *(buf++) = mambo_char; - mambo_char = -1; - count++; - } - return count; -} - -static size_t mambo_con_write(const char *buf, size_t len) -{ - mambo_console_write(buf, len); - return len; -} - -static struct con_ops mambo_con_driver = { - .poll_read = mambo_con_poll_read, - .read = mambo_con_read, - .write = mambo_con_write, -}; - -void enable_mambo_console(void) -{ - prlog(PR_NOTICE, "Enabling Mambo console\n"); - set_console(&mambo_con_driver); -} - /* * Helper function for adding /ibm,opal/consoles/serial@ nodes */ diff --git a/include/console.h b/include/console.h index 6a80bef96c7a..08d2961e527a 100644 --- a/include/console.h +++ b/include/console.h @@ -61,8 +61,7 @@ extern void set_console(struct con_ops *driver); extern void console_complete_flush(void); -extern int mambo_console_read(void); -extern void mambo_console_write(const char *buf, size_t count); +extern size_t mambo_console_write(const char *buf, size_t count); extern void enable_mambo_console(void); ssize_t console_write(bool flush_to_drivers, const void *buf, size_t count); diff --git a/platforms/mambo/Makefile.inc b/platforms/mambo/Makefile.inc index 2cc86136dc71..f3023ef0194d 100644 --- a/platforms/mambo/Makefile.inc +++ b/platforms/mambo/Makefile.inc @@ -1,6 +1,6 @@ SUBDIRS += $(PLATDIR)/mambo -MAMBO_OBJS = mambo.o +MAMBO_OBJS = mambo.o console.o MAMBO = $(PLATDIR)/mambo/built-in.o $(MAMBO): $(MAMBO_OBJS:%=$(PLATDIR)/mambo/%) diff --git a/platforms/mambo/console.c b/platforms/mambo/console.c new file mode 100644 index 000000000000..c7d7ab030c30 --- /dev/null +++ b/platforms/mambo/console.c @@ -0,0 +1,68 @@ +/* Copyright 2016 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include +#include + +#include "mambo.h" + +/* + * The SIM_READ_CONSOLE callout will return -1 if there is no character to read. + * There's no explicit poll callout so we "poll" by doing a read and stashing + * the result until we do an actual read. + */ +static int mambo_char = -1; + +static bool mambo_console_poll(void) +{ + if (mambo_char < 0) + mambo_char = callthru0(SIM_READ_CONSOLE_CODE); + + return mambo_char >= 0; +} + +static size_t mambo_console_read(char *buf, size_t len) +{ + size_t count = 0; + + while (count < len) { + if (!mambo_console_poll()) + break; + + buf[count++] = mambo_char; + mambo_char = -1; + } + + return count; +} + +size_t mambo_console_write(const char *buf, size_t len) +{ + callthru2(SIM_WRITE_CONSOLE_CODE, (unsigned long)buf, len); + return len; +} + +static struct con_ops mambo_con_driver = { + .poll_read = mambo_console_poll, + .read = mambo_console_read, + .write = mambo_console_write, +}; + +void enable_mambo_console(void) +{ + prlog(PR_NOTICE, "Enabling Mambo console\n"); + set_console(&mambo_con_driver); +} diff --git a/platforms/mambo/mambo.c b/platforms/mambo/mambo.c index a5788b872585..807931392bf0 100644 --- a/platforms/mambo/mambo.c +++ b/platforms/mambo/mambo.c @@ -211,16 +211,6 @@ static void mambo_rtc_init(void) opal_register(OPAL_RTC_READ, mambo_rtc_read, 2); } -int mambo_console_read(void) -{ - return callthru0(SIM_READ_CONSOLE_CODE); -} - -void mambo_console_write(const char *buf, size_t count) -{ - callthru2(SIM_WRITE_CONSOLE_CODE, (unsigned long)buf, count); -} - static void mambo_platform_init(void) { force_dummy_console();