forked from luck/tmp_suning_uos_patched
b7de8e7e3c
On ia64, drivers/base/dma-mapping.c doesn't build because it calls
dma_alloc_noncoherent() and dma_free_noncoherent(), which appear to be
terminally broken; the calls end up generating errors like
drivers/base/dma-mapping.c: In function 'dmam_noncoherent_release':
drivers/base/dma-mapping.c:32: error: 'struct ia64_machine_vector' has no member named 'platform_dma_free_coherent'
because the multiple levels of macro expansion in <asm/dma-mapping.h> and
<asm/machvec.h> end up turning a call to dma_free_noncoherent() into
ia64_mv.platform_dma_free_coherent (instead of the intended
ia64_mv.dma_free_coherent).
This patch fixes this by converting dma_{alloc,free}_noncoherent() into
inline functions that call the corresponding coherent functions, instead of
trying to do this with macros.
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Tony Luck <tony.luck@intel.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
77 lines
2.4 KiB
C
77 lines
2.4 KiB
C
#ifndef _ASM_IA64_DMA_MAPPING_H
|
|
#define _ASM_IA64_DMA_MAPPING_H
|
|
|
|
/*
|
|
* Copyright (C) 2003-2004 Hewlett-Packard Co
|
|
* David Mosberger-Tang <davidm@hpl.hp.com>
|
|
*/
|
|
#include <asm/machvec.h>
|
|
|
|
#define dma_alloc_coherent platform_dma_alloc_coherent
|
|
/* coherent mem. is cheap */
|
|
static inline void *
|
|
dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
|
|
gfp_t flag)
|
|
{
|
|
return dma_alloc_coherent(dev, size, dma_handle, flag);
|
|
}
|
|
#define dma_free_coherent platform_dma_free_coherent
|
|
static inline void
|
|
dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
|
|
dma_addr_t dma_handle)
|
|
{
|
|
dma_free_coherent(dev, size, cpu_addr, dma_handle);
|
|
}
|
|
#define dma_map_single platform_dma_map_single
|
|
#define dma_map_sg platform_dma_map_sg
|
|
#define dma_unmap_single platform_dma_unmap_single
|
|
#define dma_unmap_sg platform_dma_unmap_sg
|
|
#define dma_sync_single_for_cpu platform_dma_sync_single_for_cpu
|
|
#define dma_sync_sg_for_cpu platform_dma_sync_sg_for_cpu
|
|
#define dma_sync_single_for_device platform_dma_sync_single_for_device
|
|
#define dma_sync_sg_for_device platform_dma_sync_sg_for_device
|
|
#define dma_mapping_error platform_dma_mapping_error
|
|
|
|
#define dma_map_page(dev, pg, off, size, dir) \
|
|
dma_map_single(dev, page_address(pg) + (off), (size), (dir))
|
|
#define dma_unmap_page(dev, dma_addr, size, dir) \
|
|
dma_unmap_single(dev, dma_addr, size, dir)
|
|
|
|
/*
|
|
* Rest of this file is part of the "Advanced DMA API". Use at your own risk.
|
|
* See Documentation/DMA-API.txt for details.
|
|
*/
|
|
|
|
#define dma_sync_single_range_for_cpu(dev, dma_handle, offset, size, dir) \
|
|
dma_sync_single_for_cpu(dev, dma_handle, size, dir)
|
|
#define dma_sync_single_range_for_device(dev, dma_handle, offset, size, dir) \
|
|
dma_sync_single_for_device(dev, dma_handle, size, dir)
|
|
|
|
#define dma_supported platform_dma_supported
|
|
|
|
static inline int
|
|
dma_set_mask (struct device *dev, u64 mask)
|
|
{
|
|
if (!dev->dma_mask || !dma_supported(dev, mask))
|
|
return -EIO;
|
|
*dev->dma_mask = mask;
|
|
return 0;
|
|
}
|
|
|
|
extern int dma_get_cache_alignment(void);
|
|
|
|
static inline void
|
|
dma_cache_sync (struct device *dev, void *vaddr, size_t size,
|
|
enum dma_data_direction dir)
|
|
{
|
|
/*
|
|
* IA-64 is cache-coherent, so this is mostly a no-op. However, we do need to
|
|
* ensure that dma_cache_sync() enforces order, hence the mb().
|
|
*/
|
|
mb();
|
|
}
|
|
|
|
#define dma_is_consistent(d, h) (1) /* all we do is coherent memory... */
|
|
|
|
#endif /* _ASM_IA64_DMA_MAPPING_H */
|