Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c786df08 authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: unify dma_mapping_error 



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: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7c183416

arch/x86/kernel/pci-base_32.c

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,12 @@ static int pci32_dma_map_sg(struct device *dev, struct scatterlist *sglist, 
	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 = {

	.map_single = pci32_map_single,

	.unmap_single = NULL,
@@ -41,6 +47,7 @@ static const struct dma_mapping_ops pci32_dma_ops = { 
	.sync_single_range_for_device = NULL,

	.sync_sg_for_cpu = NULL,

	.sync_sg_for_device = NULL,

	.mapping_error = pci32_map_error,

};



const struct dma_mapping_ops *dma_ops = &pci32_dma_ops;

include/asm-x86/dma-mapping.h

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,14 @@ struct dma_mapping_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_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)

include/asm-x86/dma-mapping_32.h

+0 −6
Original line number Diff line number Diff line
@@ -8,12 +8,6 @@ 
#include <asm/io.h>

#include <asm/bug.h>



static inline int

dma_mapping_error(dma_addr_t dma_addr)

{

	return 0;

}



extern int forbid_dac;



static inline int

include/asm-x86/dma-mapping_64.h

+0 −8
Original line number Diff line number Diff line
@@ -3,14 +3,6 @@ 


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 */

static inline int dma_get_cache_alignment(void)

{