From patchwork Fri Dec 9 12:36:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9468115 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9EC89607D8 for ; Fri, 9 Dec 2016 12:36:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92C5728624 for ; Fri, 9 Dec 2016 12:36:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 87AB128632; Fri, 9 Dec 2016 12:36:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31C4228624 for ; Fri, 9 Dec 2016 12:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933563AbcLIMg0 (ORCPT ); Fri, 9 Dec 2016 07:36:26 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:34796 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933568AbcLIMgZ (ORCPT ); Fri, 9 Dec 2016 07:36:25 -0500 Received: by mail-wm0-f65.google.com with SMTP id g23so3808786wme.1; Fri, 09 Dec 2016 04:36:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=hvTKPI3HYs3Nm8o7yEGm5gs9XhfVv1i+gMAjsKY+SgM=; b=1GGFG51JexSKGvF5WuGJD2V80sySFNP9vDfc5drcEhyECUGK4CIBw9Aq+zloLjSaLx +SdGv2DV6x1KilGs/5iRaBKQ82sQUsC/4RQBSeIZMYsEEG58foIKQlJN+CtsWSIg8PvJ kynQH74p5rJ0tNQXnH9aPBBgL4LfZyyhuhJv+BDaFxNTikKcfTpTvFu1Z2EI7a20Qs3o iot9UjnG1WDCT6d4ehqenT2aIss5cxFLt2J3yMs2fsMca9d41kjUZpHrT0Cgy0rQ/6xT ZDDvEMlaY7YNefeKMT6Ec8AOqO2h0bA6a5r2JGNi+0EKVazJnkAu+GZ4qAaXH6S5mag6 v2Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=hvTKPI3HYs3Nm8o7yEGm5gs9XhfVv1i+gMAjsKY+SgM=; b=XbBCso3aRhGKMkQ+kEywo0p4FwHuHZkvHwRYsyoYEjbWJYQBUH46JI9CQTO9TNwmEP cSB9VbA+jsMhOpIktOeRfCl3zlmb+OGBSbd+jgLL9iiXChrVFFykaR0QY+huZUPfwTla Na+2F+bMRM+DQRgGNTRWQcVZEOMmDXMhRDHqjBQpskLHXjq0ZE6mmg6CmTpWfqjl/ghR t6x4R5NMfoEaDfYevd3knYouNgnL+312H5yO1pXajtYku0yCnIxw8+Zvl1uQJDr+psKD UkdGvpqO8UUTYoNt1qNSCiN664GZeUzIMZvd5WjPE6qzB6ZgcIT4TNxFsKksM6aYXdRV bGrg== X-Gm-Message-State: AKaTC01T9vUZV+x7fUfkALwWgD7F2fiAdEfBGQjvWnEWWIw5EzdXRZo58CI4+k6BNDn/JQ== X-Received: by 10.28.126.18 with SMTP id z18mr1945386wmc.87.1481286983972; Fri, 09 Dec 2016 04:36:23 -0800 (PST) Received: from groucho.site (ipbcc17b88.dynamic.kabel-deutschland.de. [188.193.123.136]) by smtp.gmail.com with ESMTPSA id d10sm42068758wja.20.2016.12.09.04.36.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Dec 2016 04:36:23 -0800 (PST) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org, wsa@the-dreams.de, geert@linux-m68k.org Cc: linux-serial@vger.kernel.org, magnus.damm@gmail.com, Ulrich Hecht Subject: [PATCH 6/7] serial: sh-sci: make RX FIFO parameters tunable via sysfs Date: Fri, 9 Dec 2016 13:36:10 +0100 Message-Id: <1481286971-16667-7-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481286971-16667-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1481286971-16667-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Allows tuning of the RX FIFO fill threshold and timeout. (The latter is only applicable to SCIFA and SCIFB). Signed-off-by: Ulrich Hecht --- drivers/tty/serial/sh-sci.c | 82 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 0af4997..5ad08d6 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1180,6 +1180,66 @@ static void rx_fifo_timer_fn(unsigned long arg) scif_set_rtrg(port, 1); } +static ssize_t rx_trigger_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct uart_port *port = dev_get_drvdata(dev); + struct sci_port *sci = to_sci_port(port); + + return sprintf(buf, "%d\n", sci->rx_trigger); +} + +static ssize_t rx_trigger_store(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) +{ + struct uart_port *port = dev_get_drvdata(dev); + struct sci_port *sci = to_sci_port(port); + long r; + + if (kstrtol(buf, 0, &r) == -EINVAL) + return -EINVAL; + sci->rx_trigger = scif_set_rtrg(port, r); + scif_set_rtrg(port, 1); + return count; +} + +static DEVICE_ATTR(rx_fifo_trigger, 0644, rx_trigger_show, rx_trigger_store); + +static ssize_t rx_fifo_timeout_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct uart_port *port = dev_get_drvdata(dev); + struct sci_port *sci = to_sci_port(port); + + return sprintf(buf, "%d\n", sci->rx_fifo_timeout); +} + +static ssize_t rx_fifo_timeout_store(struct device *dev, + struct device_attribute *attr, + const char *buf, + size_t count) +{ + struct uart_port *port = dev_get_drvdata(dev); + struct sci_port *sci = to_sci_port(port); + long r; + + if (kstrtol(buf, 0, &r) == -EINVAL) + return -EINVAL; + sci->rx_fifo_timeout = r; + scif_set_rtrg(port, 1); + if (r > 0) + setup_timer(&sci->rx_fifo_timer, rx_fifo_timer_fn, + (unsigned long)sci); + return count; +} + +static DEVICE_ATTR(rx_fifo_timeout, 0644, rx_fifo_timeout_show, rx_fifo_timeout_store); + + #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { @@ -3028,6 +3088,15 @@ static int sci_remove(struct platform_device *dev) sci_cleanup_single(port); + if (port->port.fifosize > 1) { + sysfs_remove_file(&dev->dev.kobj, + &dev_attr_rx_fifo_trigger.attr); + } + if (port->port.type == PORT_SCIFA || port->port.type == PORT_SCIFB) { + sysfs_remove_file(&dev->dev.kobj, + &dev_attr_rx_fifo_timeout.attr); + } + return 0; } @@ -3193,6 +3262,19 @@ static int sci_probe(struct platform_device *dev) if (ret) return ret; + if (sp->port.fifosize > 1) { + ret = sysfs_create_file(&dev->dev.kobj, + &dev_attr_rx_fifo_trigger.attr); + if (ret) + return ret; + } + if (sp->port.type == PORT_SCIFA || sp->port.type == PORT_SCIFB) { + ret = sysfs_create_file(&dev->dev.kobj, + &dev_attr_rx_fifo_timeout.attr); + if (ret) + return ret; + } + #ifdef CONFIG_SH_STANDARD_BIOS sh_bios_gdb_detach(); #endif