From patchwork Tue Jan 17 13:15:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9520849 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 E2F3E60244 for ; Tue, 17 Jan 2017 13:15:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EB91528543 for ; Tue, 17 Jan 2017 13:15:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E076428551; Tue, 17 Jan 2017 13:15:22 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 7C42A28543 for ; Tue, 17 Jan 2017 13:15:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750967AbdAQNPV (ORCPT ); Tue, 17 Jan 2017 08:15:21 -0500 Received: from mail-wm0-f52.google.com ([74.125.82.52]:38244 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750965AbdAQNPU (ORCPT ); Tue, 17 Jan 2017 08:15:20 -0500 Received: by mail-wm0-f52.google.com with SMTP id r144so221803781wme.1 for ; Tue, 17 Jan 2017 05:15:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Txmf5oc3bvMof3NIp+pdlskPHzOnlIr5fb2jY/KeWBc=; b=rxAwhS70BWBHmifnGFJ6SjBM2d8eci6R/5V84whzsHzw8M/jzNUAnKE2JFL1QV8fMl yftHoFvYEueCJIPkn5ew3mr6LjUpbzGyYyTdbYG8y7aWSEhyTIkxsRckGDflF3l/lKo+ F02Qo11Gyqv+K1Nh5N+euMG7j0qpX9Rd57VTnmOKzi38RjpfPlNJE6WMJrkd4qFmptOf luChfSUQRM3r06e2xjpTMfEYCw7AhrEPt7Bpnjeu2C4Z+3m947eFv7fyVssHui8bBn+F EXysXrSX9byUkzxUpSEGvdgKIG3aIjLuxChuRPKkoHRpvMvN2uwYfbLeIDO3EY5ZhYdo 4oCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Txmf5oc3bvMof3NIp+pdlskPHzOnlIr5fb2jY/KeWBc=; b=TJqqpESYZIFdYVN+JEGQRwAAt856ejwxrM69LkUlxfz20mtwnnWPS1KWgo2Glnfyld oPIZzHXQZND5AJvXFqO3UIlZ7OWjvlotvryblwpwIzFUfvdCMK2taYetoU+2wcMlzTaJ sP6bgqqaBpXDFkM4h1eRBuUZrMNw2cMq+pv+VMTqmKU3pUORPVzqAD9EOStK30BEgMP3 nomJfEFaDbOmsOqp4G2lB9ZBHirdjbSis+XhAcRjW8C9oZT1+N/ABEzwhAfMxwMkB9ZY Km6UIobp37uTVnBv6V5U7IivUAOa6kG3i8sRt9Mtcn/CSd+J1aRR+mXeE+BQxB9y60M/ o6MA== X-Gm-Message-State: AIkVDXJCL2aoD2ZOlUQTLgFMcT5EhRDQW9sZB+5uHVTZ7Er8Ao02Do61kGLLMbFN6/mcWqOL X-Received: by 10.28.181.145 with SMTP id e139mr15377704wmf.103.1484658919375; Tue, 17 Jan 2017 05:15:19 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 197sm37008036wmy.16.2017.01.17.05.15.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Jan 2017 05:15:18 -0800 (PST) From: Alexandre Bailon To: vinod.koul@intel.com Cc: dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, b-liu@ti.com, sergei.shtylyov@cogentembedded.com, Alexandre Bailon Subject: [PATCH v2 2/2] usb: musb: cppi41: Detect aborted transfers in cppi41_dma_callback() Date: Tue, 17 Jan 2017 14:15:11 +0100 Message-Id: <20170117131511.7252-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170117131511.7252-1-abailon@baylibre.com> References: <20170117131511.7252-1-abailon@baylibre.com> Sender: dmaengine-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Update cppi41_dma_callback() to detect an aborted transfer. This was not required before because cppi41_dma_callback() was only invoked on transfer completion. In order to make CPPI 4.1 driver more generic, cppi41_dma_callback() will be invoked after a transfer abort in order to let the MUSB driver perform some action such as acknowledge the interrupt that may be fired during a teardown. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/musb_cppi41.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/usb/musb/musb_cppi41.c b/drivers/usb/musb/musb_cppi41.c index d76022b..f182c07 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -101,7 +101,8 @@ static bool musb_is_tx_fifo_empty(struct musb_hw_ep *hw_ep) return true; } -static void cppi41_dma_callback(void *private_data); +static void cppi41_dma_callback(void *private_data, + const struct dmaengine_result *result); static void cppi41_trans_done(struct cppi41_dma_channel *cppi41_channel) { @@ -156,7 +157,7 @@ static void cppi41_trans_done(struct cppi41_dma_channel *cppi41_channel) if (WARN_ON(!dma_desc)) return; - dma_desc->callback = cppi41_dma_callback; + dma_desc->callback_result = cppi41_dma_callback; dma_desc->callback_param = &cppi41_channel->channel; cppi41_channel->cookie = dma_desc->tx_submit(dma_desc); trace_musb_cppi41_cont(cppi41_channel); @@ -206,7 +207,8 @@ static enum hrtimer_restart cppi41_recheck_tx_req(struct hrtimer *timer) return ret; } -static void cppi41_dma_callback(void *private_data) +static void cppi41_dma_callback(void *private_data, + const struct dmaengine_result *result) { struct dma_channel *channel = private_data; struct cppi41_dma_channel *cppi41_channel = channel->private_data; @@ -223,6 +225,9 @@ static void cppi41_dma_callback(void *private_data) if (controller->dma_callback) controller->dma_callback(musb); + if (result->result == DMA_TRANS_ABORTED) + return; + spin_lock_irqsave(&musb->lock, flags); dmaengine_tx_status(cppi41_channel->dc, cppi41_channel->cookie, @@ -415,7 +420,7 @@ static bool cppi41_configure_channel(struct dma_channel *channel, if (!dma_desc) return false; - dma_desc->callback = cppi41_dma_callback; + dma_desc->callback_result = cppi41_dma_callback; dma_desc->callback_param = channel; cppi41_channel->cookie = dma_desc->tx_submit(dma_desc); cppi41_channel->channel.rx_packet_done = false;