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

Commit 7c2d9cd2 authored by Jon Mason's avatar Jon Mason Committed by Linus Torvalds
Browse files

[PATCH] x86_64: trivial gart clean-up 



A trivial change to have gart_unmap_sg call gart_unmap_single directly,
instead of bouncing through the dma_unmap_single wrapper in
dma-mapping.h.

This change required moving the gart_unmap_single above gart_unmap_sg,
and under gart_map_single (which seems a more logical place that its
current location IMHO).

Signed-off-by: default avatarJon Mason <jdmason@us.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f0f2d653

arch/x86_64/kernel/pci-gart.c

+23 −23
Original line number Original line Diff line number Diff line
@@ -288,6 +288,28 @@ dma_addr_t gart_map_single(struct device *dev, void *addr, size_t size, int dir) 
	return bus; 

	return bus; 

}

}





/*

 * Free a DMA mapping.

 */

void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,

		      size_t size, int direction)

{

	unsigned long iommu_page;

	int npages;

	int i;



	if (dma_addr < iommu_bus_base + EMERGENCY_PAGES*PAGE_SIZE ||

	    dma_addr >= iommu_bus_base + iommu_size)

		return;

	iommu_page = (dma_addr - iommu_bus_base)>>PAGE_SHIFT;

	npages = to_pages(dma_addr, size);

	for (i = 0; i < npages; i++) {

		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;

		CLEAR_LEAK(iommu_page + i);

	}

	free_iommu(iommu_page, npages);

}



/*

/*

 * Wrapper for pci_unmap_single working with scatterlists.

 * Wrapper for pci_unmap_single working with scatterlists.

 */

 */
@@ -299,7 +321,7 @@ void gart_unmap_sg(struct device *dev, struct scatterlist *sg, int nents, int di 
		struct scatterlist *s = &sg[i];

		struct scatterlist *s = &sg[i];

		if (!s->dma_length || !s->length)

		if (!s->dma_length || !s->length)

			break;

			break;

		dma_unmap_single(dev, s->dma_address, s->dma_length, dir);

		gart_unmap_single(dev, s->dma_address, s->dma_length, dir);

	}

	}

}

}
@@ -458,28 +480,6 @@ int gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir) 
	return 0;

	return 0;

} 

} 





/*

 * Free a DMA mapping.

 */ 

void gart_unmap_single(struct device *dev, dma_addr_t dma_addr,

		      size_t size, int direction)

{

	unsigned long iommu_page; 

	int npages;

	int i;



	if (dma_addr < iommu_bus_base + EMERGENCY_PAGES*PAGE_SIZE || 

	    dma_addr >= iommu_bus_base + iommu_size)

		return;

	iommu_page = (dma_addr - iommu_bus_base)>>PAGE_SHIFT;	

	npages = to_pages(dma_addr, size);

	for (i = 0; i < npages; i++) { 

		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry; 

		CLEAR_LEAK(iommu_page + i);

	}

	free_iommu(iommu_page, npages);

}



static int no_agp;

static int no_agp;





static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)

static __init unsigned long check_iommu_size(unsigned long aper, u64 aper_size)