From patchwork Thu Sep 25 09:54:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 37913 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f71.google.com (mail-wg0-f71.google.com [74.125.82.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6215F20560 for ; Thu, 25 Sep 2014 09:55:07 +0000 (UTC) Received: by mail-wg0-f71.google.com with SMTP id y10sf4475585wgg.6 for ; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=dTIG0vRDBDIR3rxmMeTRUOmcmJGGbAUd99xVdbo7zqc=; b=MEBECX+nQ4OGBzj944S2XmgpxzMLlSxxAPi3l3PcnqJRDSLdcXXDb4IeR8swQWP/Nz O0oyuPL/KyePJ3sj/U9RPBdRbzCl3dxBJLy7gWFgrWebYeLDVTzNTaWM1swiEfzSObbR bggiFRLudMCsmM7Pxr2SLoebILCsa7WkigkgZxqll4PsP33Tq9nO8arYdwRsKfumOzyr tDvkeuKMkKeABgeYp9dSgXlXE/31xOf7tHeB6xH6d6mZpPQbdy4eaVVv/U8D0IAf+Ivz 9MskIA3kDIwj3JeBnHfxw7b47GasIi7diD/tv56v9RDH7q/ClMGL9dourcTT51k2IBNi 7hOQ== X-Gm-Message-State: ALoCoQn/uHYTvProHPQuLmGjOQ7gvGgwa6Xoaa9LhcwT9DZQW+bP4sUAHTVkkYUnyMkzXyzdYWw+ X-Received: by 10.112.62.130 with SMTP id y2mr666433lbr.4.1411638906615; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.224.161 with SMTP id rd1ls256714lac.95.gmail; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) X-Received: by 10.112.34.239 with SMTP id c15mr11492665lbj.64.1411638906416; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com [209.85.217.179]) by mx.google.com with ESMTPS id z6si2224043lbi.93.2014.09.25.02.55.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 25 Sep 2014 02:55:06 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id 10so11787341lbg.10 for ; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) X-Received: by 10.152.204.231 with SMTP id lb7mr11997101lac.44.1411638906028; Thu, 25 Sep 2014 02:55:06 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.130.169 with SMTP id of9csp721572lbb; Thu, 25 Sep 2014 02:55:05 -0700 (PDT) X-Received: by 10.66.244.132 with SMTP id xg4mr17714431pac.64.1411638904495; Thu, 25 Sep 2014 02:55:04 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id fq5si2874208pbd.63.2014.09.25.02.55.03 for ; Thu, 25 Sep 2014 02:55:04 -0700 (PDT) Received-SPF: none (google.com: linux-samsung-soc-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751302AbaIYJzC (ORCPT + 6 others); Thu, 25 Sep 2014 05:55:02 -0400 Received: from mailout3.w1.samsung.com ([210.118.77.13]:29201 "EHLO mailout3.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751020AbaIYJzA (ORCPT ); Thu, 25 Sep 2014 05:55:00 -0400 Received: from eucpsbgm2.samsung.com (unknown [203.254.199.245]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0NCG00HG2BODQW30@mailout3.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Thu, 25 Sep 2014 10:57:49 +0100 (BST) X-AuditID: cbfec7f5-b7f776d000003e54-f5-5423e67208d4 Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm2.samsung.com (EUCPMTA) with SMTP id 4A.91.15956.276E3245; Thu, 25 Sep 2014 10:54:58 +0100 (BST) Received: from amdc1339.digital.local ([106.116.147.30]) by eusync3.samsung.com (Oracle Communications Messaging Server 7u4-23.01 (7.0.4.23.0) 64bit (built Aug 10 2011)) with ESMTPA id <0NCG00H55BJHPSC0@eusync3.samsung.com>; Thu, 25 Sep 2014 10:54:58 +0100 (BST) From: Marek Szyprowski To: linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Marek Szyprowski , Alim Akhtar , thomas.ab@samsung.com, Tomasz Figa , Kyungmin Park , Rob Herring Subject: [PATCH v2 1/2] serial: samsung: Add support for early console Date: Thu, 25 Sep 2014 11:54:51 +0200 Message-id: <1411638892-13702-2-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.2 In-reply-to: <1411638892-13702-1-git-send-email-m.szyprowski@samsung.com> References: <1411638892-13702-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEJMWRmVeSWpSXmKPExsVy+t/xq7pFz5RDDNavELJ4MG8bm8XZpjfs FpseX2O1mHF+H5PF2iN32S2+f/vGZtGxjNFi1a4/jA4cHjtn3WX32Lyk3qNvyypGj8+b5AJY orhsUlJzMstSi/TtErgybl57xlxwSLti5q9dTA2M01W7GDk4JARMJNZdkOhi5AQyxSQu3FvP 1sXIxSEksJRR4uzGc6wQTh+TRMujNjaQKjYBQ4mut11gtoiAt8TkM3/ZQYqYBV4wSnQ/+8UM MlVYwE3ixQ1jkBoWAVWJOSv+sIDYvAIeErfeHmWE2CYn8f/lCiYQm1PAU6J76iOwViGgmhed BhMYeRcwMqxiFE0tTS4oTkrPNdIrTswtLs1L10vOz93ECAmnrzsYlx6zOsQowMGoxMPr4a8c IsSaWFZcmXuIUYKDWUmE1/IWUIg3JbGyKrUoP76oNCe1+BAjEwenVAPjpR32kvw9M7T19Gdb mgirG6bvDX60N0tPsZzXyH/R/aM2Pl9XHZ3mb3F27osIwylfrW1yP385sGtDxaLjk67ZGpTx /Uiax5XXFX3acz3rSufD7w1lUvfecjExfrr3vaWx25bKTffKWv20FRwcktY8n+rPYFmp4rW5 U1RccM4MnQ2/n9VuOTVDiaU4I9FQi7moOBEAo2iBFgUCAAA= Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: m.szyprowski@samsung.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Tomasz Figa This patch adds support for early console initialized from device tree and kernel command line to all variants of Samsung serial driver. Signed-off-by: Tomasz Figa [added support for command line based initialization, fixed comment] Signed-off-by: Marek Szyprowski --- Documentation/kernel-parameters.txt | 10 ++++ drivers/tty/serial/Kconfig | 1 + drivers/tty/serial/samsung.c | 103 ++++++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 10d51c2f10d7..12e73c5fc90b 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -938,6 +938,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted. smh Use ARM semihosting calls for early console. + s3c2410,[,options] + s3c2412,[,options] + s3c2440,[,options] + s3c6400,[,options] + s5pv210,[,options] + exynos4210,[,options] + Use early console provided by serial driver available + on Samsung SoCs, requires selecting proper type and + a correct base address of the selected UART port. + earlyprintk= [X86,SH,BLACKFIN,ARM,M68k] earlyprintk=vga earlyprintk=efi diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 26cec64dadd7..e87a2dfd9080 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -222,6 +222,7 @@ config SERIAL_SAMSUNG tristate "Samsung SoC serial support" depends on PLAT_SAMSUNG select SERIAL_CORE + select SERIAL_EARLYCON help Support for the on-chip UARTs on the Samsung S3C24XX series CPUs, providing /dev/ttySAC0, 1 and 2 (note, some machines may not diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c index c78f43a481ce..8ad453a5d845 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c @@ -1856,6 +1856,109 @@ static struct platform_driver samsung_serial_driver = { module_platform_driver(samsung_serial_driver); +/* + * Early console. + */ + +struct samsung_early_console_data { + u32 txfull_mask; +}; + +static void samsung_early_busyuart(struct uart_port *port) +{ + while (!(readl(port->membase + S3C2410_UTRSTAT) & S3C2410_UTRSTAT_TXFE)) + ; +} + +static void samsung_early_busyuart_fifo(struct uart_port *port) +{ + struct samsung_early_console_data *data = port->private_data; + + while (readl(port->membase + S3C2410_UFSTAT) & data->txfull_mask) + ; +} + +static void samsung_early_putc(struct uart_port *port, int c) +{ + if (readl(port->membase + S3C2410_UFCON) & S3C2410_UFCON_FIFOMODE) + samsung_early_busyuart_fifo(port); + else + samsung_early_busyuart(port); + + writeb(c, port->membase + S3C2410_UTXH); +} + +static void samsung_early_write(struct console *con, const char *s, unsigned n) +{ + struct earlycon_device *dev = con->data; + + uart_console_write(&dev->port, s, n, samsung_early_putc); +} + +static int __init samsung_early_console_setup(struct earlycon_device *device, + const char *opt) +{ + if (!device->port.membase) + return -ENODEV; + + device->con->write = samsung_early_write; + return 0; +} + +/* S3C2410 */ +static struct samsung_early_console_data s3c2410_early_console_data = { + .txfull_mask = S3C2410_UFSTAT_TXFULL, +}; + +static int __init s3c2410_early_console_setup(struct earlycon_device *device, + const char *opt) +{ + device->port.private_data = &s3c2410_early_console_data; + return samsung_early_console_setup(device, opt); +} +OF_EARLYCON_DECLARE(s3c2410, "samsung,s3c2410-uart", + s3c2410_early_console_setup); +EARLYCON_DECLARE(s3c2410, s3c2410_early_console_setup); + +/* S3C2412, S3C2440, S3C64xx */ +static struct samsung_early_console_data s3c2440_early_console_data = { + .txfull_mask = S3C2440_UFSTAT_TXFULL, +}; + +static int __init s3c2440_early_console_setup(struct earlycon_device *device, + const char *opt) +{ + device->port.private_data = &s3c2440_early_console_data; + return samsung_early_console_setup(device, opt); +} +OF_EARLYCON_DECLARE(s3c2412, "samsung,s3c2412-uart", + s3c2440_early_console_setup); +OF_EARLYCON_DECLARE(s3c2440, "samsung,s3c2440-uart", + s3c2440_early_console_setup); +OF_EARLYCON_DECLARE(s3c6400, "samsung,s3c6400-uart", + s3c2440_early_console_setup); +EARLYCON_DECLARE(s3c2412, s3c2440_early_console_setup); +EARLYCON_DECLARE(s3c2440, s3c2440_early_console_setup); +EARLYCON_DECLARE(s3c6400, s3c2440_early_console_setup); + +/* S5PV210, EXYNOS */ +static struct samsung_early_console_data s5pv210_early_console_data = { + .txfull_mask = S5PV210_UFSTAT_TXFULL, +}; + +static int __init s5pv210_early_console_setup(struct earlycon_device *device, + const char *opt) +{ + device->port.private_data = &s5pv210_early_console_data; + return samsung_early_console_setup(device, opt); +} +OF_EARLYCON_DECLARE(s5pv210, "samsung,s5pv210-uart", + s5pv210_early_console_setup); +OF_EARLYCON_DECLARE(exynos4210, "samsung,exynos4210-uart", + s5pv210_early_console_setup); +EARLYCON_DECLARE(s5pv210, s5pv210_early_console_setup); +EARLYCON_DECLARE(exynos4210, s5pv210_early_console_setup); + MODULE_ALIAS("platform:samsung-uart"); MODULE_DESCRIPTION("Samsung SoC Serial port driver"); MODULE_AUTHOR("Ben Dooks ");