From patchwork Fri Jul 10 11:59:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 6765371 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B16B6C05AC for ; Fri, 10 Jul 2015 11:59:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CD44C2069A for ; Fri, 10 Jul 2015 11:59:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E08D020681 for ; Fri, 10 Jul 2015 11:59:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754633AbbGJL7V (ORCPT ); Fri, 10 Jul 2015 07:59:21 -0400 Received: from xavier.telenet-ops.be ([195.130.132.52]:49841 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753915AbbGJL7U (ORCPT ); Fri, 10 Jul 2015 07:59:20 -0400 Received: from ayla.of.borg ([84.193.93.87]) by xavier.telenet-ops.be with bizsmtp id qbzJ1q00F1t5w8s01bzJXz; Fri, 10 Jul 2015 13:59:18 +0200 Received: from ramsan.of.borg ([192.168.97.29] helo=ramsan) by ayla.of.borg with esmtp (Exim 4.82) (envelope-from ) id 1ZDWxa-0008Dx-9z; Fri, 10 Jul 2015 13:59:18 +0200 Received: from geert by ramsan with local (Exim 4.82) (envelope-from ) id 1ZDWxa-0007xt-G2; Fri, 10 Jul 2015 13:59:18 +0200 From: Geert Uytterhoeven To: Vinod Koul , Dan Williams , Laurent Pinchart , Kuninori Morimoto , Yoshihiro Shimoda Cc: dmaengine@vger.kernel.org, linux-sh@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH/RFC 2/3] dmaengine: shdmac: Add missing DMA_MEM_TO_MEM direction Date: Fri, 10 Jul 2015 13:59:12 +0200 Message-Id: <1436529553-30571-3-git-send-email-geert+renesas@glider.be> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1436529553-30571-1-git-send-email-geert+renesas@glider.be> References: <1436529553-30571-1-git-send-email-geert+renesas@glider.be> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP If a driver does "dma_cap_set(DMA_MEMCPY), ...)", it should advertise DMA_MEM_TO_MEM support in the direction mask. Signed-off-by: Geert Uytterhoeven --- Is it true that DMA_MEMCPY implies DMA_MEM_TO_MEM? --- drivers/dma/sh/rcar-dmac.c | 3 ++- drivers/dma/sh/rcar-hpbdma.c | 3 ++- drivers/dma/sh/shdmac.c | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 7820d07e7beea7dd..11e5003a6cc27b40 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c @@ -1707,7 +1707,8 @@ static int rcar_dmac_probe(struct platform_device *pdev) engine->src_addr_widths = widths; engine->dst_addr_widths = widths; - engine->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); + engine->directions = BIT(DMA_MEM_TO_MEM) | BIT(DMA_MEM_TO_DEV) | + BIT(DMA_DEV_TO_MEM); engine->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; engine->device_alloc_chan_resources = rcar_dmac_alloc_chan_resources; diff --git a/drivers/dma/sh/rcar-hpbdma.c b/drivers/dma/sh/rcar-hpbdma.c index 2e21c1197769d0c8..29d67277415084b4 100644 --- a/drivers/dma/sh/rcar-hpbdma.c +++ b/drivers/dma/sh/rcar-hpbdma.c @@ -599,7 +599,8 @@ static int hpb_dmae_probe(struct platform_device *pdev) dma_cap_set(DMA_SLAVE, dma_dev->cap_mask); dma_dev->src_addr_widths = widths; dma_dev->dst_addr_widths = widths; - dma_dev->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); + dma_dev->directions = BIT(DMA_MEM_TO_MEM) | BIT(DMA_MEM_TO_DEV) | + BIT(DMA_DEV_TO_MEM); dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; hpbdev->shdma_dev.ops = &hpb_dmae_ops; diff --git a/drivers/dma/sh/shdmac.c b/drivers/dma/sh/shdmac.c index c9489ae6c0fa7f47..8693fff83d7b3af4 100644 --- a/drivers/dma/sh/shdmac.c +++ b/drivers/dma/sh/shdmac.c @@ -750,8 +750,10 @@ static int sh_dmae_probe(struct platform_device *pdev) dma_dev->directions = BIT(DMA_MEM_TO_DEV) | BIT(DMA_DEV_TO_MEM); dma_dev->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST; - if (!pdata->slave_only) + if (!pdata->slave_only) { dma_cap_set(DMA_MEMCPY, dma_dev->cap_mask); + dma_dev->directions |= BIT(DMA_MEM_TO_MEM); + } if (pdata->slave && pdata->slave_num) dma_cap_set(DMA_SLAVE, dma_dev->cap_mask);