linux-toradex.git/arch/xtensa/include/asm/dma-mapping.h, branch v4.4.73

xtensa: implement dma_to_phys and phys_to_dma

2015-11-08T22:25:38+00:00

This fixes the following build error seen in -next:

  drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:143:2: error:
  implicit declaration of function 'dma_to_phys'

Signed-off-by: Max Filippov

dma-mapping: consolidate dma_set_mask

2015-09-10T20:29:01+00:00

Almost everyone implements dma_set_mask the same way, although some time
that's hidden in ->set_dma_mask methods.

This patch consolidates those into a common implementation that either
calls ->set_dma_mask if present or otherwise uses the default
implementation.  Some architectures used to only call ->set_dma_mask
after the initial checks, and those instance have been fixed to do the
full work.  h8300 implemented dma_set_mask bogusly as a no-ops and has
been fixed.

Unfortunately some architectures overload unrelated semantics like changing
the dma_ops into it so we still need to allow for an architecture override
for now.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph Hellwig 
Cc: Arnd Bergmann 
Cc: Russell King 
Cc: Catalin Marinas 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: Michal Simek 
Cc: Jonas Bonn 
Cc: Chris Metcalf 
Cc: Guan Xuetao 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Andy Shevchenko 
Signed-off-by: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: consolidate dma_supported

2015-09-10T20:29:01+00:00

Most architectures just call into ->dma_supported, but some also return 1
if the method is not present, or 0 if no dma ops are present (although
that should never happeb). Consolidate this more broad version into
common code.

Also fix h8300 which inorrectly always returned 0, which would have been
a problem if it's dma_set_mask implementation wasn't a similarly buggy
noop.

As a few architectures have much more elaborate implementations, we
still allow for arch overrides.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph Hellwig 
Cc: Arnd Bergmann 
Cc: Russell King 
Cc: Catalin Marinas 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: Michal Simek 
Cc: Jonas Bonn 
Cc: Chris Metcalf 
Cc: Guan Xuetao 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Andy Shevchenko 
Signed-off-by: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: cosolidate dma_mapping_error

2015-09-10T20:29:01+00:00

Currently there are three valid implementations of dma_mapping_error:

 (1) call ->mapping_error
 (2) check for a hardcoded error code
 (3) always return 0

This patch provides a common implementation that calls ->mapping_error
if present, then checks for DMA_ERROR_CODE if defined or otherwise
returns 0.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph Hellwig 
Cc: Arnd Bergmann 
Cc: Russell King 
Cc: Catalin Marinas 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: Michal Simek 
Cc: Jonas Bonn 
Cc: Chris Metcalf 
Cc: Guan Xuetao 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Andy Shevchenko 
Signed-off-by: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: consolidate dma_{alloc,free}_noncoherent

2015-09-10T20:29:01+00:00

Most architectures do not support non-coherent allocations and either
define dma_{alloc,free}_noncoherent to their coherent versions or stub
them out.

Openrisc uses dma_{alloc,free}_attrs to implement them, and only Mips
implements them directly.

This patch moves the Openrisc version to common code, and handles the
DMA_ATTR_NON_CONSISTENT case in the mips dma_map_ops instance.

Note that actual non-coherent allocations require a dma_cache_sync
implementation, so if non-coherent allocations didn't work on
an architecture before this patch they still won't work after it.

[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph Hellwig 
Cc: Arnd Bergmann 
Cc: Russell King 
Cc: Catalin Marinas 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: Michal Simek 
Cc: Jonas Bonn 
Cc: Chris Metcalf 
Cc: Guan Xuetao 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Andy Shevchenko 
Signed-off-by: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}

2015-09-10T20:29:01+00:00

Since 2009 we have a nice asm-generic header implementing lots of DMA API
functions for architectures using struct dma_map_ops, but unfortunately
it's still missing a lot of APIs that all architectures still have to
duplicate.

This series consolidates the remaining functions, although we still need
arch opt outs for two of them as a few architectures have very
non-standard implementations.

This patch (of 5):

The coherent DMA allocator works the same over all architectures supporting
dma_map operations.

This patch consolidates them and converges the minor differences:

 - the debug_dma helpers are now called from all architectures, including
   those that were previously missing them
 - dma_alloc_from_coherent and dma_release_from_coherent are now always
   called from the generic alloc/free routines instead of the ops
   dma-mapping-common.h always includes dma-coherent.h to get the defintions
   for them, or the stubs if the architecture doesn't support this feature
 - checks for ->alloc / ->free presence are removed.  There is only one
   magic instead of dma_map_ops without them (mic_dma_ops) and that one
   is x86 only anyway.

Besides that only x86 needs special treatment to replace a default devices
if none is passed and tweak the gfp_flags.  An optional arch hook is provided
for that.

[linux@roeck-us.net: fix build]
[jcmvbkbc@gmail.com: fix xtensa]
Signed-off-by: Christoph Hellwig 
Cc: Arnd Bergmann 
Cc: Russell King 
Cc: Catalin Marinas 
Cc: Will Deacon 
Cc: Yoshinori Sato 
Cc: Michal Simek 
Cc: Jonas Bonn 
Cc: Chris Metcalf 
Cc: Guan Xuetao 
Cc: Ralf Baechle 
Cc: Benjamin Herrenschmidt 
Cc: Ingo Molnar 
Cc: Thomas Gleixner 
Cc: "H. Peter Anvin" 
Cc: Andy Shevchenko 
Signed-off-by: Guenter Roeck 
Signed-off-by: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

xtensa: reimplement DMA API using common helpers

2015-08-17T04:31:00+00:00

- keep existing functionality: don't handle attributes, don't support
  high memory;
- implement scatterlist primitives (map/unmap/sync);
- enable DMA API debug.

Signed-off-by: Max Filippov

xtensa: use for_each_sg()

2015-06-25T00:49:40+00:00

This replaces the plain loop over the sglist array with for_each_sg()
macro which consists of sg_next() function calls.  Since xtensa doesn't
select ARCH_HAS_SG_CHAIN, it is not necessary to use for_each_sg() in
order to loop over each sg element.  But this can help find problems
with drivers that do not properly initialize their sg tables when
CONFIG_DEBUG_SG is enabled.

Signed-off-by: Akinobu Mita 
Cc: Chris Zankel 
Cc: Max Filippov 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs()

2015-05-25T23:03:16+00:00

xtensa:allmodconfig fails to build with the following errors.

drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:
	In function ‘gk20a_instobj_dtor_dma’:
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:154:2: error:
	implicit declaration of function ‘dma_free_attrs’
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:
	In function ‘gk20a_instobj_ctor_dma’:
drivers/gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c:218:2: error:
	implicit declaration of function ‘dma_alloc_attrs’

Xtensa does not provide those functions at this time.
Provide dummy implementations to avoid build errors.

Acked-by: Max Filippov 
Signed-off-by: Guenter Roeck 
Signed-off-by: Chris Zankel

xtensa: Provide dummy dma_mmap_coherent() and dma_get_sgtable()

2013-01-29T07:27:41+00:00

xtensa/allmodconfig:

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 .

Xtensa does not use dma_map_ops, hence it should implement them itself.
For now, use dummy implementations that just return -EINVAL, until the API
has been finalized.

Signed-off-by: Geert Uytterhoeven 
Cc: Marek Szyprowski 
Cc: linux-xtensa@linux-xtensa.org
Signed-off-by: Marek Szyprowski