From patchwork Thu Feb 16 11:07:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Long Cheng X-Patchwork-Id: 9576853 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 07D81600C5 for ; Thu, 16 Feb 2017 11:08:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 03612285B0 for ; Thu, 16 Feb 2017 11:08:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EC2A3285B2; Thu, 16 Feb 2017 11:08:29 +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,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 842F1285B0 for ; Thu, 16 Feb 2017 11:08:28 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=7WRj58LweB+g4wW4BsbfOh574afRMI57DEdRaSRbB6I=; b=bpEz799eWfQHF/ y+zH5vDSp8l7wJPTOcMPF0rlzDU04IcxExmUFVINEvlm0Vc1lhY2edmxZq2A085i7cFzhuAnWC7fa 8FTbd70Q6+ef0j1DBTLbYdkXPkZApjtlV8nfOjhQvI1M/s1KtPglWauHHa3fecvf/AQOUlncNFgZh +heN3D5RuQvxhTJGHDYyryWgf5ME9M1qI2AvY2RsnT7WGcEjirZaEnG+aHagvUHiOYJFy9zrDkMAM NBHAgNMKI71ZubLm1yJDrMAkR5YV5RyuJ24fC+oWKgFg6T4LUjRKIZ/FPMHuB3BjMmlG32FIKm+Kl QfOp4TPcgdN/5K6fN0kQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ceJvI-0007gU-1g; Thu, 16 Feb 2017 11:08:28 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ceJvE-0007eU-Ec; Thu, 16 Feb 2017 11:08:24 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=Content-Type:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=LmmFVpuyaIjQaKFNeuTK/VrkOMcnwkpUwtys9yUnj5Q=; b=TELDE3XIsWDsXRWbwmWm2voob jJsakUxk/wSy82xAakVK0/W2jSzz5uPOHlk6Y8EGb8ASoIHzDx12SH+Ny5+rIvyYt+U1dy1q2tSQz naXRkj9tSgCOq/0oQ4CC3PNssk4VsifEoJc6lG3ccieqbF3z8656NhvWpobk9MR3xgqrUAqnlMzGV gDqdycNm7quNzKVLhW0zOhBsc71vrRz9oMTsAw9Br+HDCWWVDp42IbjuvrGBl9Y/h1qX86fau8VQk X6Oq44I/dSC5JHpomv2Wq+/dvEKfkeK+immNUE5BXdpA4XpkOjt3lUs4E9zVNXGbLvEF/MlXZN8oY DcHRHzZ9Q==; Received: from [210.61.82.183] (helo=mailgw01.mediatek.com) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ceJvC-0004jp-NK; Thu, 16 Feb 2017 11:08:23 +0000 Received: from mtkhts07.mediatek.inc [(172.21.101.69)] by mailgw01.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 862265334; Thu, 16 Feb 2017 19:07:45 +0800 Received: from mhfsdcap03.mhfswrd (10.17.3.153) by mtkhts07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 14.3.266.1; Thu, 16 Feb 2017 19:07:43 +0800 From: Long Cheng To: Vinod Koul , Rob Herring , Mark Rutland , Matthias Brugger , Russell King , Dan Williams , Greg Kroah-Hartman , Jiri Slaby Subject: [PATCH 3/4] serial: 8250-mtk: add uart DMA support Date: Thu, 16 Feb 2017 19:07:30 +0800 Message-ID: <1487243251-964-4-git-send-email-long.cheng@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1487243251-964-1-git-send-email-long.cheng@mediatek.com> References: <1487243251-964-1-git-send-email-long.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170216_060823_169358_037724D2 X-CRM114-Status: GOOD ( 21.42 ) X-BeenThere: linux-mediatek@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, srv_heupstream@mediatek.com, linux-kernel@vger.kernel.org, Long Cheng , linux-mediatek@lists.infradead.org, linux-serial@vger.kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Sender: "Linux-mediatek" Errors-To: linux-mediatek-bounces+patchwork-linux-mediatek=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Modify uart register to support DMA function. Signed-off-by: Long Cheng --- drivers/tty/serial/8250/8250_mtk.c | 194 +++++++++++++++++++++++++++++++++++- 1 file changed, 193 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index ce0cc47..7d7a864 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -23,6 +23,10 @@ #include #include #include +#include +#include +#include +#include #include "8250.h" @@ -30,13 +34,165 @@ #define UART_MTK_SAMPLE_COUNT 0x0a /* Sample count register */ #define UART_MTK_SAMPLE_POINT 0x0b /* Sample point register */ #define MTK_UART_RATE_FIX 0x0d /* UART Rate Fix Register */ - +#define UART_MTK_DMA_EN 0x13 +#define TX_TRIGGER 1 +#define RX_TRIGGER 8192 + +#ifdef CONFIG_SERIAL_8250_DMA +enum dma_rx_status { + DMA_RX_START = 0, + DMA_RX_RUNNING = 1, + DMA_RX_SHUTDOWN = 2, +}; +#endif struct mtk8250_data { int line; + int rxpos; struct clk *uart_clk; struct clk *bus_clk; + struct uart_8250_dma *dma; +#ifdef CONFIG_SERIAL_8250_DMA + enum dma_rx_status rxstatus; +#endif }; +#ifdef CONFIG_SERIAL_8250_DMA +static int mtk8250_rx_dma(struct uart_8250_port *up); + +static void __mtkdma_rx_complete(void *param) +{ + struct uart_8250_port *up = param; + struct uart_8250_dma *dma = up->dma; + struct mtk8250_data *data = up->port.private_data; + struct tty_port *tty_port = &up->port.state->port; + struct dma_tx_state state; + unsigned char *ptr; + int copied; + + dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr, + dma->rx_size, DMA_FROM_DEVICE); + + dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); + dmaengine_terminate_all(dma->rxchan); + + if (data->rxstatus == DMA_RX_SHUTDOWN) + return; + + if ((data->rxpos + state.residue) <= dma->rx_size) { + ptr = (unsigned char *)(data->rxpos + dma->rx_buf); + copied = tty_insert_flip_string(tty_port, ptr, state.residue); + } else { + ptr = (unsigned char *)(data->rxpos + dma->rx_buf); + copied = tty_insert_flip_string(tty_port, ptr, + (dma->rx_size - data->rxpos)); + ptr = (unsigned char *)(dma->rx_buf); + copied += tty_insert_flip_string(tty_port, ptr, + (data->rxpos + state.residue - dma->rx_size)); + } + up->port.icount.rx += copied; + + tty_flip_buffer_push(tty_port); + + mtk8250_rx_dma(up); +} + +static int mtk8250_rx_dma(struct uart_8250_port *up) +{ + struct uart_8250_dma *dma = up->dma; + struct mtk8250_data *data = up->port.private_data; + struct dma_async_tx_descriptor *desc; + struct dma_tx_state state; + + desc = dmaengine_prep_slave_single(dma->rxchan, dma->rx_addr, + dma->rx_size, DMA_DEV_TO_MEM, + DMA_PREP_INTERRUPT | DMA_CTRL_ACK); + if (!desc) + return -EBUSY; + + desc->callback = __mtkdma_rx_complete; + desc->callback_param = up; + + dma->rx_cookie = dmaengine_submit(desc); + + dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); + data->rxpos = state.residue; + + dma_sync_single_for_device(dma->rxchan->device->dev, dma->rx_addr, + dma->rx_size, DMA_FROM_DEVICE); + + dma_async_issue_pending(dma->rxchan); + + return 0; +} + +static void mtk_dma_enable(struct uart_8250_port *up) +{ + struct uart_port *port = &up->port; + struct uart_8250_dma *dma = up->dma; + struct mtk8250_data *data = up->port.private_data; + int tmp = 0; + + if (data->rxstatus != DMA_RX_START) + return; + + dma->rxconf.direction = DMA_DEV_TO_MEM; + dma->rxconf.src_addr_width = dma->rx_size/1024; + dma->rxconf.src_addr = dma->rx_addr; + + dma->txconf.direction = DMA_MEM_TO_DEV; + dma->txconf.dst_addr_width = UART_XMIT_SIZE/1024; + dma->txconf.dst_addr = dma->tx_addr; + + serial_port_out(port, UART_FCR, ((1 << 0)|(1 << 1)|(1 << 2))); + serial_port_out(port, UART_MTK_DMA_EN, + (serial_port_in(port, UART_MTK_DMA_EN) | + ((1 << 0) | (1 << 2)))); + serial_port_out(port, UART_MTK_DMA_EN, + (serial_port_in(port, UART_MTK_DMA_EN) | + (1 << 1))); + + tmp = serial_port_in(port, UART_LCR); + serial_port_out(port, UART_LCR, UART_LCR_CONF_MODE_B); + serial_port_out(port, UART_EFR, UART_EFR_ECB); + serial_port_out(port, UART_LCR, tmp); + + dmaengine_slave_config(dma->rxchan, &dma->rxconf); + dmaengine_slave_config(dma->txchan, &dma->txconf); + + data->rxstatus = DMA_RX_RUNNING; + data->rxpos = 0; + mtk8250_rx_dma(up); +} +#endif + +static int mtk8250_startup(struct uart_port *port) +{ +#ifdef CONFIG_SERIAL_8250_DMA + struct uart_8250_port *up = + container_of(port, struct uart_8250_port, port); + struct mtk8250_data *data = port->private_data; + + if (up->dma != NULL) + data->rxstatus = DMA_RX_START; +#endif + + return serial8250_do_startup(port); +} + +static void mtk8250_shutdown(struct uart_port *port) +{ +#ifdef CONFIG_SERIAL_8250_DMA + struct uart_8250_port *up = + container_of(port, struct uart_8250_port, port); + struct mtk8250_data *data = port->private_data; + + if (up->dma != NULL) + data->rxstatus = DMA_RX_SHUTDOWN; +#endif + + return serial8250_do_shutdown(port); +} + static void mtk8250_set_termios(struct uart_port *port, struct ktermios *termios, struct ktermios *old) @@ -44,6 +200,10 @@ struct mtk8250_data { struct uart_8250_port *up = up_to_u8250p(port); unsigned long flags; unsigned int baud, quot; +#ifdef CONFIG_SERIAL_8250_DMA + if (up->dma != NULL) + mtk_dma_enable(up); +#endif serial8250_do_set_termios(port, termios, old); @@ -152,9 +312,20 @@ static int __maybe_unused mtk8250_runtime_resume(struct device *dev) pm_runtime_put_sync_suspend(port->dev); } +#ifdef CONFIG_SERIAL_8250_DMA +static bool the_no_dma_filter_fn(struct dma_chan *chan, void *param) +{ + return false; +} +#endif + static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p, struct mtk8250_data *data) { +#ifdef CONFIG_SERIAL_8250_DMA + int dmacnt; +#endif + data->uart_clk = devm_clk_get(&pdev->dev, "baud"); if (IS_ERR(data->uart_clk)) { /* @@ -174,6 +345,21 @@ static int mtk8250_probe_of(struct platform_device *pdev, struct uart_port *p, if (IS_ERR(data->bus_clk)) return PTR_ERR(data->bus_clk); + data->dma = NULL; +#ifdef CONFIG_SERIAL_8250_DMA + dmacnt = of_property_count_strings(pdev->dev.of_node, "dma-names"); + if (dmacnt == 2) { + data->dma = devm_kzalloc(&pdev->dev, + sizeof(*(data->dma)), + GFP_KERNEL); + data->dma->fn = the_no_dma_filter_fn; + data->dma->rx_size = RX_TRIGGER; + data->dma->rxconf.src_maxburst = RX_TRIGGER; + data->dma->txconf.dst_maxburst = TX_TRIGGER; + data->dma->rx_dma = mtk8250_rx_dma; + } +#endif + return 0; } @@ -216,8 +402,14 @@ static int mtk8250_probe(struct platform_device *pdev) uart.port.iotype = UPIO_MEM32; uart.port.regshift = 2; uart.port.private_data = data; + uart.port.shutdown = mtk8250_shutdown; + uart.port.startup = mtk8250_startup; uart.port.set_termios = mtk8250_set_termios; uart.port.uartclk = clk_get_rate(data->uart_clk); +#ifdef CONFIG_SERIAL_8250_DMA + if (data->dma) + uart.dma = data->dma; +#endif /* Disable Rate Fix function */ writel(0x0, uart.port.membase +