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: 92231 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1304189obz; Mon, 23 Jan 2017 08:48:26 -0800 (PST) X-Received: by 10.98.7.150 with SMTP id 22mr33436920pfh.69.1485190106285; Mon, 23 Jan 2017 08:48:26 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id j130si16200199pfc.6.2017.01.23.08.48.26; Mon, 23 Jan 2017 08:48:26 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@baylibre-com.20150623.gappssmtp.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751102AbdAWQsW (ORCPT + 4 others); Mon, 23 Jan 2017 11:48:22 -0500 Received: from mail-wm0-f44.google.com ([74.125.82.44]:36664 "EHLO mail-wm0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751326AbdAWQsU (ORCPT ); Mon, 23 Jan 2017 11:48:20 -0500 Received: by mail-wm0-f44.google.com with SMTP id c85so141577371wmi.1 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=gH/hwLdOkvFeGMqUDLGWUN9TrYEu0yNe9EY6QfA8UV5TZw/3ivuO4Wm9Sbrsohyu86 cNYDTCmoBqGMP368frg9d17Dngr9S/k7ltslIgcj2eSdIkJQiz3ZCUQYQPUf4yyMn42j svw/GDRMB6dNGmDDBCJnVx0ZxFfYil61jrKR/zUMu57XCj7l6cCyDeGEtkaYONu/H1W7 lAfxjNZbg9C80OcL2T0E5691y/LyKis+/K3M2430M6BFCuNyme7DIH+l8Wg4OtBZxfJR vPPeLmaYXzU6Qm1My0hOTbAmLJ880mgAq/KovhrgsV4IKheCmsJPsG/RLznvuKddpxuA gSDQ== X-Gm-Message-State: AIkVDXI7w6TCbunSE3gHZQukpMiqbl5Y2n2zeL73YMdEFB0UVeHNvZ4bXBFcQ2/DccPRE8q+ 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: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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(-) -- 2.10.2 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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;