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

Commit 887712a0 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

x86/calgary: remove the mapping_error dma_map_ops method 



Return DMA_MAPPING_ERROR instead of the magic bad_dma_addr on a dma
mapping failure and let the core dma-mapping code handle the rest.

Remove the magic EMERGENCY_PAGES that the bad_dma_addr gets redirected to.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 9e8aa6b5

arch/x86/kernel/pci-calgary_64.c

+7 −23
Original line number Diff line number Diff line
@@ -51,8 +51,6 @@ 
#include <asm/x86_init.h>

#include <asm/iommu_table.h>



#define CALGARY_MAPPING_ERROR	0



#ifdef CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT

int use_calgary __read_mostly = 1;

#else
@@ -157,8 +155,6 @@ static const unsigned long phb_debug_offsets[] = { 


#define PHB_DEBUG_STUFF_OFFSET	0x0020



#define EMERGENCY_PAGES 32 /* = 128KB */



unsigned int specified_table_size = TCE_TABLE_SIZE_UNSPECIFIED;

static int translate_empty_slots __read_mostly = 0;

static int calgary_detected __read_mostly = 0;
@@ -255,7 +251,7 @@ static unsigned long iommu_range_alloc(struct device *dev, 
			if (panic_on_overflow)

				panic("Calgary: fix the allocator.\n");

			else

				return CALGARY_MAPPING_ERROR;

				return DMA_MAPPING_ERROR;

		}

	}
@@ -274,11 +270,10 @@ static dma_addr_t iommu_alloc(struct device *dev, struct iommu_table *tbl, 
	dma_addr_t ret;



	entry = iommu_range_alloc(dev, tbl, npages);



	if (unlikely(entry == CALGARY_MAPPING_ERROR)) {

	if (unlikely(entry == DMA_MAPPING_ERROR)) {

		pr_warn("failed to allocate %u pages in iommu %p\n",

			npages, tbl);

		return CALGARY_MAPPING_ERROR;

		return DMA_MAPPING_ERROR;

	}



	/* set the return dma address */
@@ -294,12 +289,10 @@ static void iommu_free(struct iommu_table *tbl, dma_addr_t dma_addr, 
	unsigned int npages)

{

	unsigned long entry;

	unsigned long badend;

	unsigned long flags;



	/* were we called with bad_dma_address? */

	badend = CALGARY_MAPPING_ERROR + (EMERGENCY_PAGES * PAGE_SIZE);

	if (unlikely(dma_addr < badend)) {

	if (unlikely(dma_addr == DMA_MAPPING_ERROR)) {

		WARN(1, KERN_ERR "Calgary: driver tried unmapping bad DMA "

		       "address 0x%Lx\n", dma_addr);

		return;
@@ -383,7 +376,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, 
		npages = iommu_num_pages(vaddr, s->length, PAGE_SIZE);



		entry = iommu_range_alloc(dev, tbl, npages);

		if (entry == CALGARY_MAPPING_ERROR) {

		if (entry == DMA_MAPPING_ERROR) {

			/* makes sure unmap knows to stop */

			s->dma_length = 0;

			goto error;
@@ -401,7 +394,7 @@ static int calgary_map_sg(struct device *dev, struct scatterlist *sg, 
error:

	calgary_unmap_sg(dev, sg, nelems, dir, 0);

	for_each_sg(sg, s, nelems, i) {

		sg->dma_address = CALGARY_MAPPING_ERROR;

		sg->dma_address = DMA_MAPPING_ERROR;

		sg->dma_length = 0;

	}

	return 0;
@@ -454,7 +447,7 @@ static void* calgary_alloc_coherent(struct device *dev, size_t size, 


	/* set up tces to cover the allocated range */

	mapping = iommu_alloc(dev, tbl, ret, npages, DMA_BIDIRECTIONAL);

	if (mapping == CALGARY_MAPPING_ERROR)

	if (mapping == DMA_MAPPING_ERROR)

		goto free;

	*dma_handle = mapping;

	return ret;
@@ -479,11 +472,6 @@ static void calgary_free_coherent(struct device *dev, size_t size, 
	free_pages((unsigned long)vaddr, get_order(size));

}



static int calgary_mapping_error(struct device *dev, dma_addr_t dma_addr)

{

	return dma_addr == CALGARY_MAPPING_ERROR;

}



static const struct dma_map_ops calgary_dma_ops = {

	.alloc = calgary_alloc_coherent,

	.free = calgary_free_coherent,
@@ -491,7 +479,6 @@ static const struct dma_map_ops calgary_dma_ops = { 
	.unmap_sg = calgary_unmap_sg,

	.map_page = calgary_map_page,

	.unmap_page = calgary_unmap_page,

	.mapping_error = calgary_mapping_error,

	.dma_supported = dma_direct_supported,

};
@@ -739,9 +726,6 @@ static void __init calgary_reserve_regions(struct pci_dev *dev) 
	u64 start;

	struct iommu_table *tbl = pci_iommu(dev->bus);



	/* reserve EMERGENCY_PAGES from bad_dma_address and up */

	iommu_range_reserve(tbl, CALGARY_MAPPING_ERROR, EMERGENCY_PAGES);



	/* avoid the BIOS/VGA first 640KB-1MB region */

	/* for CalIOC2 - avoid the entire first MB */

	if (is_calgary(dev->device)) {