From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752173AbcF1HGp (ORCPT ); Tue, 28 Jun 2016 03:06:45 -0400 Received: from mail-db3on0146.outbound.protection.outlook.com ([157.55.234.146]:63204 "EHLO emea01-db3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750753AbcF1HGo (ORCPT ); Tue, 28 Jun 2016 03:06:44 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=bhuvanchandra.dv@toradex.com; From: Bhuvanchandra DV To: CC: , , , , , , , , , , "Bhuvanchandra DV" Subject: [PATCH v2 8/9] tty: serial: fsl-lpuart: Update suspend/resume for DMA mode Date: Tue, 28 Jun 2016 11:02:34 +0530 Message-ID: <20160628053235.5114-9-bhuvanchandra.dv@toradex.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160628053235.5114-1-bhuvanchandra.dv@toradex.com> References: <20160628053235.5114-1-bhuvanchandra.dv@toradex.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [115.115.243.34] X-ClientProxiedBy: BM1PR01CA0056.INDPRD01.PROD.OUTLOOK.COM (10.163.199.28) To HE1PR0501MB2089.eurprd05.prod.outlook.com (10.167.246.9) X-MS-Office365-Filtering-Correlation-Id: a63eb9ed-a75e-4092-21bb-08d39f15bff7 X-Microsoft-Exchange-Diagnostics: 1;HE1PR0501MB2089;2:SSRGaOVCyh2PdfVq3Q24UgvuSJvKVKUNWbRvb7F4ojEftow3Mi/bUOLi/PLn0KmRtig/TkcHARaryLirUAbMqOu3S261LJuSO1dm8Gn+rtuuBExO0Gqxrifx2Hu2oPRBTahmC6iUwD0SKxA8NVaEtiE+JzqLNWXBy3C/6ris4vkGeG8kqjfRi3Tij4CvsTUQ;3:rYK9BjJdClnCp/WxZBFarS222cjFRYXNpcUUkoGx1jN3+3XjUft+a4oBwfLHed/MuWMlgs98RFvquJYmJH0aJ6QIVirbC2pYe7g9h6VLT1UxjW1YL2XopRjDYO6OVvME;25:Zf+60DXUaaJ7EzSCxHGGO7019w1RD2sV7tDgjUUNn8QBzyE6wzxZsr5xk59Don+DZjuYEOQbZgJ4UmYvEIlGjb6Xv2rD4IeFP1cxTbNkDjIrNwx5vPxPvHtLbH0dNMaHxx5fdEdnI/T6i/rxkmdn5qLNFOOymg6ustqjp9yzhXIfw+KrOkR/ZzLVNUvaBJnTneEffTxR7gg4+JZZMW/YIZ1J94KbOGq8Zr/cVMOfUr79rdmXqtmmYcyL+nlzjbEMW9ApOgb8O2q0FtJdKjSyeCAQ/yRVPlG9BFxw28wLTbzDIfT8/5ubldAAmp7eVNXj9F2TeBHazcVDMpqsh+bwwDRK9KvxDmTmPunWbZ5r3jxjpObWE5sb4X5jINtI8TZoOO+HwXjSywq7nvR+BfWaAd1Z5HVyl4ohiC0SIBUk8h4= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0501MB2089; X-Microsoft-Exchange-Diagnostics: 1;HE1PR0501MB2089;20:2HtwXhhjaGTM5+hIt06s1DqrfAIhj2Im64b1o7lCtCKlHGDTQUpGzsoUD4KLg/Hct28vC18G3PE/fuwojWlpaPkKL9b2CWq922ed3L2myHWXfB/LAWR21c0fLambzwmvWNoEbSccyh2ItjBBvZNzJXvIluuPVVrOfcPIhzZXnGDtKAGeDZKP4MF1K/QuwkO8+eQPThvf66tDteXG3j0ccdS3JxL1cyg6eS+OTqNhwYSIT2ZaI969dNDJiGz6Cy0cmbXbmbcWCqsxKOQt+RwRkb/0rF/rVFN5qiPd5QdsNFEfnaljzm5mp/2cWexZ70YtYmN4Ld9S/MTx7vBm3jJQ8w==;4:uWkOhww/blqXHZdnOHbm6/1dHMLEInwa0cVCSp+bgdwhTNsNCF8kLB3P4ohWek6hM9baPA2ZtkJpHyAWhsffF7rlpZQjtFu7VLMZLgvNZRJ++VD540+U41Oic9d31LuFWg1OOzwfqbjDgNwNj01F7Xtbsny5cIL/bT9AmE4baO0VfIACkrkU2T7TIlaNBt8FjXcB41WurFwOx3B1j03roz7DJxiHH+/YcFGeR5JMhFeS/H7UlYcchlw5s5+uP7l27JPFpfHQZaHZ4ART5nIc6vb+q5VTDWGOgCI8qaXOc9y0FV8MtpKJ7X7tav+ACMOXw2n/dP0jvvgc83Yyqt0wCmpmtvAoEqum1eRJ+LdHP3zVBpmVlK9TxC36RwdymdMO 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)(10201501046)(3002001);SRVR:HE1PR0501MB2089;BCL:0;PCL:0;RULEID:;SRVR:HE1PR0501MB2089; X-Forefront-PRVS: 0987ACA2E2 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(189998001)(50226002)(110136002)(107886002)(7846002)(47776003)(66066001)(36756003)(8676002)(101416001)(1076002)(48376002)(33646002)(6116002)(81166006)(92566002)(3846002)(50986999)(586003)(81156014)(50466002)(2351001)(2950100001)(77096005)(105586002)(229853001)(86362001)(76176999)(5003940100001)(68736007)(305945005)(106356001)(4326007)(7736002)(53416004)(4001430100002)(15650500001)(19580405001)(19580395003)(69596002)(42186005)(97736004)(2906002);DIR:OUT;SFP:1102;SCL:1;SRVR:HE1PR0501MB2089;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;HE1PR0501MB2089;23:MVg0gyAXyQBlXTzR1wckYmhjRjJ1Y+Kq35Ck/Fg?= =?us-ascii?Q?GwpEvmW9jhRbzKs5QCugqMCCDl+iP7FMgeyZufTFaq7yN08XYQtXP68j5g6t?= =?us-ascii?Q?GdmaV/qiex8nYcLRNb1ChBKLJeL7g2J3LmWueTTJuIWuIwvGSUuEFkuIwWC2?= =?us-ascii?Q?dszL2wYAqt49/TeXr96HI2ShiBT0M9fNaZ2+UbeN9gyrPUgh4GAx4NvSQIkc?= =?us-ascii?Q?Tme5BuHOrizxH2umgyCnnGAGpXr17y1axhpnsVHaoiNJrdcjh732l2Q69I2R?= =?us-ascii?Q?77+wwDvBRKgNkKKb53z8cCdpjZpHiIVJ9irj0lGt9RSHHCaa95twz8jX7V+v?= =?us-ascii?Q?1JmLDzVMVhN7BWYKt34Ot/fSIjv4MGmNvcE7dlMeCvmVRW40LPPNnsTqY2JO?= =?us-ascii?Q?grzUFMtsP2Dp7qXTDadhLpSbpuhWabDyn4HNoJuMTFct8YAER4RfqoftjB+b?= =?us-ascii?Q?E0fpvP3vFhpMNAYRB2hvO2QHwWU/q3B563GvhD4HEPM5/4RshmpfRwM2Ljj9?= =?us-ascii?Q?YBJ+zO99HNvY0J7yQS+aRp0IgG8+9YyWBEgGaVynFc4Yj9SxgPQ2ZmhcmoHQ?= =?us-ascii?Q?OvJETDx9m8YXTFeGzyC8E951waQnAMoL/WLPiOAUXr0Q8dzZzREICcgtaeRc?= =?us-ascii?Q?N/lqg4j8dLO9txuLruSbbgPCdQnK+nOyci/6LA0yg3KpFWecs94ayb2KgzZ4?= =?us-ascii?Q?PsA3SnTfdyFh74Bj8bBKLxJtuJ2UHwuVTkWdBk85MZvBtiP60tJLR2yqUrt+?= =?us-ascii?Q?W21DOJFGAzhukqcNQXBR1odMVXfQs9k61uW93vlx5lW7BeHaTl54eD1XmwW6?= =?us-ascii?Q?4FOjEzhfkiUi35A9vBSjIRrWt4+czAVJP0sm0WkpKmh5Z/PW4Xk/Iw0rz5Ol?= =?us-ascii?Q?1pTS5rmbDXIlqavfJ7vt8nYlO3nhg811dnBE9+UZ58dOROYgSrychC5AJZCv?= =?us-ascii?Q?/RcCn8NKwwkj9x+T8U/MiJuOiTLe0bm89c6wsgWd9hmVCbJzVIdLRvaRXKp6?= =?us-ascii?Q?4Ukst02WJjmPqn+KgzCSHVrW5KYJzCflYbpyDX2ejYMnraWzhLARyRa2bahl?= =?us-ascii?Q?FV3Bx4vO5LA0OFy5bva3jXygNyY2IsPA/bWF7pM0lKcWR6Qc1Z1N+v/Ijdi+?= =?us-ascii?Q?D21Cfr1lsWYcptLsqRcH2p2TvdcsF7jOJHxuEu0g5ZkqTGAyHYw52evfLsFs?= =?us-ascii?Q?+eKbAb9G6STmMEqDPQiv9Uuh5/kF+ipwydm0s?= X-Microsoft-Exchange-Diagnostics: 1;HE1PR0501MB2089;6:n3w51EnBT2XAM5cgyzqj005tX9WNxmb77j+CwIURXYv0Sr1ZvmMWmMsNf4mjAW32TkzZXlpJk0qbv90oRuTaPnriWXb01HPOSvflliMdjlSd28/Eo/euL+8PjzY8BtUkr08bblbIyf5+ie15u4J442igBBvy1JXLq6yzZEuUbfv/cUSmPLfJ67e4Ni254wgOEljQsypwOCDwTNE9M/rAJhfqgFGXOmdmxbjs8ve/k1NA6LDn57jw++YxyxhENt2BLHSY9/DTQXipt2OAESiAJHftcMvmJcYqMF7O/TzY2Lda+rZdacVP4Q2wPC4M9aUM;5:izIaugMIvM/04JApruHJoNPUVXOLAanJKPawF4HpRVV5hp9cttMyDHEwskSy6rpNWfcJKOi6MrQYBMFeLtY88vxDEOq5eU6zXRiWeAJJTRO21dCRIoYHFNtfJCphV7SH15qzjSlOwpUkxasMmiPmjQ==;24:R5ABzDmym6wGY82C1+JsMi8J89XyoUwAmS+4qFPTCOu7IlNVGbOej8cW1NBtOVBhGzAK3BAAs9iDyO86lwUlGrM6vblOl/iZfS2OGotN4qI=;7:NOXdGQ/F5Vr8CFII3WgvD5+fiCACE3O7jVSMLNoOmwx5xWgg1sYqQYUS1QY7cNTKZ7nf29zB+cAdnIigKBjw5ijusaLsBD2doZu53iGd1AuN5hkQz+L8GuPN2D1Xd0BXETfFO6ymLhBCkzVmemwAyqZAGZkRW5OAX+h6wmYm6o/ug3waGgpYBRIpAdGyQ3VMVK3qpLkxX2YL70IjScjJRJUmnOrkKBvBcuDWV/uZa27P4O22E3zg9oR1reyIwEYfEpQD4z+ZlSx0I7MhuMQ+4A== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2016 05:33:32.9944 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2089 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When DMA mode is enabled one need to make sure the DMA channels are idle before entering suspend mode especially when UART ports which are set as wakeup source and console port with no_console_suspend is set. This patch takes care of gracefully releasing DMA channels for the above two cases and start the DMA at resume. Signed-off-by: Bhuvanchandra DV --- drivers/tty/serial/fsl_lpuart.c | 44 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 27687d5..134090a 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -1943,6 +1943,30 @@ static int lpuart_suspend(struct device *dev) } uart_suspend_port(&lpuart_reg, &sport->port); + + if (sport->lpuart_dma_rx_use) { + /* + * EDMA driver during suspend will forcefully release any + * non-idle DMA channels. If port wakeup is enabled or if port + * is console port or 'no_console_suspend' is set the Rx DMA + * cannot resume as as expected, hence gracefully release the + * Rx DMA path before suspend and start Rx DMA path on resume. + */ + if (sport->port.irq_wake) { + del_timer_sync(&sport->lpuart_timer); + lpuart_dma_rx_free(&sport->port); + } + + /* Disable Rx DMA to use UART port as wakeup source */ + writeb(readb(sport->port.membase + UARTCR5) & ~UARTCR5_RDMAS, + sport->port.membase + UARTCR5); + } + + if (sport->lpuart_dma_tx_use) { + sport->dma_tx_in_progress = false; + dmaengine_terminate_all(sport->dma_tx_chan); + } + if (sport->port.suspended && !sport->port.irq_wake) clk_disable_unprepare(sport->clk); @@ -1970,6 +1994,26 @@ static int lpuart_resume(struct device *dev) writeb(temp, sport->port.membase + UARTCR2); } + if (sport->lpuart_dma_rx_use) { + if (sport->port.irq_wake) { + if (!lpuart_start_rx_dma(sport)) { + sport->lpuart_dma_rx_use = true; + rx_dma_timer_init(sport); + } else { + sport->lpuart_dma_rx_use = false; + } + } + } + + if (sport->dma_tx_chan && !lpuart_dma_tx_request(&sport->port)) { + init_waitqueue_head(&sport->dma_wait); + sport->lpuart_dma_tx_use = true; + writeb(readb(sport->port.membase + UARTCR5) | + UARTCR5_TDMAS, sport->port.membase + UARTCR5); + } else { + sport->lpuart_dma_tx_use = false; + } + uart_resume_port(&lpuart_reg, &sport->port); return 0; -- 2.9.0