From patchwork Mon Jan 23 16:48:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9533101 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 E75D6604A0 for ; Mon, 23 Jan 2017 16:48:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC1D328375 for ; Mon, 23 Jan 2017 16:48:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0B5E283F3; Mon, 23 Jan 2017 16:48:26 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 84FF028375 for ; Mon, 23 Jan 2017 16:48:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751339AbdAWQsZ (ORCPT ); Mon, 23 Jan 2017 11:48:25 -0500 Received: from mail-wm0-f48.google.com ([74.125.82.48]:37047 "EHLO mail-wm0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751331AbdAWQsZ (ORCPT ); Mon, 23 Jan 2017 11:48:25 -0500 Received: by mail-wm0-f48.google.com with SMTP id c206so165143603wme.0 for ; Mon, 23 Jan 2017 08:48:19 -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=M3JGUCPukR36GxqCxOt+9YFra680uwO0q/ypxhNKYh4=; b=pDW8aUTWRCdbYbsQdCjoGWtLic48TBhl+EDadquFE/tMg0S2J5PhvxBuTSdT/LJrPK WTZq4IT8fRz4mAxJEsINaPNHdaU005M+rmIA3RIg23CdX3RQb3HKVXzWtBsVFzuy7iAI MEbRXv+ahqqpKaeNFJPnOugB/a0Fp9ImHhRSoL5FmOf1EdBddgA81HVjCzIka7+ksgse f+NRoI738V/H6A/Dmv+8dr37nDYUi34Puu5dE3z2OgnrGSFpDBtzs5J7DMtMNHvwCrK0 trU4k+ZCBEhNPX42uN+Xik2Hl8M7Mhi1RiUlh/Z1dlft79Ank+POm9LLzXC3/63hFpz6 aOKg== 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=M3JGUCPukR36GxqCxOt+9YFra680uwO0q/ypxhNKYh4=; b=pjY+tazUir0MTo30WLaFGy5XdjfNX5P2fJKdPc+NIxA+7+z3V7M7YyYjyv85VGhFcY p84Y0ojWvnP6MNdWTXV6SZaNYJAPw/LkPaEu+M5MT/plOMoPuWvIZdTi0CFfW2vCNOuT LOzMLF4yvtjz/kYDMIS5J+pqldWjSKfbNlUcw1aCtVHKDinBPUxALBxKJwP6BPFclTwz 9tDfaQKtv1YbRa0oPVHNrkSkk5+0zfgM0uhRT+CvsjkVABrLa0912l6iGcqNFArmMCFi AMqQGLcZ6E3XfTdIgfLQzImyi7tkACJj/QWnPWN83BjuC94/IP70L5pzwggGszFsC84v i2Ag== X-Gm-Message-State: AIkVDXKFwTllJC8eyrGC+RivvmdYy2ZKSBmaSiN9DXa9s+1RjlJp2SAnSLF45Q95C8VZSVf/ X-Received: by 10.28.54.226 with SMTP id y95mr13937525wmh.105.1485190098605; Mon, 23 Jan 2017 08:48:18 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id y127sm21907054wmg.12.2017.01.23.08.48.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 08:48:18 -0800 (PST) From: Alexandre Bailon To: b-liu@ti.com Cc: vinod.koul@intel.com, dmaengine@vger.kernel.org, nsekhar@ti.com, khilman@baylibre.com, ptitiano@baylibre.com, tony@atomide.com, linux-omap@vger.kernel.org, sergei.shtylyov@cogentembedded.com, Alexandre Bailon Subject: [PATCH v4 2/6] usb: musb: cppi41: Detect aborted transfers in cppi41_dma_callback() Date: Mon, 23 Jan 2017 17:48:04 +0100 Message-Id: <20170123164808.27936-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170123164808.27936-1-abailon@baylibre.com> References: <20170123164808.27936-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 f7d3d27..1fe7eae 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -99,7 +99,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) { @@ -154,7 +155,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); @@ -204,7 +205,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; @@ -221,6 +223,9 @@ static void cppi41_dma_callback(void *private_data) if (controller->controller.dma_callback) controller->controller.dma_callback(&controller->controller); + if (result->result == DMA_TRANS_ABORTED) + return; + spin_lock_irqsave(&musb->lock, flags); dmaengine_tx_status(cppi41_channel->dc, cppi41_channel->cookie, @@ -403,7 +408,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;