From patchwork Fri Jun 29 14:25:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 10496701 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 87D576016C for ; Fri, 29 Jun 2018 14:25:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F9A129173 for ; Fri, 29 Jun 2018 14:25:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63352292F5; Fri, 29 Jun 2018 14:25:31 +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=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0899229173 for ; Fri, 29 Jun 2018 14:25:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933031AbeF2OZ3 (ORCPT ); Fri, 29 Jun 2018 10:25:29 -0400 Received: from michel.telenet-ops.be ([195.130.137.88]:49252 "EHLO michel.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755446AbeF2OZW (ORCPT ); Fri, 29 Jun 2018 10:25:22 -0400 Received: from ayla.of.borg ([84.194.111.163]) by michel.telenet-ops.be with bizsmtp id 4eRL1y00U3XaVaC06eRLxr; Fri, 29 Jun 2018 16:25:21 +0200 Received: from rox.of.borg ([192.168.97.57]) by ayla.of.borg with esmtp (Exim 4.86_2) (envelope-from ) id 1fYuKu-0006sI-Fn; Fri, 29 Jun 2018 16:25:20 +0200 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1fYuKu-0005Pe-EP; Fri, 29 Jun 2018 16:25:20 +0200 From: Geert Uytterhoeven To: Greg Kroah-Hartman , Jiri Slaby , Laurent Pinchart , Ulrich Hecht , Wolfram Sang Cc: linux-serial@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 2/4] serial: sh-sci: Stop using deprecated dmaengine_terminate_all() Date: Fri, 29 Jun 2018 16:25:11 +0200 Message-Id: <20180629142513.20743-6-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180629142513.20743-1-geert+renesas@glider.be> References: <20180629142513.20743-1-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As of commit b36f09c3c441a6e5 ("dmaengine: Add transfer termination synchronization support"), dmaengine_terminate_all() is deprecated. Replace calls to dmaengine_terminate_all() in DMA release code by calls to dmaengine_terminate_sync(), as the latter waits until all running completion callbacks have finished. Replace calls to dmaengine_terminate_all() in DMA failure paths by calls to dmaengine_terminate_async(), as these are usually done in atomic context. Signed-off-by: Geert Uytterhoeven --- drivers/tty/serial/sh-sci.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 898c1034cad23a88..061660ccf9442d02 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -1613,7 +1613,7 @@ dev_dbg_dma(port->dev, "%s\n", __func__); s->chan_rx_saved = s->chan_rx = NULL; s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL; WARN(!chan, "RX DMA channel already released\n"); - dmaengine_terminate_all(chan); + dmaengine_terminate_sync(chan); dma_free_coherent(chan->device->dev, s->buf_len_rx * 2, s->rx_buf[0], sg_dma_address(&s->sg_rx[0])); dma_release_channel(chan); @@ -1708,7 +1708,7 @@ dev_dbg_dma(port->dev, "%s\n", __func__); s->chan_tx_saved = s->chan_tx = NULL; s->cookie_tx = -EINVAL; WARN(!chan, "TX DMA channel already released\n"); - dmaengine_terminate_all(chan); + dmaengine_terminate_sync(chan); dma_unmap_single(chan->device->dev, s->tx_dma_addr, UART_XMIT_SIZE, DMA_TO_DEVICE); dma_release_channel(chan); @@ -1747,7 +1747,7 @@ dev_dbg_dma(s->port.dev, " %s\n", __func__); fail: if (i) - dmaengine_terminate_all(chan); + dmaengine_terminate_async(chan); // FIXME Not needed? for (i = 0; i < 2; i++) s->cookie_rx[i] = -EINVAL; @@ -1877,9 +1877,9 @@ dev_dbg_dma(port->dev, " %s active %d\n", __func__, active); /* Handle incomplete DMA receive */ dev_dbg_dma(port->dev, " %s:%u dmaengine_terminate_all()\n", __func__, __LINE__); - dmaengine_terminate_all(s->chan_rx); + dmaengine_terminate_async(s->chan_rx); // FIXME More data may have been transfered in between - // FIXME dmaengine_tx_status() and dmaengine_terminate_all() + // FIXME dmaengine_tx_status() and dmaengine_terminate_async() // FIXME Call dmaengine_pause() first dev_dbg_dma(port->dev, " %s:%u terminated\n", __func__, __LINE__); read = sg_dma_len(&s->sg_rx[active]) - state.residue;