From patchwork Mon Jan 23 16:48:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 92230 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1304187obz; Mon, 23 Jan 2017 08:48:26 -0800 (PST) X-Received: by 10.98.28.129 with SMTP id c123mr33089915pfc.92.1485190106092; 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.25; 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 S1751261AbdAWQsT (ORCPT + 4 others); Mon, 23 Jan 2017 11:48:19 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:37015 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751319AbdAWQsS (ORCPT ); Mon, 23 Jan 2017 11:48:18 -0500 Received: by mail-wm0-f53.google.com with SMTP id c206so165142013wme.0 for ; Mon, 23 Jan 2017 08:48:17 -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=l0diVk/x0C2hYHFgAMLCYylYsi9Eg2+NcvKNdF3Dt7A=; b=Z9gn92LZmpIvHxNF0ivvGSDqm4wV2vbUtH9Pdlf5B3xozNBtqhY7op2KBHNrWUP+t0 m1avy5zmT0JB+i0mTqwekVo+NnMw7T2Ma+gFt6G8WBgavpU0cBilp/hLwyohjonn7AWG ykY369z6Dkq43s5icppmVnDOqBzsEJfAJ9kOSS1Mdnt/MuQw50vkwMZLeIjVOxtFmNc5 mg9UlVxNYao4j0itnAMHwYW+pNN3grZtmYd18EAiit9bOvOCWoDtzu3VX47TnYxyl1MO 5dC0Ef9gnKvHrbGwMcXpvJpNQo/xTOotzNTctacKSfyxH+iE3JQYhVWvZsjVIYbrnGS+ JoSg== 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=l0diVk/x0C2hYHFgAMLCYylYsi9Eg2+NcvKNdF3Dt7A=; b=FDZUuDVUvyA+7nNSdbQmlYehdKy3vMl1js8f8vF1+AfkS8/2Cnqg3pKnMScRd/9WG+ rl3aq94BGBHgRM6QivWjG3FM6wwE87ajWYniyXkvI5r7XNfh+wWxkMX0wZsGTjbalIwF +FvVF0B5sVlGmj5dKEqGN111c9PR3Yxwv0JbLjA6PqopsXfUflUee4iRr7BJDtOscGX0 qGvnkidinwqsrNMZ4hTTHF4cNQy5Vt0r94KmnF60jHnxuzKGPlezw+AYJYBJFxnbIIpy uXHUQTogxHnLm7bR11nO38VgcXwTHyZwR3qjnYD0MuEaB/r1a2ddoYrCK6BRG+Gf9gMQ kHjQ== X-Gm-Message-State: AIkVDXJoYjJdw5HY7EKFe7X1q4QenW4MG/r0x7gb/il++MYA9R0EGb586ax5cHN/IKvg41o5 X-Received: by 10.28.185.77 with SMTP id j74mr15158301wmf.76.1485190096588; Mon, 23 Jan 2017 08:48:16 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id y127sm21907054wmg.12.2017.01.23.08.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 23 Jan 2017 08:48:15 -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 1/6] usb: musb: dma: Add a DMA completion platform callback Date: Mon, 23 Jan 2017 17:48:03 +0100 Message-Id: <20170123164808.27936-2-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 Currently, the CPPI 4.1 driver is not completely generic and only works on DSPS. This is because of IRQ management. Add a callback to dma_controller that could be invoked on DMA completion to acknowledge the IRQ. Signed-off-by: Alexandre Bailon --- drivers/usb/musb/musb_cppi41.c | 7 +++++-- drivers/usb/musb/musb_dma.h | 5 +++++ 2 files changed, 10 insertions(+), 2 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 1636385..f7d3d27 100644 --- a/drivers/usb/musb/musb_cppi41.c +++ b/drivers/usb/musb/musb_cppi41.c @@ -217,6 +217,10 @@ static void cppi41_dma_callback(void *private_data) int is_hs = 0; bool empty; + controller = cppi41_channel->controller; + if (controller->controller.dma_callback) + controller->controller.dma_callback(&controller->controller); + spin_lock_irqsave(&musb->lock, flags); dmaengine_tx_status(cppi41_channel->dc, cppi41_channel->cookie, @@ -249,8 +253,6 @@ static void cppi41_dma_callback(void *private_data) * We spin on HS (no longer than than 25us and setup a timer on * FS to check for the bit and complete the transfer. */ - controller = cppi41_channel->controller; - if (is_host_active(musb)) { if (musb->port1_status & USB_PORT_STAT_HIGH_SPEED) is_hs = 1; @@ -695,6 +697,7 @@ cppi41_dma_controller_create(struct musb *musb, void __iomem *base) controller->controller.channel_program = cppi41_dma_channel_program; controller->controller.channel_abort = cppi41_dma_channel_abort; controller->controller.is_compatible = cppi41_is_compatible; + controller->controller.musb = musb; ret = cppi41_dma_controller_start(controller); if (ret) diff --git a/drivers/usb/musb/musb_dma.h b/drivers/usb/musb/musb_dma.h index 46357e1..04c3bd8 100644 --- a/drivers/usb/musb/musb_dma.h +++ b/drivers/usb/musb/musb_dma.h @@ -173,6 +173,7 @@ dma_channel_status(struct dma_channel *c) /** * struct dma_controller - A DMA Controller. + * @musb: the usb controller * @start: call this to start a DMA controller; * return 0 on success, else negative errno * @stop: call this to stop a DMA controller @@ -181,10 +182,13 @@ dma_channel_status(struct dma_channel *c) * @channel_release: call this to release a DMA channel * @channel_abort: call this to abort a pending DMA transaction, * returning it to FREE (but allocated) state + * @dma_callback: invoked on DMA completion, useful to run platform + * code such IRQ acknowledgment. * * Controllers manage dma channels. */ struct dma_controller { + struct musb *musb; struct dma_channel *(*channel_alloc)(struct dma_controller *, struct musb_hw_ep *, u8 is_tx); void (*channel_release)(struct dma_channel *); @@ -196,6 +200,7 @@ struct dma_controller { int (*is_compatible)(struct dma_channel *channel, u16 maxpacket, void *buf, u32 length); + void (*dma_callback)(struct dma_controller *); }; /* called after channel_program(), may indicate a fault */