Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp1887726ybv; Sun, 23 Feb 2020 17:40:53 -0800 (PST) X-Google-Smtp-Source: APXvYqzZy4tfKd11tyrCMLUg6mflbzcWbLo+N7eArsYK72FcFPHn7m+8uyvSHLPtKyn9re2I4RPm X-Received: by 2002:aca:d6c8:: with SMTP id n191mr11415528oig.103.1582508452996; Sun, 23 Feb 2020 17:40:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582508452; cv=none; d=google.com; s=arc-20160816; b=IbI1iRcOapRXwOdxchf2jHP2Cjx97mOIjyPAd9rngj/8aD5N2iRy9pQJzw8ehlfaFd qFdItfE1VH6cErX+V1atKcvbFisim7B87NBqKti8qHuaNddM1rNiQKvPdeyzOZ2GXVj5 Mf93wSD7vLLpO/Lf7cBZZqGgzv1rCfZ8cYirHT09G12XZJF7egFpxpK0qtJq/YL95kXL ohiAczdshQ6gRFJ8eakxkmu46H86BmtBsm/ppaokAnX8gjtLGmwoXdi6YUGYBrsNdLlO xqu2mDXIXnxqUZQWXYAZ3bjaWu+czZzeSr3IOnvKSXwsP4cBmWb9jWXRDr53q9ynNstP PJ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=GObN9rhaFO9t/i2pLNrh4fBLu0SZEBlNmPj4z+RrW3I=; b=aJpQ7QURTjrDI+/s4iJMuuAxXYVoCgvg4OBybIcI2du8peeHot53oXo5MkCzBtfAfK 7BpH/XfX3QwiTplJnidfKqqnWHStuOOLsBtIYNg4MyNaCsSOl/kDqf8UgRyiRC1X927i oTxbrf+erX9UdLeqZno8TzJKioR7UmgsFxHKc8/EefoDiCMoxVFMruGtw1oITLndzmA/ QbUSPf3ui+O6WwZsbPJsDgWE4H0jDNWxf/1FoCHmEXJo1RIeBdj8pW+YEi7/GNPQC+sN jKZsxa3kOhuOiImz7C/wHUVeb0g7iqY7QG5qBcsDC8PIFvUUwzJVbi7yPf1EKIrV35Zz t8hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@crapouillou.net header.s=mail header.b=MNy3b7n1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z3si3766445oib.164.2020.02.23.17.40.41; Sun, 23 Feb 2020 17:40:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@crapouillou.net header.s=mail header.b=MNy3b7n1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=crapouillou.net Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727252AbgBXBka (ORCPT + 99 others); Sun, 23 Feb 2020 20:40:30 -0500 Received: from outils.crapouillou.net ([89.234.176.41]:48598 "EHLO crapouillou.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727158AbgBXBk3 (ORCPT ); Sun, 23 Feb 2020 20:40:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1582508423; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GObN9rhaFO9t/i2pLNrh4fBLu0SZEBlNmPj4z+RrW3I=; b=MNy3b7n1bvLadwjh362n6BG/743PuiKjzxC22Uvh+1arKfDI7kWdRiuQsl6JBesFcXuXWo sEcAi7/VVX2cRQqkjwN9THBcbT07qUSo0tnmdUPEFkYMl0qsaHv1DCcRsD4vkdZ8Fl2qiC 2903t0/4gA/SA9PUEFsvQe4BVMTEc1g= From: Paul Cercueil To: Bin Liu , Greg Kroah-Hartman Cc: od@zcrc.me, linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Paul Cercueil , Artur Rojek Subject: [PATCH v2 2/5] usb: musb: jz4740: Add support for DMA Date: Sun, 23 Feb 2020 22:40:05 -0300 Message-Id: <20200224014008.27114-2-paul@crapouillou.net> In-Reply-To: <20200224014008.27114-1-paul@crapouillou.net> References: <20200224014008.27114-1-paul@crapouillou.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for using the DMA channels built into the Inventra IP. Signed-off-by: Paul Cercueil Tested-by: Artur Rojek --- Notes: v2: No change drivers/usb/musb/Kconfig | 2 +- drivers/usb/musb/jz4740.c | 20 ++++++++++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index eb2ded1026ee..c4b349e074c1 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -144,7 +144,7 @@ config USB_UX500_DMA config USB_INVENTRA_DMA bool 'Inventra' - depends on USB_MUSB_OMAP2PLUS || USB_MUSB_MEDIATEK + depends on USB_MUSB_OMAP2PLUS || USB_MUSB_MEDIATEK || USB_MUSB_JZ4740 help Enable DMA transfers using Mentor's engine. diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c index bc0109f4700b..aa32b5af0c1f 100644 --- a/drivers/usb/musb/jz4740.c +++ b/drivers/usb/musb/jz4740.c @@ -24,11 +24,14 @@ struct jz4740_glue { static irqreturn_t jz4740_musb_interrupt(int irq, void *__hci) { unsigned long flags; - irqreturn_t retval = IRQ_NONE; + irqreturn_t retval = IRQ_NONE, retval_dma = IRQ_NONE; struct musb *musb = __hci; spin_lock_irqsave(&musb->lock, flags); + if (IS_ENABLED(CONFIG_USB_INVENTRA_DMA) && musb->dma_controller) + retval_dma = dma_controller_irq(irq, musb->dma_controller); + musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB); musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX); musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX); @@ -46,7 +49,10 @@ static irqreturn_t jz4740_musb_interrupt(int irq, void *__hci) spin_unlock_irqrestore(&musb->lock, flags); - return retval; + if (retval == IRQ_HANDLED || retval_dma == IRQ_HANDLED) + return IRQ_HANDLED; + + return IRQ_NONE; } static struct musb_fifo_cfg jz4740_musb_fifo_cfg[] = { @@ -93,14 +99,14 @@ static int jz4740_musb_init(struct musb *musb) return 0; } -/* - * DMA has not been confirmed to work with CONFIG_USB_INVENTRA_DMA, - * so let's not set up the dma function pointers yet. - */ static const struct musb_platform_ops jz4740_musb_ops = { .quirks = MUSB_DMA_INVENTRA | MUSB_INDEXED_EP, .fifo_mode = 2, .init = jz4740_musb_init, +#ifdef CONFIG_USB_INVENTRA_DMA + .dma_init = musbhs_dma_controller_create_noirq, + .dma_exit = musbhs_dma_controller_destroy, +#endif }; static const struct musb_hdrc_platform_data jz4740_musb_pdata = { @@ -142,6 +148,8 @@ static int jz4740_probe(struct platform_device *pdev) } musb->dev.parent = dev; + musb->dev.dma_mask = &musb->dev.coherent_dma_mask; + musb->dev.coherent_dma_mask = DMA_BIT_MASK(32); glue->pdev = musb; glue->clk = clk; -- 2.25.0