From patchwork Mon Jan 23 16:04:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9532913 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 45DE66020B for ; Mon, 23 Jan 2017 16:04:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 34AD52845D for ; Mon, 23 Jan 2017 16:04:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2981B28460; Mon, 23 Jan 2017 16:04:44 +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 9BA052845D for ; Mon, 23 Jan 2017 16:04:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751541AbdAWQEn (ORCPT ); Mon, 23 Jan 2017 11:04:43 -0500 Received: from mail-wj0-f195.google.com ([209.85.210.195]:33618 "EHLO mail-wj0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751533AbdAWQEm (ORCPT ); Mon, 23 Jan 2017 11:04:42 -0500 Received: by mail-wj0-f195.google.com with SMTP id un2so2301989wjb.0; Mon, 23 Jan 2017 08:04:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=btFdn6R9A24kOiGmnWJBVw4WFqf/X7CGpn0egEt9VQE=; b=ASBhVMaDxGsB12wSZKM2SDkNSpo5iaOQ+oF03R4k8qu52JPwjkDTjC8WKkX6vTEOql w5qvRJ3f88C8rU593uM4gwBthqAwxDt26rBdkwItUWgCcnzd8Yg8Ais4cl7pfnY0y0+d mWtbvDSGZm8MImZDDRMlJGxNcdiKZgrAytzo0N+obc82oj3PiXNZw1IDCmPR1Lz9P2rY x1iC/i18jNeIzjdvbOpag13y9GBLT7bzns5K/6WJ/wzIbKAsaJ63MdqFwvEoRtnXSEmJ WZcmXvdyb0jW2zkUJywaKbV7Oe4mFoaBmSB3QBKymuxOjDm0ZHHGZTSsOlO0eZF2koYh +8/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=btFdn6R9A24kOiGmnWJBVw4WFqf/X7CGpn0egEt9VQE=; b=NT7EzbhbdihK+dpIx3Xwh8WQxFwYUFR5Cl2l7kQssq09vLDPQJc0zL63eIfZOO2B8T 4WGLuYu0YLbhezBTDFfd8x2ZwBAHzN5BSeixhBtJlR7lpaC8eRMs0XZYrO8oPEPUhVCi +vygIsxC47TfVqMfeRpBEni65I266Edd4w16mR3kBB8VU5JmhFRPIJxFsKjFMqr5cdFk hPxkNb87kKV1w2H1nBrBYxq0p1xSPRHFRiYatYeEelrCtACmXQIC0VFgYFhGe3hqBOX4 oNoGDfuGfDfDzM1xdKZKgifHbMI/tBZ5MNX11/co3fIKFvsQOUK4Q3PwcgyA1qAWYMhh 0VqQ== X-Gm-Message-State: AIkVDXIhUJL1uGfCEh+LfggaulJbAFGjbdbZIUK6xJmnoL581I/tq2PP7vgRWXCvns/PxA== X-Received: by 10.223.170.221 with SMTP id i29mr30020137wrc.131.1485187480198; Mon, 23 Jan 2017 08:04:40 -0800 (PST) Received: from groucho.site (ipbcc0353e.dynamic.kabel-deutschland.de. [188.192.53.62]) by smtp.gmail.com with ESMTPSA id 204sm21788033wmj.7.2017.01.23.08.04.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 08:04:39 -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, sergei.shtylyov@cogentembedded.com, Ulrich Hecht Subject: [PATCH v2 5/7] serial: sh-sci: SCIFA/B RX FIFO software timeout Date: Mon, 23 Jan 2017 17:04:16 +0100 Message-Id: <1485187458-8195-6-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485187458-8195-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1485187458-8195-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 Implements support for FIFO fill thresholds greater than one with software timeout. This mechanism is not possible (or at least not useful) on SCIF family hardware other than SCIFA and SCIFB because they do not support turning off the DR hardware timeout interrupt separately from the RI interrupt. Signed-off-by: Ulrich Hecht --- drivers/tty/serial/sh-sci.c | 102 ++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 33 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index c7e2d0d..034041e 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -141,7 +141,10 @@ struct sci_port { struct timer_list rx_timer; unsigned int rx_timeout; #endif + unsigned int rx_frame; int rx_trigger; + struct timer_list rx_fifo_timer; + int rx_fifo_timeout; bool autorts; }; @@ -1162,6 +1165,24 @@ static int scif_set_rtrg(struct uart_port *port, int rx_trig) return rx_trig; } +static int scif_rtrg_enabled(struct uart_port *port) +{ + if (sci_getreg(port, HSRTRGR)->size) + return serial_port_in(port, HSRTRGR) != 0; + else + return (serial_port_in(port, SCFCR) & + (SCFCR_RTRG0 | SCFCR_RTRG1)) != 0; +} + +static void rx_fifo_timer_fn(unsigned long arg) +{ + struct sci_port *s = (struct sci_port *)arg; + struct uart_port *port = &s->port; + + dev_dbg(port->dev, "Rx timed out\n"); + scif_set_rtrg(port, 1); +} + #ifdef CONFIG_SERIAL_SH_SCI_DMA static void sci_dma_tx_complete(void *arg) { @@ -1608,9 +1629,9 @@ static inline void sci_free_dma(struct uart_port *port) static irqreturn_t sci_rx_interrupt(int irq, void *ptr) { -#ifdef CONFIG_SERIAL_SH_SCI_DMA struct uart_port *port = ptr; struct sci_port *s = to_sci_port(port); +#ifdef CONFIG_SERIAL_SH_SCI_DMA if (s->chan_rx) { u16 scr = serial_port_in(port, SCSCR); @@ -1636,6 +1657,14 @@ static irqreturn_t sci_rx_interrupt(int irq, void *ptr) } #endif + if (s->rx_trigger > 1 && s->rx_fifo_timeout > 0) { + if (!scif_rtrg_enabled(port)) + scif_set_rtrg(port, s->rx_trigger); + + mod_timer(&s->rx_fifo_timer, jiffies + DIV_ROUND_UP( + s->rx_frame * s->rx_fifo_timeout, 1000)); + } + /* I think sci_receive_chars has to be called irrespective * of whether the I_IXOFF is set, otherwise, how is the interrupt * to be disabled? @@ -2221,14 +2250,20 @@ static void sci_reset(struct uart_port *port) serial_port_out(port, SCLSR, status); } - if (s->rx_trigger > 1) - scif_set_rtrg(port, s->rx_trigger); + if (s->rx_trigger > 1) { + if (s->rx_fifo_timeout) { + scif_set_rtrg(port, 1); + setup_timer(&s->rx_fifo_timer, rx_fifo_timer_fn, + (unsigned long)s); + } else + scif_set_rtrg(port, s->rx_trigger); + } } static void sci_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) { - unsigned int baud, smr_val = SCSMR_ASYNC, scr_val = 0, i; + unsigned int baud, smr_val = SCSMR_ASYNC, scr_val = 0, i, bits; unsigned int brr = 255, cks = 0, srr = 15, dl = 0, sccks = 0; unsigned int brr1 = 255, cks1 = 0, srr1 = 15, dl1 = 0; struct sci_port *s = to_sci_port(port); @@ -2427,7 +2462,6 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, udelay(DIV_ROUND_UP(10 * 1000000, baud)); } -#ifdef CONFIG_SERIAL_SH_SCI_DMA /* * Calculate delay for 2 DMA buffers (4 FIFO). * See serial_core.c::uart_update_timeout(). @@ -2438,36 +2472,34 @@ static void sci_set_termios(struct uart_port *port, struct ktermios *termios, * value obtained by this formula is too small. Therefore, if the value * is smaller than 20ms, use 20ms as the timeout value for DMA. */ - if (s->chan_rx) { - unsigned int bits; + /* byte size and parity */ + switch (termios->c_cflag & CSIZE) { + case CS5: + bits = 7; + break; + case CS6: + bits = 8; + break; + case CS7: + bits = 9; + break; + default: + bits = 10; + break; + } - /* byte size and parity */ - switch (termios->c_cflag & CSIZE) { - case CS5: - bits = 7; - break; - case CS6: - bits = 8; - break; - case CS7: - bits = 9; - break; - default: - bits = 10; - break; - } + if (termios->c_cflag & CSTOPB) + bits++; + if (termios->c_cflag & PARENB) + bits++; - if (termios->c_cflag & CSTOPB) - bits++; - if (termios->c_cflag & PARENB) - bits++; - s->rx_timeout = DIV_ROUND_UP((s->buf_len_rx * 2 * bits * HZ) / - (baud / 10), 10); - dev_dbg(port->dev, "DMA Rx t-out %ums, tty t-out %u jiffies\n", - s->rx_timeout * 1000 / HZ, port->timeout); - if (s->rx_timeout < msecs_to_jiffies(20)) - s->rx_timeout = msecs_to_jiffies(20); - } + s->rx_frame = (100 * bits * HZ) / (baud / 10); +#ifdef CONFIG_SERIAL_SH_SCI_DMA + s->rx_timeout = DIV_ROUND_UP(s->buf_len_rx * 2 * s->rx_frame, 1000); + dev_dbg(port->dev, "DMA Rx t-out %ums, tty t-out %u jiffies\n", + s->rx_timeout * 1000 / HZ, port->timeout); + if (s->rx_timeout < msecs_to_jiffies(20)) + s->rx_timeout = msecs_to_jiffies(20); #endif if ((termios->c_cflag & CREAD) != 0) @@ -2727,6 +2759,7 @@ static int sci_init_single(struct platform_device *dev, sci_port->overrun_reg = SCxSR; sci_port->overrun_mask = SCIFA_ORER; sci_port->sampling_rate_mask = SCI_SR_SCIFAB; + sci_port->rx_trigger = 48; break; case PORT_HSCIF: port->fifosize = 128; @@ -2740,6 +2773,7 @@ static int sci_init_single(struct platform_device *dev, sci_port->overrun_reg = SCxSR; sci_port->overrun_mask = SCIFA_ORER; sci_port->sampling_rate_mask = SCI_SR_SCIFAB; + sci_port->rx_trigger = 32; break; case PORT_SCIF: if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) { @@ -2766,6 +2800,8 @@ static int sci_init_single(struct platform_device *dev, break; } + sci_port->rx_fifo_timeout = 0; + /* SCIFA on sh7723 and sh7724 need a custom sampling rate that doesn't * match the SoC datasheet, this should be investigated. Let platform * data override the sampling rate for now.