Commit e43e2657 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

x86/dma: Remove the x86_dma_fallback_dev hack 



Now that we removed support for the NULL device argument in the DMA API,
there is no need to cater for that in the x86 code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d7e02a93

arch/x86/include/asm/dma-mapping.h

+0 −10
Original line number Original line Diff line number Diff line
@@ -13,14 +13,7 @@ 
#include <asm/swiotlb.h>

#include <asm/swiotlb.h>

#include <linux/dma-contiguous.h>

#include <linux/dma-contiguous.h>





#ifdef CONFIG_ISA

# define ISA_DMA_BIT_MASK DMA_BIT_MASK(24)

#else

# define ISA_DMA_BIT_MASK DMA_BIT_MASK(32)

#endif



extern int iommu_merge;

extern int iommu_merge;

extern struct device x86_dma_fallback_dev;

extern int panic_on_overflow;

extern int panic_on_overflow;





extern const struct dma_map_ops *dma_ops;

extern const struct dma_map_ops *dma_ops;
@@ -30,7 +23,4 @@ static inline const struct dma_map_ops *get_arch_dma_ops(struct bus_type *bus) 
	return dma_ops;

	return dma_ops;

}

}





bool arch_dma_alloc_attrs(struct device **dev);

#define arch_dma_alloc_attrs arch_dma_alloc_attrs



#endif
 
#endif

arch/x86/kernel/amd_gart_64.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -233,9 +233,6 @@ static dma_addr_t gart_map_page(struct device *dev, struct page *page, 
	unsigned long bus;

	unsigned long bus;

	phys_addr_t paddr = page_to_phys(page) + offset;

	phys_addr_t paddr = page_to_phys(page) + offset;





	if (!dev)

		dev = &x86_dma_fallback_dev;



	if (!need_iommu(dev, paddr, size))

	if (!need_iommu(dev, paddr, size))

		return paddr;

		return paddr;
@@ -392,9 +389,6 @@ static int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, 
	if (nents == 0)

	if (nents == 0)

		return 0;

		return 0;





	if (!dev)

		dev = &x86_dma_fallback_dev;



	out		= 0;

	out		= 0;

	start		= 0;

	start		= 0;

	start_sg	= sg;

	start_sg	= sg;

arch/x86/kernel/pci-dma.c

+0 −20
Original line number Original line Diff line number Diff line
@@ -51,14 +51,6 @@ int iommu_pass_through __read_mostly; 




extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];

extern struct iommu_table_entry __iommu_table[], __iommu_table_end[];





/* Dummy device used for NULL arguments (normally ISA). */

struct device x86_dma_fallback_dev = {

	.init_name = "fallback device",

	.coherent_dma_mask = ISA_DMA_BIT_MASK,

	.dma_mask = &x86_dma_fallback_dev.coherent_dma_mask,

};

EXPORT_SYMBOL(x86_dma_fallback_dev);



void __init pci_iommu_alloc(void)

void __init pci_iommu_alloc(void)

{

{

	struct iommu_table_entry *p;

	struct iommu_table_entry *p;
@@ -77,18 +69,6 @@ void __init pci_iommu_alloc(void) 
	}

	}

}

}





bool arch_dma_alloc_attrs(struct device **dev)

{

	if (!*dev)

		*dev = &x86_dma_fallback_dev;



	if (!is_device_dma_capable(*dev))

		return false;

	return true;



}

EXPORT_SYMBOL(arch_dma_alloc_attrs);



/*

/*

 * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel

 * See <Documentation/x86/x86_64/boot-options.txt> for the iommu kernel

 * parameter documentation.

 * parameter documentation.

kernel/dma/mapping.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -238,10 +238,6 @@ u64 dma_get_required_mask(struct device *dev) 
}

}

EXPORT_SYMBOL_GPL(dma_get_required_mask);

EXPORT_SYMBOL_GPL(dma_get_required_mask);





#ifndef arch_dma_alloc_attrs

#define arch_dma_alloc_attrs(dev)	(true)

#endif



void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,

void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle,

		gfp_t flag, unsigned long attrs)

		gfp_t flag, unsigned long attrs)

{

{
@@ -256,9 +252,6 @@ void *dma_alloc_attrs(struct device *dev, size_t size, dma_addr_t *dma_handle, 
	/* let the implementation decide on the zone to allocate from: */

	/* let the implementation decide on the zone to allocate from: */

	flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);

	flag &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM);





	if (!arch_dma_alloc_attrs(&dev))

		return NULL;



	if (dma_is_direct(ops))

	if (dma_is_direct(ops))

		cpu_addr = dma_direct_alloc(dev, size, dma_handle, flag, attrs);

		cpu_addr = dma_direct_alloc(dev, size, dma_handle, flag, attrs);

	else if (ops->alloc)

	else if (ops->alloc)