Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: unify dma_mapping_error

Browse Source 
We provide a map_error function in pci-base_32.c to make
sure i386 keeps with the same behaviour it used to.

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Glauber Costa 2008-03-25 18:36:37 -03:00 committed by Ingo Molnar
parent 7c18341665
commit c786df08f6
4 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/x86/kernel/pci-base_32.c
View File

@ -30,6 +30,12 @@ static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist,
return nents; return nents;
} }
/* Make sure we keep the same behaviour */
static int pci32_map_error(dma_addr_t dma_addr)
{
return 0;
}
static const struct dma_mapping_ops pci32_dma_ops = { static const struct dma_mapping_ops pci32_dma_ops = {
.map_single = pci32_map_single, .map_single = pci32_map_single,
.unmap_single = NULL, .unmap_single = NULL,
@ -41,6 +47,7 @@ static const struct dma_mapping_ops pci32_dma_ops = {
.sync_single_range_for_device = NULL, .sync_single_range_for_device = NULL,
.sync_sg_for_cpu = NULL, .sync_sg_for_cpu = NULL,
.sync_sg_for_device = NULL, .sync_sg_for_device = NULL,
.mapping_error = pci32_map_error,
}; };
const struct dma_mapping_ops *dma_ops = &pci32_dma_ops; const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;

8
include/asm-x86/dma-mapping.h
View File

@ -54,6 +54,14 @@ struct dma_mapping_ops {
extern const struct dma_mapping_ops *dma_ops; extern const struct dma_mapping_ops *dma_ops;
static inline int dma_mapping_error(dma_addr_t dma_addr)
{
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dma_addr);
return (dma_addr == bad_dma_address);
}
#define dma_alloc_noncoherent(d, s, h, f) dma_alloc_coherent(d, s, h, f) #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) #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

6
include/asm-x86/dma-mapping_32.h
View File

@ -8,12 +8,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/bug.h> #include <asm/bug.h>
static inline int
dma_mapping_error(dma_addr_t dma_addr)
{
return 0;
}
extern int forbid_dac; extern int forbid_dac;
static inline int static inline int

8
include/asm-x86/dma-mapping_64.h
View File

@ -3,14 +3,6 @@
extern int iommu_merge; extern int iommu_merge;
static inline int dma_mapping_error(dma_addr_t dma_addr)
{
if (dma_ops->mapping_error)
return dma_ops->mapping_error(dma_addr);
return (dma_addr == bad_dma_address);
}
/* same for gart, swiotlb, and nommu */ /* same for gart, swiotlb, and nommu */
static inline int dma_get_cache_alignment(void) static inline int dma_get_cache_alignment(void)
{ {