From patchwork Fri Nov 18 05:01:43 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: 696412 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 3tKm911XGPz9t0X for ; Fri, 18 Nov 2016 16:03:17 +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="jGaKSrTH"; 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 3tKm910SF3zDvx0 for ; Fri, 18 Nov 2016 16:03:17 +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="jGaKSrTH"; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pg0-x241.google.com (mail-pg0-x241.google.com [IPv6:2607:f8b0:400e:c05::241]) (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 3tKm7x53lqzDvwD for ; Fri, 18 Nov 2016 16:02:21 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jGaKSrTH"; dkim-atps=neutral Received: by mail-pg0-x241.google.com with SMTP id x23so19509013pgx.3 for ; Thu, 17 Nov 2016 21:02:21 -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=3vfqmMpo3SL1yALPnZw+pH5UHg/tJuDLGFBbmdX9fUA=; b=jGaKSrTHzsXcpeoxziqoqlRccJ07FlwSsw2kO34n1A7LVlV8E+1hLSy6jPtpcY899e ppReFbPEpkn1xbedZ8DvEeLhQms7JiEnAO5gt2SOimUBeLUC+8jHXbxtfuHA1ZqOlVcu srb8/VSg1YgGcDLolpi4VrbAd6tLWgi9GjGPtrVVcflEpnz1qOJOKlW/vQOzaKohy9lC 9egZIBYZQLFKYZ/+ar7UnCM8uryZ46eDp29IkeQxCj3eBGRmir5MFBZO4FJkyZimbZrd 9hCKIpwrV6Nu3eNTHr6s0Wl9YSApN5L4mwjYg8qwGc6+qSGmow17auLR78Gs6vwhvYNP xLBw== 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=3vfqmMpo3SL1yALPnZw+pH5UHg/tJuDLGFBbmdX9fUA=; b=fZEryCqpF/GLFLnDytEk/OXkonqnw4furBVwMjeUDQIt0XCyofrjkOXufIbT9f2vjb n6XBoj80HD2j0eIpmRE6D0FOsiNZiRTdlUM4qCDLKZqUbUqX+/+l9OrAzu/eT5Nqr7aL oF+QF/ETy/4/kxxCOFsEW9pqEsQUPfu0OopV6/nZ42fq9iRp3sryHZU5NTz8ufoCCdeK hrJMNewEWW4osLm83Ixn/zG5kZSX+r1J8VuboFXFlB+em/TwFhDVIN4kcwxpRNLYDkl/ MjxMiHBGqeG98GRsunZU+JsSCAmspvmUs+wu3fwlXXfcc7bZdqxNW225LS+cmpLNxwMc c2sA== X-Gm-Message-State: ABUngvdMrLNcMDaji3dfQZS9WCEtAa2d5T8dNw+rrfDRvIpcTjR5iqur5JezhD6+Qaxy6A== X-Received: by 10.99.105.70 with SMTP id e67mr14556411pgc.99.1479445339669; Thu, 17 Nov 2016 21:02:19 -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.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Nov 2016 21:02:19 -0800 (PST) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Fri, 18 Nov 2016 16:01:43 +1100 Message-Id: <1479445312-12382-6-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 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 --- core/console.c | 41 --------------------- platforms/mambo/Makefile.inc | 2 +- platforms/mambo/console.c | 86 ++++++++++++++++++++++++++++++++++++++++++++ platforms/mambo/mambo.c | 10 ------ 4 files changed, 87 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..f2fe2357e010 --- /dev/null +++ b/platforms/mambo/console.c @@ -0,0 +1,86 @@ +/* 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();