From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753517AbcGSIAj (ORCPT ); Tue, 19 Jul 2016 04:00:39 -0400 Received: from mail-db5eur01on0093.outbound.protection.outlook.com ([104.47.2.93]:52504 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753131AbcGSIAc (ORCPT ); Tue, 19 Jul 2016 04:00:32 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=bhuvanchandra.dv@toradex.com; From: Bhuvanchandra DV To: CC: , , , , , , , , , , "Bhuvanchandra DV" Subject: [PATCH RESEND v2 1/8] tty: serial: fsl_lpuart: consider TX FIFO too in tx_empty Date: Tue, 19 Jul 2016 13:13:03 +0530 Message-ID: <20160719074310.16872-2-bhuvanchandra.dv@toradex.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> References: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [115.115.243.34] X-ClientProxiedBy: MA1PR01CA0045.INDPRD01.PROD.OUTLOOK.COM (10.164.116.145) To DB6PR0501MB2087.eurprd05.prod.outlook.com (10.168.9.139) X-MS-Office365-Filtering-Correlation-Id: 3e5a7324-a469-4ef2-0198-08d3afa88950 X-Microsoft-Exchange-Diagnostics: 1;DB6PR0501MB2087;2:0ma7A/UGT5E59mopAs4QX1RIP+/XqjoqAcnna025jmTnQcBrSvxGlcr4/T+E4r8W28ECVpiTRkQCT26wV9cXVvb7wT1G10z50eUyu1ZN62XdH8bG9pzSnoyYr72rDbFRg7X8e3c8n93XsY2KSuGnPWLnTGMcDOLVuC///2GJIyG0FGs6/WPA7mV4G62VGFxQ;3:IUD48zlG5BbDVqMIpwl9rFA+Ed3+VGymrwLd5v6etYaVlNCTfg+En8Wu860UZmgiF5oGAGzhZ9d/jE6od0M0SVBzKWCzUL3mE38UkrM0o6sW+6XWcJcViFKCrFiMJTaL;25:zY1qmjq5UMcJ7IWUXPOxz0OEALSHfhXF17ER/J5o3WBbc0Xko06qFdB2N9DMci2Zwq4KQ4ssxqZ0Eq5o/uxxQGvg/t5s/B3ZD1zGrIBPga/UMpr0O6E4XogjO0MUxTUpKhkESgyblsfRL0fCaDLQOvVqITKU8XdqdHRWxcFZvIQTF0aPBDASvxJ+E15p0nw8u5jDOurQAztjxvNtewezqsly8g6L6xhAYSdsosW1ZtbIkZhSw5Os3AQ02F2OHwqZ6BctmVa2E0ays0fqa0IzMG752fwQwSolKeSiuBFIHn45/hSsiPWuXVhagNI5R4WsHPqT22ez7rjkYJP5jllz1lxrH1oB3ca+B+j/XOQZJ9OzYlejIaXv6pL6HupbhisMpFQaMIBIkGxIrWZs1uiDvtCEbAGY41Ij9/2ZNvkU0l4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0501MB2087; X-Microsoft-Exchange-Diagnostics: 1;DB6PR0501MB2087;31:mBzTY9OUymM9sXqOQiMpC0c9V/3NUv7xIxGrfHJQrwWOb7c3Hm9BY2aekhwzvqfhxETGPkUTOVwczKcxwNlwu4tLZ/KAwKyJkntghVM5zDqrY2fYKyrTaNXDtT5f7l1LfqeYVqjqwvNbFU75juZ4SoI//DyViJPUouU3iqmZXr7Lsl37ZOCs7DxQnVrN9Q+fQYnRBQRgxl0N+zV1BWn3vw==;20:HdTnF4u+L0KWM41ueDW7z9/GnYAtbO4gPLU6iZrm87r5PKoS3Lu3iAx2elEQnh6TMDJMYTAOeJlHei0zJO7pwedw/oghFyhVcAlQ5vt6i9zD5AGAAPd8zQUIZB6hbidAD1usBIKpfs5Jll3SmCBFaROwi3KRfNToJgKDzyQC9DeDEMZwuvHmWwgBJVygHWPzzm/VZ7pN+Cr/3XdHz9Jon38mc6+yisNLj9QnUEz5fmlXjUlWlhXtcIaBtOzv34l/AvJNQXq9jfshqJ9vsQZ5Faia8JuV8bglfvnyjNnm53fekv7b8HfUgeOhvGWpMHzd+8y9kVeuKPd5vutcqWt6jA==;4:1nEK8PQh9fMUkvCnGcEdvVRMjcQZI7WOtdkQPomodn1fr0BfVovRsuZfS083+6+sJ87lmxAq/fNNxcYN6pH+3KRsi/KuAghPvxv2Mh23HjlxuPdfHAaDikJ7XCTg4BsqBHmD9sI9fb8a4T31YTwLgsFjeFJZ5K+srsCEx8v8pF0FfHMQfvoCRZg8skui4p0H+cl7+qNyYsoaM0LLC0RsIKNna58zbUOQ1/66MOleY5h0ySPyiPCBKwPSIbpCxA5CjzIbUQ83lEaRxEYqfpwXQb0UtMiscfHs7ChQFB4vfwQWKfJkzOaMXesd2x6Om4StIejca7iJsHDKZFmJ5+ZSIRscYeHzRMzvRfntW/u7AqFWdXr6gNxEQljDuxHCEjfB X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046);SRVR:DB6PR0501MB2087;BCL:0;PCL:0;RULEID:;SRVR:DB6PR0501MB2087; X-Forefront-PRVS: 000800954F X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(77096005)(36756003)(42186005)(69596002)(4001430100002)(19580395003)(86362001)(7736002)(19580405001)(47776003)(5003940100001)(2950100001)(92566002)(50466002)(66066001)(76176999)(50986999)(50226002)(4326007)(48376002)(6116002)(3846002)(1076002)(586003)(97736004)(305945005)(68736007)(189998001)(105586002)(8676002)(110136002)(107886002)(53416004)(101416001)(2906002)(2351001)(81156014)(81166006)(229853001)(106356001)(7846002)(33646002)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DB6PR0501MB2087;H:tdx-in-nb-0014.toradex.ext;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DB6PR0501MB2087;23:K8pZT8nxEiZi92lJTtmlqftyxbIC7JU3Wq0M/Hp?= =?us-ascii?Q?U3iam51eKA+mj5ofrefhOUHFzL4G3LRrNazmOpZSg33QA+XjCMDR5HfP84py?= =?us-ascii?Q?Zmpwpg4X0JAJKl/gvwYMRYz36x45m+OYG9EhBRmaF7sJE+B8kAEK/WupztpY?= =?us-ascii?Q?GF6soM3HW9LzsjTmRMpEU8S1U0/65tLUz8Kylz8b0PjYic0yKhZH7ni8pwiB?= =?us-ascii?Q?OXmA6iGyUJu5bm7vejALhPOVuff99A2N5QmnNn3dREYTjWSAgpDbWqgmG/Z7?= =?us-ascii?Q?BGEa+TvGKBr+nabaA9gQ+EwaMlyazdhN2jQ7uVxaVPEIXfT/D51e+kj0i7id?= =?us-ascii?Q?1APluaQd+Mj6QdqF/g+vcNC9Cudmbr77xZlht6l04Df7AjL6CPmc5KnSyAuS?= =?us-ascii?Q?4OJ8uF5l9PKHRPCZEkjNwjoiDuOzXMLJsZqUIc2wH4Q60doYjuFGy07QHSXD?= =?us-ascii?Q?L1wQ6Jxc4mFKVXH8ysq0u4otyq20vxx6MrHWR0Ukj4zgVYo8CIJxj6PXGzoZ?= =?us-ascii?Q?WJUET1CbhCBNYAvdnuHONF0nvAL/iO09pZlkDZ9ZyrYupft6ho1u3f2WmR1z?= =?us-ascii?Q?+mb7dCPeoErrqf5cpV/bTzKUZge0R0wdrwdPYN+CYQTAAEfIk+/tHGrYASj/?= =?us-ascii?Q?MnfPRSijyBOxfs5ysh378LuDBaVfvPa9EsH9LOf322SpmjC4fgaUef/IMDnF?= =?us-ascii?Q?ORH2ZF6JLerF8o+1gL1agY+Z7Hy3JgfryqPSi9JOAPD/fjFDGCZ4S9geYpZr?= =?us-ascii?Q?dc5JOXZkTE2GWthK/eQEgEF9St/6Bo9o0/yyzyqjV13TrYXxztpnCinGecei?= =?us-ascii?Q?ncavkaWLDg4ADsf/jUMzgEl9AZvn0eHnzzsxY7V8bnV0IdguD4tgWV5VIf8x?= =?us-ascii?Q?FvdoR5LF2qrF+p3d+ucLlNuWM/TAZeexW9HjmgroHSeqQ6bRkM7CSEkX/iJM?= =?us-ascii?Q?bxo6XaYleBN1jCQh4/ohnaKlmyqZQxKQV5KqbXD2nTeTfrwo6KArhtg7+kxX?= =?us-ascii?Q?0iBiYAJe9PQonPFNe7PFcgoN2RvkLqS/VpQ4VrxF1R4/xKORD41er8E3KGzf?= =?us-ascii?Q?pUwOYLiq+T4Bz+WLK1KcGSVuIeCmK+Jg3sbTS2+fbtldRUxWMc1cQZefoQQY?= =?us-ascii?Q?cehdZI4Yy8odOhDNoUvrpNdeELxs/2HdZ/MiM5/6nZNhooLjSYh3PnnNj4UQ?= =?us-ascii?Q?tIjExSsOcAmexrOQuTrB9qIBmumEy9SXiDCcl?= X-Microsoft-Exchange-Diagnostics: 1;DB6PR0501MB2087;6:dyrgeci63iDxNig0XXOfPQKonfLqiamKBzsrLT3GtDvKG2bnsNYKQJNVhqOi6s+BU63dgmD4HHmBQIGqEADvHYCG2yO1G4gl4mMMhrmrcGZReBejLniZA0xciw+mTIk0A1CSkxNydiHm8tFDLAfzx93J7LLEqMM36PjkACZsLbN4ueh4mU79YwTouymMx2RlkZvrMm0jKi/essdbvl6lrfh4fDHZX1PISq1BAk37NuTzNDX2UdhQ/Lc1gtrRxdwYbL/JQOBdeDGS/ro9VZoIn5anIa3mWD2nJNBsv6VRcNg=;5:nThiNo3fHlUI8J0lU4iVE/+wMld6KpPM+nNV99Km4dppUXKHK99bw9cDwS6x2fSmAT3iBQkZfnEqBG2Ea3yC3Y+jBTygQGHW7ppeA5/Pz0uVCmZlUI2JtCOjzEpIPxythKgh4A6dXkXCjKXUcMQEZg==;24:Cv9mmcO4UEXSOkdxpK3aSOpVMiEp2Wzfgmrk2j9kGDllFM/dpf96R7QyAdJ+cTTkGrLceoX2ghysq3AAAGg23g1VG9cElkNIKrOpoYgLycY=;7:bk6QydX6s4VY4lLlxzGYEafGvE7sicytlDFHvWnr/SdT94TsScQmw66L4acDMZ6AuGnV78pNSKYuWyX5fZGBgVLqKiND1HSIzOc3Og60rJOOcH3czmtQ3C6Z4YlxREMlWH1lUgN9e7BuUEy0v/ITXYTvyh3VNXM5AdxziIfC1rSl/DA6mGe5MotLK8Wq8gVzXCG7VZl9MngalVf9w8g6Im/j3yKbnwNadcNtrxV21Btp3JYPMRS8CVDVLDV2KIbt SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2016 07:44:35.7860 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0501MB2087 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stefan Agner Currently the tx_empty callback only considers the Transmit Complete Flag (TC). The reference manual is not quite clear if the TC flag covers the TX FIFO too. Debug prints on real hardware have shown that from time to time the TC flag is asserted (indicating Transmitter idle) while there are still data in the TX FIFO. Hence, in this case the serial core will call the shutdown callback even though there are data remaining in the TX FIFO buffers. Avoid early shutdowns by considering the TX FIFO empty flag too. Also avoid theoretical race conditions between DMA and the driver by checking whether the TX DMA is in progress too. Signed-off-by: Stefan Agner Signed-off-by: Bhuvanchandra DV --- drivers/tty/serial/fsl_lpuart.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 3d79003..fabfa7e 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -810,8 +810,18 @@ static irqreturn_t lpuart32_int(int irq, void *dev_id) /* return TIOCSER_TEMT when transmitter is not busy */ static unsigned int lpuart_tx_empty(struct uart_port *port) { - return (readb(port->membase + UARTSR1) & UARTSR1_TC) ? - TIOCSER_TEMT : 0; + struct lpuart_port *sport = container_of(port, + struct lpuart_port, port); + unsigned char sr1 = readb(port->membase + UARTSR1); + unsigned char sfifo = readb(port->membase + UARTSFIFO); + + if (sport->dma_tx_in_progress) + return 0; + + if (sr1 & UARTSR1_TC && sfifo & UARTSFIFO_TXEMPT) + return TIOCSER_TEMT; + + return 0; } static unsigned int lpuart32_tx_empty(struct uart_port *port) -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bhuvanchandra DV Subject: [PATCH RESEND v2 1/8] tty: serial: fsl_lpuart: consider TX FIFO too in tx_empty Date: Tue, 19 Jul 2016 13:13:03 +0530 Message-ID: <20160719074310.16872-2-bhuvanchandra.dv@toradex.com> References: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org To: gregkh@linuxfoundation.org Cc: linux-serial@vger.kernel.org, mturquette@baylibre.com, sboyd@codeaurora.org, linux-kernel@vger.kernel.org, stefan@agner.ch, kernel@pengutronix.de, jslaby@suse.com, shawnguo@kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Bhuvanchandra DV List-Id: linux-serial@vger.kernel.org From: Stefan Agner Currently the tx_empty callback only considers the Transmit Complete Flag (TC). The reference manual is not quite clear if the TC flag covers the TX FIFO too. Debug prints on real hardware have shown that from time to time the TC flag is asserted (indicating Transmitter idle) while there are still data in the TX FIFO. Hence, in this case the serial core will call the shutdown callback even though there are data remaining in the TX FIFO buffers. Avoid early shutdowns by considering the TX FIFO empty flag too. Also avoid theoretical race conditions between DMA and the driver by checking whether the TX DMA is in progress too. Signed-off-by: Stefan Agner Signed-off-by: Bhuvanchandra DV --- drivers/tty/serial/fsl_lpuart.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 3d79003..fabfa7e 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -810,8 +810,18 @@ static irqreturn_t lpuart32_int(int irq, void *dev_id) /* return TIOCSER_TEMT when transmitter is not busy */ static unsigned int lpuart_tx_empty(struct uart_port *port) { - return (readb(port->membase + UARTSR1) & UARTSR1_TC) ? - TIOCSER_TEMT : 0; + struct lpuart_port *sport = container_of(port, + struct lpuart_port, port); + unsigned char sr1 = readb(port->membase + UARTSR1); + unsigned char sfifo = readb(port->membase + UARTSFIFO); + + if (sport->dma_tx_in_progress) + return 0; + + if (sr1 & UARTSR1_TC && sfifo & UARTSFIFO_TXEMPT) + return TIOCSER_TEMT; + + return 0; } static unsigned int lpuart32_tx_empty(struct uart_port *port) -- 2.9.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: bhuvanchandra.dv@toradex.com (Bhuvanchandra DV) Date: Tue, 19 Jul 2016 13:13:03 +0530 Subject: [PATCH RESEND v2 1/8] tty: serial: fsl_lpuart: consider TX FIFO too in tx_empty In-Reply-To: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> References: <20160719074310.16872-1-bhuvanchandra.dv@toradex.com> Message-ID: <20160719074310.16872-2-bhuvanchandra.dv@toradex.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Stefan Agner Currently the tx_empty callback only considers the Transmit Complete Flag (TC). The reference manual is not quite clear if the TC flag covers the TX FIFO too. Debug prints on real hardware have shown that from time to time the TC flag is asserted (indicating Transmitter idle) while there are still data in the TX FIFO. Hence, in this case the serial core will call the shutdown callback even though there are data remaining in the TX FIFO buffers. Avoid early shutdowns by considering the TX FIFO empty flag too. Also avoid theoretical race conditions between DMA and the driver by checking whether the TX DMA is in progress too. Signed-off-by: Stefan Agner Signed-off-by: Bhuvanchandra DV --- drivers/tty/serial/fsl_lpuart.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 3d79003..fabfa7e 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -810,8 +810,18 @@ static irqreturn_t lpuart32_int(int irq, void *dev_id) /* return TIOCSER_TEMT when transmitter is not busy */ static unsigned int lpuart_tx_empty(struct uart_port *port) { - return (readb(port->membase + UARTSR1) & UARTSR1_TC) ? - TIOCSER_TEMT : 0; + struct lpuart_port *sport = container_of(port, + struct lpuart_port, port); + unsigned char sr1 = readb(port->membase + UARTSR1); + unsigned char sfifo = readb(port->membase + UARTSFIFO); + + if (sport->dma_tx_in_progress) + return 0; + + if (sr1 & UARTSR1_TC && sfifo & UARTSFIFO_TXEMPT) + return TIOCSER_TEMT; + + return 0; } static unsigned int lpuart32_tx_empty(struct uart_port *port) -- 2.9.0