linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Geert Uytterhoeven <geert@linux-m68k.org>
To: linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	linux-c6x-dev@linux-c6x.org
Subject: [PATCH 3/9] c6x: Provide dma_mmap_coherent() and dma_get_sgtable()
Date: Sun, 13 Jan 2013 11:44:44 +0100	[thread overview]
Message-ID: <1358073890-3610-3-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1358073890-3610-1-git-send-email-geert@linux-m68k.org>

c6x/allmodconfig (assumed):

drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_mmap’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:204: error: implicit declaration of function ‘dma_mmap_coherent’
drivers/media/v4l2-core/videobuf2-dma-contig.c: In function ‘vb2_dc_get_base_sgt’:
drivers/media/v4l2-core/videobuf2-dma-contig.c:387: error: implicit declaration of function ‘dma_get_sgtable’

For architectures using dma_map_ops, dma_mmap_coherent() and
dma_get_sgtable() are provided in <asm-generic/dma-mapping-common.h>.

C6x does not use dma_map_ops, hence it should implement them as inline
stubs using dma_common_mmap() and dma_common_get_sgtable().

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Cc: linux-c6x-dev@linux-c6x.org
---
Not compile-tested due to lack of cross-compiler

 arch/c6x/include/asm/dma-mapping.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/arch/c6x/include/asm/dma-mapping.h b/arch/c6x/include/asm/dma-mapping.h
index 3c69406..d4cdf85 100644
--- a/arch/c6x/include/asm/dma-mapping.h
+++ b/arch/c6x/include/asm/dma-mapping.h
@@ -89,4 +89,14 @@ extern void dma_free_coherent(struct device *, size_t, void *, dma_addr_t);
 #define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent((d), (s), (h), (f))
 #define dma_free_noncoherent(d, s, v, h)  dma_free_coherent((d), (s), (v), (h))
 
+/* drivers/base/dma-mapping.c */
+extern int dma_common_mmap(struct device *dev, struct vm_area_struct *vma,
+			   void *cpu_addr, dma_addr_t dma_addr, size_t size);
+extern int dma_common_get_sgtable(struct device *dev, struct sg_table *sgt,
+				  void *cpu_addr, dma_addr_t dma_addr,
+				  size_t size);
+
+#define dma_mmap_coherent(d, v, c, h, s) dma_common_mmap(d, v, c, h, s)
+#define dma_get_sgtable(d, t, v, h, s) dma_common_get_sgtable(d, t, v, h, s)
+
 #endif	/* _ASM_C6X_DMA_MAPPING_H */
-- 
1.7.0.4


  parent reply	other threads:[~2013-01-13 10:45 UTC|newest]

Thread overview: 40+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-13 10:44 [PATCH 1/9] avr32: Provide dma_mmap_coherent() and dma_get_sgtable() Geert Uytterhoeven
2013-01-13 10:44 ` [PATCH 2/9] blackfin: " Geert Uytterhoeven
2013-01-15  8:12   ` [uclinux-dist-devel] " Jiang, Scott
2013-01-13 10:44 ` Geert Uytterhoeven [this message]
2013-01-14 15:37   ` [Linux-c6x-dev] [PATCH 3/9] c6x: " Mark Salter
2013-01-15  4:16     ` Vineet Gupta
2013-01-15  9:13       ` Geert Uytterhoeven
2013-01-15 14:07         ` Marek Szyprowski
2013-01-15 16:56           ` James Bottomley
2013-01-21 20:00             ` Geert Uytterhoeven
2013-01-21 22:59               ` James Bottomley
2013-01-22 10:13                 ` James Bottomley
2013-01-22 10:16                   ` James Bottomley
2013-01-22 10:32                     ` James Bottomley
2013-01-22 13:42                       ` Mauro Carvalho Chehab
2013-01-22 13:23                     ` Mauro Carvalho Chehab
2013-01-22 10:33                   ` Marek Szyprowski
2013-01-22 10:47                     ` James Bottomley
2013-01-23  9:47                   ` Marek Szyprowski
2013-01-23 10:29                     ` James Bottomley
2013-01-23 17:44                       ` Marek Szyprowski
2013-01-24 11:14                         ` James Bottomley
2013-01-24 10:49               ` Marek Szyprowski
2013-01-22 10:15             ` Marek Szyprowski
2013-01-22 10:22               ` James Bottomley
2013-01-23  7:23                 ` Vineet Gupta
2013-01-23  8:58                   ` James Bottomley
2013-01-13 10:44 ` [PATCH 4/9] cris: " Geert Uytterhoeven
2013-01-14  8:38   ` Jesper Nilsson
2013-01-13 10:44 ` [PATCH 5/9] frv: " Geert Uytterhoeven
2013-01-13 10:44 ` [PATCH 6/9] m68k: " Geert Uytterhoeven
2013-01-13 10:44 ` [PATCH 7/9] mn10300: " Geert Uytterhoeven
2013-01-13 10:44 ` [PATCH 8/9] parisc: " Geert Uytterhoeven
2013-01-13 11:36   ` James Bottomley
2013-01-13 13:12     ` Geert Uytterhoeven
2013-01-13 13:49       ` James Bottomley
2013-01-13 14:52         ` Geert Uytterhoeven
2013-01-13 16:37           ` James Bottomley
2013-01-13 10:44 ` [PATCH 9/9] xtensa: " Geert Uytterhoeven
2013-01-13 16:01 ` [PATCH 1/9] avr32: " Hans-Christian Egtvedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358073890-3610-3-git-send-email-geert@linux-m68k.org \
    --to=geert@linux-m68k.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-c6x-dev@linux-c6x.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).