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

Commit 1477b8e5 authored by Joerg Roedel's avatar Joerg Roedel Committed by Linus Torvalds
Browse files

x86: convert GART driver to generic iommu_num_pages function 



Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Cc: Muli Ben-Yehuda <muli@il.ibm.com>
Cc: Dave Airlie <airlied@linux.ie>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 56d93660

arch/x86/kernel/pci-gart_64.c

+4 −4
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ nonforced_iommu(struct device *dev, unsigned long addr, size_t size) 
static dma_addr_t dma_map_area(struct device *dev, dma_addr_t phys_mem,

				size_t size, int dir, unsigned long align_mask)

{

	unsigned long npages = iommu_nr_pages(phys_mem, size);

	unsigned long npages = iommu_num_pages(phys_mem, size, PAGE_SIZE);

	unsigned long iommu_page = alloc_iommu(dev, npages, align_mask);

	int i;
@@ -285,7 +285,7 @@ static void gart_unmap_single(struct device *dev, dma_addr_t dma_addr, 
		return;



	iommu_page = (dma_addr - iommu_bus_base)>>PAGE_SHIFT;

	npages = iommu_nr_pages(dma_addr, size);

	npages = iommu_num_pages(dma_addr, size, PAGE_SIZE);

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

		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;

		CLEAR_LEAK(iommu_page + i);
@@ -368,7 +368,7 @@ static int __dma_map_cont(struct device *dev, struct scatterlist *start, 
		}



		addr = phys_addr;

		pages = iommu_nr_pages(s->offset, s->length);

		pages = iommu_num_pages(s->offset, s->length, PAGE_SIZE);

		while (pages--) {

			iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr);

			SET_LEAK(iommu_page);
@@ -451,7 +451,7 @@ gart_map_sg(struct device *dev, struct scatterlist *sg, int nents, int dir) 


		seg_size += s->length;

		need = nextneed;

		pages += iommu_nr_pages(s->offset, s->length);

		pages += iommu_num_pages(s->offset, s->length, PAGE_SIZE);

		ps = s;

	}

	if (dma_map_cont(dev, start_sg, i - start, sgmap, pages, need) < 0)