From patchwork Tue Dec 20 06:03:36 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: 707325 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tjS8n315gz9t0w for ; Tue, 20 Dec 2016 17:11:21 +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="fGz8D+cb"; 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 3tjS8n1wgGzDwS6 for ; Tue, 20 Dec 2016 17:11:21 +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="fGz8D+cb"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::243]) (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 3tjS0T3LWHzDwVS for ; Tue, 20 Dec 2016 17:04:09 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fGz8D+cb"; dkim-atps=neutral Received: by mail-pg0-x243.google.com with SMTP id g1so8901860pgn.0 for ; Mon, 19 Dec 2016 22:04:09 -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=G9dNxVO0U9qXXE+8++IPWx2gscNmXkFZa3g+r9ULyCM=; b=fGz8D+cbZEhFXb2RtbHivE5zqabIQlSyKYsrocyXOyPDOlP0ZFuZEV1DzD5l78mb5z n/Mz8AsnX7rWMJOlQFDkbuSJ3N6EcH+vp3hNuiYkLNiR4FVOpRc690XSYO43r1tpdWce MhVfH9olyNtQuV8oTxfxrxvnOKdZXWZLMXhsf6wvEJ3zPPczHqrig6SaZbGpEm0hhSqi 5vtDWI12VP2EzfFc8lmj4G4opj35PVWNr3QrSYXyF3B16elCpEQEd5a16CMsunb5bP08 ZMP55wmsdlW+lqxohOlcgzqLIebwdDvnd5nslP/R0Qs6kXpnxsKjQQIIuLxm1AiJu/em bDuA== 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=G9dNxVO0U9qXXE+8++IPWx2gscNmXkFZa3g+r9ULyCM=; b=fB3nkA3Q0cLV3VNGprf8UOnXKM83cjifEW5h5RX4LbQCtruzudIWSiRsTLN07yv1qe pKOTEVq63T4zWr+B0sD6Q/yjPB0ZtkYJ3Lw1LgjFmNp2ASTk04Rw+JAeKdwZX5aT0oD0 vJhVX4M1FCp4g/Eu4wjCqjXqX3pl7uXxqm8knzC7Gsvy7lw4s6SrhrWty1lPF6g+tdF1 Gk/07kglJQOm3lhgc7jDVx3E5Vd/oHFcQemW5r0UsE1Up8lIfVyaXH0koR+yRtimlMYy hG94UF8ioISbobr5KJtsh9ewsQbtbBXhWFa8SoWXNTXCUrFVa0M926/KRcyWWkHP5wiQ Ij+A== X-Gm-Message-State: AKaTC01qV8Ef+LIl5gYRUywg5K7ve+gTtgqw0rhisnuS7hs2/1d37TdLISB13qCAH7xIfA== X-Received: by 10.99.213.21 with SMTP id c21mr32848259pgg.137.1482213847640; Mon, 19 Dec 2016 22:04:07 -0800 (PST) Received: from flat-canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id u64sm28213696pgc.39.2016.12.19.22.04.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Dec 2016 22:04:07 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Tue, 20 Dec 2016 17:03:36 +1100 Message-Id: <1482213825-30448-6-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482213825-30448-1-git-send-email-oohall@gmail.com> References: <1482213825-30448-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [PATCH v2 05/14] 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. Signed-off-by: Oliver O'Halloran Reviewed-by: Andrew Donnellan --- core/console.c | 41 --------------------- platforms/mambo/Makefile.inc | 2 +- platforms/mambo/console.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ platforms/mambo/mambo.c | 10 ------ 4 files changed, 85 insertions(+), 52 deletions(-) create mode 100644 platforms/mambo/console.c diff --git a/core/console.c b/core/console.c index bb8a8b4bbe8f..bb0bdef13f7d 100644 --- a/core/console.c +++ b/core/console.c @@ -61,47 +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/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..9bf4050b3a5d --- /dev/null +++ b/platforms/mambo/console.c @@ -0,0 +1,84 @@ +/* Copyright 2015 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 +#include +#include +#include +#include +#include + +#include "mambo.h" + +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); +} + +/* + * mambo_console_read() will return -1 if there is no character to read. There's + * no explicit polling method so we "poll" by doing a read. If successful we + * stash the character until an actual read operation. + */ +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[count++] = mambo_char; + mambo_char = -1; + } + + 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); +} 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();