From patchwork Tue Feb 20 18:20:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 10230683 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 74705601E7 for ; Tue, 20 Feb 2018 18:21:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 633B928827 for ; Tue, 20 Feb 2018 18:21:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 579212884E; Tue, 20 Feb 2018 18:21:54 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B8AB828827 for ; Tue, 20 Feb 2018 18:21:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=qJbqPIaTuGYPikxG+NXAja8mok9/CkkWgeXaPZiaz6k=; b=u24 5QiLXBmNcT2+ylsyr5UuKyPZ268V5GfQq9R2wg7dZCHxjnGXbjgudCBJkXHl9QQMtesbNl/5+hagA yw3xl1AumrxeHdabz0sFG7Pt4kSxI8grxTLhetBPrLlVWz1KW7XnG+GtJr8BD95eNpB4di7ql3zYh 4aCJHoMcABIztODhZnO3p/mJDEZW/HXKHHsVcnWvDlJQpqyUZERu8vtRgvIYnhGK6tz9ouj7ee0ge xYT8T7FXf5AA/Z9vWRkDe1Pc40heMdFqzc0sfLak4l6pQqzrWb0xaiJWTOf+BgzDZTZF7Qc5rwh/N /OmLe7ABGgHdwoT5wnVySoXzFGGFQlQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eoCXw-000463-0m; Tue, 20 Feb 2018 18:21:44 +0000 Received: from mail-ot0-x242.google.com ([2607:f8b0:4003:c0f::242]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eoCXs-00044q-B0 for linux-arm-kernel@lists.infradead.org; Tue, 20 Feb 2018 18:21:42 +0000 Received: by mail-ot0-x242.google.com with SMTP id 79so12250715oth.11 for ; Tue, 20 Feb 2018 10:21:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=boundarydevices-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=F4Aek6BzH1AOCezfoBPsPbu9q5rQeM69ya8Oj+VVe0s=; b=iL8Pi1wgM8M/XtF/yU7HUBTOHaV3T6qEn+3DcGT0h0f/teFCCWYVtrRYFf1T7LONaB HxKd+ld3GKzoRnG1m4x93K/gxxjA5zOLRVWMe9rZnq6JM80AlZPUMqZXozX/EM100E57 PyrwTIf/jpdWCkBSMvaDdiAFw7UdwXnjH+Qh4MQl6FRBZ6150DRpdP9xJtWFnpEehOQa /MSvDl4F9jMZlRgg0bQz0CNDepRSogMOV4WPoGw+qHAk7H4kBrJZAXuk00EHGidesCuC EilEBJgB4WS6TZTau0JkPhvTJrzbcb6L1FWUa7pY20FWElPG0c6jEc01q0R5K7tmzSpS F0YA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=F4Aek6BzH1AOCezfoBPsPbu9q5rQeM69ya8Oj+VVe0s=; b=aCPn+YSAbLJgv3brzSXmDtB0Pd2yXwctEW9SK2Nwk8YFrcEpnvK5EYzJ5w/uZB9Z/E MNl60Xol9pJwlegxOuLxn6yQouXgyLO2FjFSLRKArfVk8nmnLfdjLwoodu8eCOMG8/wH O3D0Sg36WeDUXGzZ2UjHpHJsJktHUR86dR9w7hncoO0JZkP+UeMwL7YoL8A+b4LBb8P7 W/EStt+74IgpUwI+52oxknU3mTxeorsB6mpfNYFvkIVrJHWoagZRE/zW2cIXKXW5rnXs VsteXMmtUO94bhsR/ZoPZbDnWg08fJp7MmwtWnloHBgR2X4huizA+CcDmwqvTA2XNrVc OMoQ== X-Gm-Message-State: APf1xPCLvY9+lk0kMMpstm1oxypUyOe2WT25ts+vnw41T54+m+YzSOtg Ey+gFZbmY0f3OMV0uZnp+XZl2g== X-Google-Smtp-Source: AH8x224JqxQeIjSYhYkri+gM5o36W+vB3gj/QoLncx8CiRldqnMrfqgl8Li3IvW/g+qVIwSHZWdTTQ== X-Received: by 10.157.51.100 with SMTP id u33mr467385otd.26.1519150888584; Tue, 20 Feb 2018 10:21:28 -0800 (PST) Received: from localhost.localdomain (wsip-98-189-142-135.oc.oc.cox.net. [98.189.142.135]) by smtp.googlemail.com with ESMTPSA id h188sm5875397oib.4.2018.02.20.10.21.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Feb 2018 10:21:28 -0800 (PST) From: Troy Kisky To: gregkh@linuxfoundation.org Subject: [PATCH v3 1/1] tty: serial: imx: allow breaks to be received when using dma Date: Tue, 20 Feb 2018 10:20:37 -0800 Message-Id: <20180220182038.4325-1-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 2.14.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180220_102140_508755_8E7E8050 X-CRM114-Status: GOOD ( 13.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mort@bork.org, Troy Kisky , linux-serial@vger.kernel.org, u.kleine-koenig@pengutronix.de, fabio.estevam@nxp.com, linux-arm-kernel@lists.infradead.org, l.stach@pengutronix.de MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This allows me to login after sending a break when service serial-getty@ttymxc0.service is running The "tty_insert_flip_char(port, 0, TTY_BREAK)" in clear_rx_errors fixes this by allowing the higher layers to see a break. Signed-off-by: Troy Kisky Tested-by: Martin Hicks Reviewed-by: Fabio Estevam --- v2: rebase only v3: change commit message as requested by Fabio, add tested-by --- drivers/tty/serial/imx.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 1d7ca382bc12..2eb8c4a20d68 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -927,7 +927,6 @@ static void dma_rx_callback(void *data) status = dmaengine_tx_status(chan, (dma_cookie_t)0, &state); if (status == DMA_ERROR) { - dev_err(sport->port.dev, "DMA transaction error.\n"); clear_rx_errors(sport); return; } @@ -1028,6 +1027,7 @@ static int start_rx_dma(struct imx_port *sport) static void clear_rx_errors(struct imx_port *sport) { + struct tty_port *port = &sport->port.state->port; unsigned int status_usr1, status_usr2; status_usr1 = readl(sport->port.membase + USR1); @@ -1036,12 +1036,18 @@ static void clear_rx_errors(struct imx_port *sport) if (status_usr2 & USR2_BRCD) { sport->port.icount.brk++; writel(USR2_BRCD, sport->port.membase + USR2); - } else if (status_usr1 & USR1_FRAMERR) { - sport->port.icount.frame++; - writel(USR1_FRAMERR, sport->port.membase + USR1); - } else if (status_usr1 & USR1_PARITYERR) { - sport->port.icount.parity++; - writel(USR1_PARITYERR, sport->port.membase + USR1); + if (tty_insert_flip_char(port, 0, TTY_BREAK) == 0) + sport->port.icount.buf_overrun++; + tty_flip_buffer_push(port); + } else { + dev_err(sport->port.dev, "DMA transaction error.\n"); + if (status_usr1 & USR1_FRAMERR) { + sport->port.icount.frame++; + writel(USR1_FRAMERR, sport->port.membase + USR1); + } else if (status_usr1 & USR1_PARITYERR) { + sport->port.icount.parity++; + writel(USR1_PARITYERR, sport->port.membase + USR1); + } } if (status_usr2 & USR2_ORE) {