From patchwork Thu Feb 2 17:10:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9552587 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 E97C2602F0 for ; Thu, 2 Feb 2017 17:10:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DED661FFC9 for ; Thu, 2 Feb 2017 17:10:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D3D442849C; Thu, 2 Feb 2017 17:10:50 +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 84D011FFC9 for ; Thu, 2 Feb 2017 17:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751802AbdBBRKu (ORCPT ); Thu, 2 Feb 2017 12:10:50 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:32934 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175AbdBBRKs (ORCPT ); Thu, 2 Feb 2017 12:10:48 -0500 Received: by mail-wm0-f67.google.com with SMTP id v77so5319333wmv.0; Thu, 02 Feb 2017 09:10:47 -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=5PJA/j9FDzqlpy/hRQdnLGbC2cBE2+ISHBx/RFxXis0=; b=tIbszelF1YWTtnkmZKS+KsA2KGjbSJU5oqOMY6YHo5KHndm/V3Akt55e5nv5XgE3W7 Zs7xKWnNiFl3Dvka6AIMAXy8RAJs0f8V2ueppFwCthQXs8OJwymhP5uPDTgqbmy0RAUS jJDfw9tDpHE0u8YAbI6IsDTRClCADaIPLHJoKxF/ew9EQJDrJf611mC5l/B1PYdKZ8dp FeS64OGzgvad0Xkus4jdvHNLR+PWzCcyHX2l/kQA6HfK31DKXcpqPxV/rKdhTx+fQZt8 gVTE6LQl0DMJBKX/K8L98XzC2M/XZN162LcWJJx//HBZbIZr2dNMPl4XErbwCHflRdFR nOjA== 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=5PJA/j9FDzqlpy/hRQdnLGbC2cBE2+ISHBx/RFxXis0=; b=NXs6/DpRIgcKzahV2FgvwEjgGlZrXHAWd9yKsur6vGUEX+WnChNfihRKDWZI82hWtP 3E5Zxsc24EpBvD15ObhopQsWTaKhu2Z4Locf4B2/FvANbpJ+x5mB3fh0yAnztF8C8VVn OfCeuqDMV0DqT3zV5pGnnnC/To9P6mr8TLWTDmMFasJ+TBSZk4GwID5NxgIA1Q/O/lto gvkF03fmrYiBTPsP91fUOi13j/nR/7GL9uFiyxfe0yUABTVVzIddIMUdMqxS2SryewFF uiDnG095w/n7q1Q4tsJp+KW/umSHTeMDg/ACSn9l3J54lelX1biyKXl+YeEqO6M07I3v v2OQ== X-Gm-Message-State: AIkVDXKlM3yt3fxwGRqAxUyTutMw+s61K+3L/Aale5C7nLUG1g6jhVuT3Oalh0xqUqBXEg== X-Received: by 10.28.217.136 with SMTP id q130mr8614433wmg.13.1486055446383; Thu, 02 Feb 2017 09:10:46 -0800 (PST) Received: from groucho.site (ipbcc0353e.dynamic.kabel-deutschland.de. [188.192.53.62]) by smtp.gmail.com with ESMTPSA id l67sm4146040wmf.1.2017.02.02.09.10.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 02 Feb 2017 09:10:45 -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, gregkh@linuxfoundation.org, Ulrich Hecht Subject: [PATCH v3 4/7] serial: sh-sci: increase RX FIFO trigger defaults for (H)SCIF Date: Thu, 2 Feb 2017 18:10:17 +0100 Message-Id: <1486055420-31595-5-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1486055420-31595-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1486055420-31595-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 Sets reasonable trigger defaults for the various SCIF variants. Also corrects the FIFO size for SH7705-style ports. Signed-off-by: Ulrich Hecht Reviewed-by: Geert Uytterhoeven --- drivers/tty/serial/sh-sci.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index b89e6f8..ae9b10a 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -148,6 +148,7 @@ struct sci_port { struct timer_list rx_timer; unsigned int rx_timeout; #endif + int rx_trigger; bool has_rtscts; bool autorts; @@ -450,7 +451,7 @@ static const struct sci_port_params sci_port_params[SCIx_NR_REGTYPES] = { [SCFCR] = { 0x18, 16 }, [SCFDR] = { 0x1c, 16 }, }, - .fifosize = 16, + .fifosize = 64, .overrun_reg = SCxSR, .overrun_mask = SCIFA_ORER, .sampling_rate_mask = SCI_SR(16), @@ -2062,6 +2063,7 @@ static void sci_reset(struct uart_port *port) { const struct plat_sci_reg *reg; unsigned int status; + struct sci_port *s = to_sci_port(port); if (serial_port_in(port, SCSCR) & SCSCR_TE) { do { @@ -2083,6 +2085,9 @@ static void sci_reset(struct uart_port *port) status &= ~(SCLSR_TO | SCLSR_ORER); serial_port_out(port, SCLSR, status); } + + if (s->rx_trigger > 1) + scif_set_rtrg(port, s->rx_trigger); } static void sci_set_termios(struct uart_port *port, struct ktermios *termios, @@ -2621,6 +2626,28 @@ static int sci_init_single(struct platform_device *dev, if (unlikely(sci_port->params == NULL)) return -EINVAL; + switch (p->type) { + case PORT_SCIFB: + sci_port->rx_trigger = 48; + break; + case PORT_HSCIF: + sci_port->rx_trigger = 64; + break; + case PORT_SCIFA: + sci_port->rx_trigger = 32; + break; + case PORT_SCIF: + if (p->regtype == SCIx_SH7705_SCIF_REGTYPE) + /* RX triggering not implemented for this IP */ + sci_port->rx_trigger = 1; + else + sci_port->rx_trigger = 8; + break; + default: + sci_port->rx_trigger = 1; + break; + } + /* 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.