From patchwork Thu Jan 19 11:13:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Bailon X-Patchwork-Id: 9525483 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 69A6B60437 for ; Thu, 19 Jan 2017 11:14:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59BF628335 for ; Thu, 19 Jan 2017 11:14:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4EC2A284FF; Thu, 19 Jan 2017 11:14:27 +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 D7DD228335 for ; Thu, 19 Jan 2017 11:14:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065AbdASLOW (ORCPT ); Thu, 19 Jan 2017 06:14:22 -0500 Received: from mail-wm0-f45.google.com ([74.125.82.45]:37355 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752178AbdASLOO (ORCPT ); Thu, 19 Jan 2017 06:14:14 -0500 Received: by mail-wm0-f45.google.com with SMTP id c206so71859786wme.0 for ; Thu, 19 Jan 2017 03:13:43 -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=s395wfEOusiV7TW7/zNVWoxXfodIGsDhtUtetP+1rMI=; b=dU62tKpkvGUgSPcvQCxcD+SJeGVyOlrnqJCa3a2A2v1vW4hmM77I2nRqofl0QfM8Bv DKZ+gvA0hVlJNxfIkkozx0Wl/Qe3YUifZolPKVl2i+fPe2iljGYgC4TNlsIVRKW4WV24 BfHNPQ4am+nqfRrB2lIgJcewbUSVvNIoDCpGyPV352G1jc+/fkNdGtLgCPPyE3Av+3zy IaDI7zZFROqpIew5DVQAKqjHRFoLry4UDrrXSXGy7II1SI1uNkDCGweUuYI0ykNnwcrh AU5/fvOeI0z0YaTSSYwaXPp5YPVotT6i7N8oYx1maGDNYLqULKoO6LD61mAl3ShdXS4w vuzg== 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=s395wfEOusiV7TW7/zNVWoxXfodIGsDhtUtetP+1rMI=; b=t2se0OhA0ebA9KW8uTWiAWVEUsQFwmbkg7TvzdBmlHpTdbb7HrplovPa4Zfe/Wh6GR G69bUBcuUCU7UbbT9h5ovIPxijmLbBpuerThuk9QzPVSulMrWrq3+B53HjrTu2Nt85Xr p1ol10JIDwSuqhNeQ2Xt/vu7X2O7IFrXwfNR93/gcrc+1E1H0L2Ta6ri6+UrrdRuTkpv uPZQnJ9dylpgDJzJ0aWS3d0DgNmW9JtqBGqlG0qp7Yt/oLvx6G15rXR4ubHsrhbeLmnI GKMBvozCP9Z/vBNzqGQvad3LOyrJNvtzdaLrZm3N5TlsDwMQwNuOR2YC6Y/9MMqiZj1f WcdQ== X-Gm-Message-State: AIkVDXLf2ngKm7qyf1gen/RzcfZKX2tX/7SdRACvWaiLhJXJIvGh2sldxDONQ5oWFQvWWuxI X-Received: by 10.28.136.13 with SMTP id k13mr6983595wmd.94.1484824423035; Thu, 19 Jan 2017 03:13:43 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id g75sm12117028wme.5.2017.01.19.03.13.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 03:13:42 -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, grygorii.strashko@ti.com, linux-usb@vger.kernel.org, Alexandre Bailon Subject: [PATCH v3 2/3] dmaengine: cppi41: Add support of DA8xx to CPPI 4.1 Date: Thu, 19 Jan 2017 12:13:33 +0100 Message-Id: <20170119111334.14718-3-abailon@baylibre.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170119111334.14718-1-abailon@baylibre.com> References: <20170119111334.14718-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 The DA8xx has a CPPI 4.1 DMA controller. This is add the glue layer required to make it work on DA8xx. Signed-off-by: Alexandre Bailon --- drivers/dma/Kconfig | 6 +++--- drivers/dma/cppi41.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 0d6a96e..03ae2a1 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -514,12 +514,12 @@ config TIMB_DMA Enable support for the Timberdale FPGA DMA engine. config TI_CPPI41 - tristate "AM33xx CPPI41 DMA support" - depends on ARCH_OMAP + tristate "CPPI41 DMA support" + depends on (ARCH_OMAP || ARCH_DAVINCI_DA8XX) select DMA_ENGINE help The Communications Port Programming Interface (CPPI) 4.1 DMA engine - is currently used by the USB driver on AM335x platforms. + is currently used by the USB driver on AM335x and DA8xx platforms. config TI_DMA_CROSSBAR bool diff --git a/drivers/dma/cppi41.c b/drivers/dma/cppi41.c index 9767b97..f6f2d84 100644 --- a/drivers/dma/cppi41.c +++ b/drivers/dma/cppi41.c @@ -221,6 +221,20 @@ static const struct chan_queues am335x_usb_queues_rx[] = { [29] = { .submit = 30, .complete = 155}, }; +static const struct chan_queues da8xx_usb_queues_tx[] = { + [0] = { .submit = 16, .complete = 24}, + [1] = { .submit = 18, .complete = 24}, + [2] = { .submit = 20, .complete = 24}, + [3] = { .submit = 22, .complete = 24}, +}; + +static const struct chan_queues da8xx_usb_queues_rx[] = { + [0] = { .submit = 1, .complete = 26}, + [1] = { .submit = 3, .complete = 26}, + [2] = { .submit = 5, .complete = 26}, + [3] = { .submit = 7, .complete = 26}, +}; + struct cppi_glue_infos { irqreturn_t (*isr)(int irq, void *data); const struct chan_queues *queues_rx; @@ -951,8 +965,18 @@ static const struct cppi_glue_infos am335x_usb_infos = { .qmgr_num_pend = 5, }; +static const struct cppi_glue_infos da8xx_usb_infos = { + .isr = cppi41_irq, + .queues_rx = da8xx_usb_queues_rx, + .queues_tx = da8xx_usb_queues_tx, + .td_queue = { .submit = 31, .complete = 0 }, + .first_completion_queue = 24, + .qmgr_num_pend = 2, +}; + static const struct of_device_id cppi41_dma_ids[] = { { .compatible = "ti,am3359-cppi41", .data = &am335x_usb_infos}, + { .compatible = "ti,da830-cppi41", .data = &da8xx_usb_infos}, {}, }; MODULE_DEVICE_TABLE(of, cppi41_dma_ids);