linux-toradex.git/include/linux/dma-mapping.h, branch v2.6.38.5

arm: fix "arm: fix pci_set_consistent_dma_mask for dmabounce devices"

2010-09-23T00:22:38+00:00

This fixes the regression caused by the commit 6fee48cd330c68
("dma-mapping: arm: use generic pci_set_dma_mask and
pci_set_consistent_dma_mask").

ARM needs to clip the dma coherent mask for dmabounce devices. This
restores the old trick.

Note that strictly speaking, the DMA API doesn't allow architectures to do
such but I'm not sure it's worth adding the new API to set the dma mask
that allows architectures to clip it.

Reported-by: Krzysztof Halasa 
Signed-off-by: FUJITA Tomonori 
Acked-by: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: fix build errors on !HAS_DMA architectures

2010-08-13T19:03:24+00:00

commit 4565f0170dfc849b3629c27d769db800467baa62 "dma-mapping: unify
dma_get_cache_alignment implementations" causes build errors on
!HAS_DMA architectures/platforms like s390 and sun3:

include/linux/dma-mapping.h:145: error: static declaration of 'dma_get_cache_alignment' follows non-static declaration
include/asm-generic/dma-mapping-broken.h:73: error: previous declaration of 'dma_get_cache_alignment' was here

Fix this by adding an explicit ifdef.

Cc: Geert Uytterhoeven 
Acked-by: FUJITA Tomonori 
Signed-off-by: Heiko Carstens 
Signed-off-by: Linus Torvalds

dma-mapping: unify dma_get_cache_alignment implementations

2010-08-11T15:59:21+00:00

dma_get_cache_alignment returns the minimum DMA alignment.  Architectures
defines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN).  So we
can unify dma_get_cache_alignment implementations.

Note that some architectures implement dma_get_cache_alignment wrongly.
dma_get_cache_alignment() should return the minimum DMA alignment.  So
fully-coherent architectures should return 1.  This patch also fixes this
issue.

Signed-off-by: FUJITA Tomonori 
Cc: 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: remove deprecated dma_sync_single and dma_sync_sg API

2010-05-27T16:12:53+00:00

Since 2.6.5, it had been commented, 'for backwards compatibility,
removed in 2.7.x'. Since 2.6.31, it have been marked as __deprecated.

I think that we can remove the API safely now.

Signed-off-by: FUJITA Tomonori 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: remove unnecessary sync_single_range_* in dma_map_ops

2010-05-27T16:12:52+00:00

sync_single_range_for_cpu and sync_single_range_for_device hooks are
unnecessary because sync_single_for_cpu and sync_single_for_device can
be used instead.

Signed-off-by: FUJITA Tomonori 
Reviewed-by: Konrad Rzeszutek Wilk 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping: dma-mapping.h: add dma_set_coherent_mask

2010-03-12T23:52:42+00:00

dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask.  This is
necessary to move to the generic device model DMA API from the PCI bus
specific API in the long term.

dma_set_coherent_mask works in the exact same way that
pci_set_consistent_dma_mask does.  So this patch also changes
pci_set_consistent_dma_mask to call dma_set_coherent_mask.

Signed-off-by: FUJITA Tomonori 
Cc: James Bottomley 
Cc: David S. Miller 
Cc: Jesse Barnes 
Cc: Benjamin Herrenschmidt 
Cc: Russell King 
Cc: Greg KH 
Cc: Kay Sievers 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma-mapping.h: add the dma_unmap state API

2010-03-12T23:52:42+00:00

Adds the following macros:

DECLARE_DMA_UNMAP_ADDR(ADDR_NAME)
DECLARE_DMA_UNMAP_LEN(LEN_NAME)
dma_unmap_addr(PTR, ADDR_NAME)
dma_unmap_addr_set(PTR, ADDR_NAME, VAL)
dma_unmap_len(PTR, LEN_NAME)
dma_unmap_len_set(PTR, LEN_NAME, VAL)

The API corresponds to the pci_unmap state API.  We'll move to this new
generic API from the PCI specific API in the long term.  As
include/asm-generic/pci-dma-compat.h does, the pci_unmap API simply calls
the new generic API for some time.

Signed-off-by: FUJITA Tomonori 
Cc: James Bottomley 
Cc: David S. Miller 
Cc: Jesse Barnes 
Cc: Arnd Bergmann 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

dma: Add set_dma_mask hook to struct dma_map_ops

2009-08-28T04:24:10+00:00

POWERPC needs this hook. SPARC could use it too.

Signed-off-by: FUJITA Tomonori 
Acked-by: Becky Bruce 
Signed-off-by: Benjamin Herrenschmidt

remove is_buffer_dma_capable()

2009-07-28T05:19:20+00:00

is_buffer_dma_capable() was replaced with dma_capable().

is_buffer_dma_capable() tells if a buffer is dma-capable or
not. However, it doesn't take a pointer to struct device so it doesn't
work for POWERPC.

Signed-off-by: FUJITA Tomonori 
Acked-by: Becky Bruce

dma-mapping: mark dma_sync_single and dma_sync_sg as deprecated

2009-06-19T23:46:08+00:00

dma_sync_single() and dma_sync_sg() have been described as "Backwards
compat, remove in 2.7.x" for a long time (since 2.6.5).

This marks dma_sync_single() and dma_sync_sg() as deprecated so the users
get notified before removing them.

Signed-off-by: FUJITA Tomonori 
Cc: Ingo Molnar 
Cc: James Bottomley 
Cc: "David S. Miller" 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds