From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4/4] serial: 8250-mtk: modify uart DMA rx From: Long Cheng Message-Id: <1556336193-15198-5-git-send-email-long.cheng@mediatek.com> Date: Sat, 27 Apr 2019 11:36:33 +0800 To: Vinod Koul , Randy Dunlap , Rob Herring , Mark Rutland , Ryder Lee , Sean Wang , Nicolas Boichat , Matthias Brugger Cc: Dan Williams , Greg Kroah-Hartman , Jiri Slaby , Sean Wang , dmaengine@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, srv_heupstream@mediatek.com, Yingjoe Chen , YT Shen , Zhenbao Liu , Long Cheng List-ID: TW9kaWZ5IHVhcnQgcnggYW5kIGNvbXBsZXRlIGZvciBETUEuCgpTaWduZWQtb2ZmLWJ5OiBMb25n IENoZW5nIDxsb25nLmNoZW5nQG1lZGlhdGVrLmNvbT4KLS0tCiBkcml2ZXJzL3R0eS9zZXJpYWwv ODI1MC84MjUwX210ay5jIHwgICA1MyArKysrKysrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0t LS0KIDEgZmlsZSBjaGFuZ2VkLCAyMyBpbnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRp ZmYgLS1naXQgYS9kcml2ZXJzL3R0eS9zZXJpYWwvODI1MC84MjUwX210ay5jIGIvZHJpdmVycy90 dHkvc2VyaWFsLzgyNTAvODI1MF9tdGsuYwppbmRleCBjMWZkYmMwLi4wNDA4MWE2IDEwMDY0NAot LS0gYS9kcml2ZXJzL3R0eS9zZXJpYWwvODI1MC84MjUwX210ay5jCisrKyBiL2RyaXZlcnMvdHR5 L3NlcmlhbC84MjUwLzgyNTBfbXRrLmMKQEAgLTMwLDcgKzMwLDYgQEAKICNkZWZpbmUgTVRLX1VB UlRfRE1BX0VOX1RYCTB4MgogI2RlZmluZSBNVEtfVUFSVF9ETUFfRU5fUlgJMHg1CiAKLSNkZWZp bmUgTVRLX1VBUlRfVFhfU0laRQlVQVJUX1hNSVRfU0laRQogI2RlZmluZSBNVEtfVUFSVF9SWF9T SVpFCTB4ODAwMAogI2RlZmluZSBNVEtfVUFSVF9UWF9UUklHR0VSCTEKICNkZWZpbmUgTVRLX1VB UlRfUlhfVFJJR0dFUglNVEtfVUFSVF9SWF9TSVpFCkBAIC02NCwyOCArNjMsMzAgQEAgc3RhdGlj IHZvaWQgbXRrODI1MF9kbWFfcnhfY29tcGxldGUodm9pZCAqcGFyYW0pCiAJc3RydWN0IG10azgy NTBfZGF0YSAqZGF0YSA9IHVwLT5wb3J0LnByaXZhdGVfZGF0YTsKIAlzdHJ1Y3QgdHR5X3BvcnQg KnR0eV9wb3J0ID0gJnVwLT5wb3J0LnN0YXRlLT5wb3J0OwogCXN0cnVjdCBkbWFfdHhfc3RhdGUg c3RhdGU7CisJaW50IGNvcGllZCwgY250LCB0bXA7CiAJdW5zaWduZWQgY2hhciAqcHRyOwotCWlu dCBjb3BpZWQ7CiAKLQlkbWFfc3luY19zaW5nbGVfZm9yX2NwdShkbWEtPnJ4Y2hhbi0+ZGV2aWNl LT5kZXYsIGRtYS0+cnhfYWRkciwKLQkJCQlkbWEtPnJ4X3NpemUsIERNQV9GUk9NX0RFVklDRSk7 CisJaWYgKGRhdGEtPnJ4X3N0YXR1cyA9PSBETUFfUlhfU0hVVERPV04pCisJCXJldHVybjsKIAog CWRtYWVuZ2luZV90eF9zdGF0dXMoZG1hLT5yeGNoYW4sIGRtYS0+cnhfY29va2llLCAmc3RhdGUp OworCWNudCA9IGRtYS0+cnhfc2l6ZSAtIHN0YXRlLnJlc2lkdWU7CisJdG1wID0gY250OwogCi0J aWYgKGRhdGEtPnJ4X3N0YXR1cyA9PSBETUFfUlhfU0hVVERPV04pCi0JCXJldHVybjsKKwlpZiAo KGRhdGEtPnJ4X3BvcyArIGNudCkgPiBkbWEtPnJ4X3NpemUpCisJCXRtcCA9IGRtYS0+cnhfc2l6 ZSAtIGRhdGEtPnJ4X3BvczsKIAotCWlmICgoZGF0YS0+cnhfcG9zICsgc3RhdGUucmVzaWR1ZSkg PD0gZG1hLT5yeF9zaXplKSB7Ci0JCXB0ciA9ICh1bnNpZ25lZCBjaGFyICopKGRhdGEtPnJ4X3Bv cyArIGRtYS0+cnhfYnVmKTsKLQkJY29waWVkID0gdHR5X2luc2VydF9mbGlwX3N0cmluZyh0dHlf cG9ydCwgcHRyLCBzdGF0ZS5yZXNpZHVlKTsKLQl9IGVsc2UgewotCQlwdHIgPSAodW5zaWduZWQg Y2hhciAqKShkYXRhLT5yeF9wb3MgKyBkbWEtPnJ4X2J1Zik7Ci0JCWNvcGllZCA9IHR0eV9pbnNl cnRfZmxpcF9zdHJpbmcodHR5X3BvcnQsIHB0ciwKLQkJCQkJCWRtYS0+cnhfc2l6ZSAtIGRhdGEt PnJ4X3Bvcyk7CisJcHRyID0gKHVuc2lnbmVkIGNoYXIgKikoZGF0YS0+cnhfcG9zICsgZG1hLT5y eF9idWYpOworCWNvcGllZCA9IHR0eV9pbnNlcnRfZmxpcF9zdHJpbmcodHR5X3BvcnQsIHB0ciwg dG1wKTsKKwlkYXRhLT5yeF9wb3MgKz0gdG1wOworCisJaWYgKGNudCA+IHRtcCkgewogCQlwdHIg PSAodW5zaWduZWQgY2hhciAqKShkbWEtPnJ4X2J1Zik7Ci0JCWNvcGllZCArPSB0dHlfaW5zZXJ0 X2ZsaXBfc3RyaW5nKHR0eV9wb3J0LCBwdHIsCi0JCQkJZGF0YS0+cnhfcG9zICsgc3RhdGUucmVz aWR1ZSAtIGRtYS0+cnhfc2l6ZSk7CisJCXRtcCA9IGNudCAtIHRtcDsKKwkJY29waWVkICs9IHR0 eV9pbnNlcnRfZmxpcF9zdHJpbmcodHR5X3BvcnQsIHB0ciwgdG1wKTsKKwkJZGF0YS0+cnhfcG9z ID0gdG1wOwogCX0KKwogCXVwLT5wb3J0Lmljb3VudC5yeCArPSBjb3BpZWQ7CiAKIAl0dHlfZmxp cF9idWZmZXJfcHVzaCh0dHlfcG9ydCk7CkBAIC05Niw5ICs5Nyw3IEBAIHN0YXRpYyB2b2lkIG10 azgyNTBfZG1hX3J4X2NvbXBsZXRlKHZvaWQgKnBhcmFtKQogc3RhdGljIHZvaWQgbXRrODI1MF9y eF9kbWEoc3RydWN0IHVhcnRfODI1MF9wb3J0ICp1cCkKIHsKIAlzdHJ1Y3QgdWFydF84MjUwX2Rt YSAqZG1hID0gdXAtPmRtYTsKLQlzdHJ1Y3QgbXRrODI1MF9kYXRhICpkYXRhID0gdXAtPnBvcnQu cHJpdmF0ZV9kYXRhOwogCXN0cnVjdCBkbWFfYXN5bmNfdHhfZGVzY3JpcHRvcgkqZGVzYzsKLQlz dHJ1Y3QgZG1hX3R4X3N0YXRlCSBzdGF0ZTsKIAogCWRlc2MgPSBkbWFlbmdpbmVfcHJlcF9zbGF2 ZV9zaW5nbGUoZG1hLT5yeGNoYW4sIGRtYS0+cnhfYWRkciwKIAkJCQkJICAgZG1hLT5yeF9zaXpl LCBETUFfREVWX1RPX01FTSwKQEAgLTExMywxMiArMTEyLDYgQEAgc3RhdGljIHZvaWQgbXRrODI1 MF9yeF9kbWEoc3RydWN0IHVhcnRfODI1MF9wb3J0ICp1cCkKIAogCWRtYS0+cnhfY29va2llID0g ZG1hZW5naW5lX3N1Ym1pdChkZXNjKTsKIAotCWRtYWVuZ2luZV90eF9zdGF0dXMoZG1hLT5yeGNo YW4sIGRtYS0+cnhfY29va2llLCAmc3RhdGUpOwotCWRhdGEtPnJ4X3BvcyA9IHN0YXRlLnJlc2lk dWU7Ci0KLQlkbWFfc3luY19zaW5nbGVfZm9yX2RldmljZShkbWEtPnJ4Y2hhbi0+ZGV2aWNlLT5k ZXYsIGRtYS0+cnhfYWRkciwKLQkJCQkgICBkbWEtPnJ4X3NpemUsIERNQV9GUk9NX0RFVklDRSk7 Ci0KIAlkbWFfYXN5bmNfaXNzdWVfcGVuZGluZyhkbWEtPnJ4Y2hhbik7CiB9CiAKQEAgLTEzMSwx MyArMTI0LDEzIEBAIHN0YXRpYyB2b2lkIG10azgyNTBfZG1hX2VuYWJsZShzdHJ1Y3QgdWFydF84 MjUwX3BvcnQgKnVwKQogCWlmIChkYXRhLT5yeF9zdGF0dXMgIT0gRE1BX1JYX1NUQVJUKQogCQly ZXR1cm47CiAKLQlkbWEtPnJ4Y29uZi5kaXJlY3Rpb24JCT0gRE1BX0RFVl9UT19NRU07Ci0JZG1h LT5yeGNvbmYuc3JjX2FkZHJfd2lkdGgJPSBkbWEtPnJ4X3NpemUgLyAxMDI0OwotCWRtYS0+cnhj b25mLnNyY19hZGRyCQk9IGRtYS0+cnhfYWRkcjsKKwlkbWEtPnJ4Y29uZi5kaXJlY3Rpb24JCQkJ PSBETUFfREVWX1RPX01FTTsKKwlkbWEtPnJ4Y29uZi5zcmNfcG9ydF93aW5kb3dfc2l6ZQk9IGRt YS0+cnhfc2l6ZTsKKwlkbWEtPnJ4Y29uZi5zcmNfYWRkcgkJCQk9IGRtYS0+cnhfYWRkcjsKIAot CWRtYS0+dHhjb25mLmRpcmVjdGlvbgkJPSBETUFfTUVNX1RPX0RFVjsKLQlkbWEtPnR4Y29uZi5k c3RfYWRkcl93aWR0aAk9IE1US19VQVJUX1RYX1NJWkUgLyAxMDI0OwotCWRtYS0+dHhjb25mLmRz dF9hZGRyCQk9IGRtYS0+dHhfYWRkcjsKKwlkbWEtPnR4Y29uZi5kaXJlY3Rpb24JCQkJPSBETUFf TUVNX1RPX0RFVjsKKwlkbWEtPnR4Y29uZi5kc3RfcG9ydF93aW5kb3dfc2l6ZQk9IFVBUlRfWE1J VF9TSVpFOworCWRtYS0+dHhjb25mLmRzdF9hZGRyCQkJCT0gZG1hLT50eF9hZGRyOwogCiAJc2Vy aWFsX291dCh1cCwgVUFSVF9GQ1IsIFVBUlRfRkNSX0VOQUJMRV9GSUZPIHwgVUFSVF9GQ1JfQ0xF QVJfUkNWUiB8CiAJCVVBUlRfRkNSX0NMRUFSX1hNSVQpOwpAQCAtMjE3LDcgKzIxMCw3IEBAIHN0 YXRpYyB2b2lkIG10azgyNTBfc2h1dGRvd24oc3RydWN0IHVhcnRfcG9ydCAqcG9ydCkKIAkgKiBN ZWRpYXRlayBVQVJUcyB1c2UgYW4gZXh0cmEgaGlnaHNwZWVkIHJlZ2lzdGVyIChVQVJUX01US19I SUdIUykKIAkgKgogCSAqIFdlIG5lZWQgdG8gcmVjYWxjdWFsdGUgdGhlIHF1b3QgcmVnaXN0ZXIs IGFzIHRoZSBjbGFjdWxhdGlvbiBkZXBlbmRzCi0JICogb24gdGhlIHZhdWxlIGluIHRoZSBoaWdo c3BlZWQgcmVnaXN0ZXIuCisJICogb24gdGhlIHZhbHVlIGluIHRoZSBoaWdoc3BlZWQgcmVnaXN0 ZXIuCiAJICoKIAkgKiBTb21lIGJhdWRyYXRlcyBhcmUgbm90IHN1cHBvcnRlZCBieSB0aGUgY2hp cCwgc28gd2UgdXNlIHRoZSBuZXh0CiAJICogbG93ZXIgcmF0ZSBzdXBwb3J0ZWQgYW5kIHVwZGF0 ZSB0ZXJtaW9zIGNfZmxhZy4K From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E52DEC43219 for ; Sat, 27 Apr 2019 03:37:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C30BF2084F for ; Sat, 27 Apr 2019 03:37:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727366AbfD0Dgv (ORCPT ); Fri, 26 Apr 2019 23:36:51 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:46531 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726294AbfD0Dgu (ORCPT ); Fri, 26 Apr 2019 23:36:50 -0400 X-UUID: 29baef2a9c1d4b20ba9a6cb17b7d620e-20190427 X-UUID: 29baef2a9c1d4b20ba9a6cb17b7d620e-20190427 Received: from mtkcas08.mediatek.inc [(172.21.101.126)] by mailgw02.mediatek.com (envelope-from ) (mhqrelay.mediatek.com ESMTP with TLS) with ESMTP id 2024520194; Sat, 27 Apr 2019 11:36:47 +0800 Received: from mtkcas07.mediatek.inc (172.21.101.84) by mtkmbs01n1.mediatek.inc (172.21.101.68) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Sat, 27 Apr 2019 11:36:45 +0800 Received: from localhost.localdomain (10.17.3.153) by mtkcas07.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Sat, 27 Apr 2019 11:36:44 +0800 From: Long Cheng To: Vinod Koul , Randy Dunlap , Rob Herring , Mark Rutland , Ryder Lee , Sean Wang , Nicolas Boichat , Matthias Brugger CC: Dan Williams , Greg Kroah-Hartman , Jiri Slaby , Sean Wang , , , , , , , , Yingjoe Chen , YT Shen , Zhenbao Liu , Long Cheng Subject: [PATCH 4/4] serial: 8250-mtk: modify uart DMA rx Date: Sat, 27 Apr 2019 11:36:33 +0800 Message-ID: <1556336193-15198-5-git-send-email-long.cheng@mediatek.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1556336193-15198-1-git-send-email-long.cheng@mediatek.com> References: <1556336193-15198-1-git-send-email-long.cheng@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-MTK: N Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org Message-ID: <20190427033633.Zb-pAhdGCWjiFd6SgeOEHdqsOU-06_XXZt7zY675mYA@z> Modify uart rx and complete for DMA. Signed-off-by: Long Cheng --- drivers/tty/serial/8250/8250_mtk.c | 53 ++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 30 deletions(-) diff --git a/drivers/tty/serial/8250/8250_mtk.c b/drivers/tty/serial/8250/8250_mtk.c index c1fdbc0..04081a6 100644 --- a/drivers/tty/serial/8250/8250_mtk.c +++ b/drivers/tty/serial/8250/8250_mtk.c @@ -30,7 +30,6 @@ #define MTK_UART_DMA_EN_TX 0x2 #define MTK_UART_DMA_EN_RX 0x5 -#define MTK_UART_TX_SIZE UART_XMIT_SIZE #define MTK_UART_RX_SIZE 0x8000 #define MTK_UART_TX_TRIGGER 1 #define MTK_UART_RX_TRIGGER MTK_UART_RX_SIZE @@ -64,28 +63,30 @@ static void mtk8250_dma_rx_complete(void *param) struct mtk8250_data *data = up->port.private_data; struct tty_port *tty_port = &up->port.state->port; struct dma_tx_state state; + int copied, cnt, tmp; unsigned char *ptr; - int copied; - dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr, - dma->rx_size, DMA_FROM_DEVICE); + if (data->rx_status == DMA_RX_SHUTDOWN) + return; dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); + cnt = dma->rx_size - state.residue; + tmp = cnt; - if (data->rx_status == DMA_RX_SHUTDOWN) - return; + if ((data->rx_pos + cnt) > dma->rx_size) + tmp = dma->rx_size - data->rx_pos; - if ((data->rx_pos + state.residue) <= dma->rx_size) { - ptr = (unsigned char *)(data->rx_pos + dma->rx_buf); - copied = tty_insert_flip_string(tty_port, ptr, state.residue); - } else { - ptr = (unsigned char *)(data->rx_pos + dma->rx_buf); - copied = tty_insert_flip_string(tty_port, ptr, - dma->rx_size - data->rx_pos); + ptr = (unsigned char *)(data->rx_pos + dma->rx_buf); + copied = tty_insert_flip_string(tty_port, ptr, tmp); + data->rx_pos += tmp; + + if (cnt > tmp) { ptr = (unsigned char *)(dma->rx_buf); - copied += tty_insert_flip_string(tty_port, ptr, - data->rx_pos + state.residue - dma->rx_size); + tmp = cnt - tmp; + copied += tty_insert_flip_string(tty_port, ptr, tmp); + data->rx_pos = tmp; } + up->port.icount.rx += copied; tty_flip_buffer_push(tty_port); @@ -96,9 +97,7 @@ static void mtk8250_dma_rx_complete(void *param) static void 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, @@ -113,12 +112,6 @@ static void mtk8250_rx_dma(struct uart_8250_port *up) dma->rx_cookie = dmaengine_submit(desc); - dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); - data->rx_pos = 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); } @@ -131,13 +124,13 @@ static void mtk8250_dma_enable(struct uart_8250_port *up) if (data->rx_status != 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->rxconf.direction = DMA_DEV_TO_MEM; + dma->rxconf.src_port_window_size = dma->rx_size; + dma->rxconf.src_addr = dma->rx_addr; - dma->txconf.direction = DMA_MEM_TO_DEV; - dma->txconf.dst_addr_width = MTK_UART_TX_SIZE / 1024; - dma->txconf.dst_addr = dma->tx_addr; + dma->txconf.direction = DMA_MEM_TO_DEV; + dma->txconf.dst_port_window_size = UART_XMIT_SIZE; + dma->txconf.dst_addr = dma->tx_addr; serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); @@ -217,7 +210,7 @@ static void mtk8250_shutdown(struct uart_port *port) * Mediatek UARTs use an extra highspeed register (UART_MTK_HIGHS) * * We need to recalcualte the quot register, as the claculation depends - * on the vaule in the highspeed register. + * on the value in the highspeed register. * * Some baudrates are not supported by the chip, so we use the next * lower rate supported and update termios c_flag. -- 1.7.9.5