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

Commit 87e39ea5 authored by Joerg Roedel's avatar Joerg Roedel Committed by Ingo Molnar
Browse files

x86 gart: replace to_pages macro with iommu_num_pages 



This patch removes the to_pages macro from x86 GART code and calls the generic
iommu_num_pages function instead.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Cc: iommu@lists.linux-foundation.org
Cc: bhavna.sarathy@amd.com
Cc: robert.richter@amd.com
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a8132e5f

arch/x86/kernel/pci-gart_64.c

+4 −7
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ static u32 gart_unmapped_entry; 
	(((x) & 0xfffff000) | (((x) >> 32) << 4) | GPTE_VALID | GPTE_COHERENT)

#define GPTE_DECODE(x) (((x) & 0xfffff000) | (((u64)(x) & 0xff0) << 28))



#define to_pages(addr, size) \

	(round_up(((addr) & ~PAGE_MASK) + (size), PAGE_SIZE) >> PAGE_SHIFT)



#define EMERGENCY_PAGES 32 /* = 128KB */



#ifdef CONFIG_AGP
@@ -241,7 +238,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 npages = to_pages(phys_mem, size);

	unsigned long npages = iommu_num_pages(phys_mem, size);

	unsigned long iommu_page = alloc_iommu(dev, npages);

	int i;
@@ -304,7 +301,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 = to_pages(dma_addr, size);

	npages = iommu_num_pages(dma_addr, size);

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

		iommu_gatt_base[iommu_page + i] = gart_unmapped_entry;

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



		addr = phys_addr;

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

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

		while (pages--) {

			iommu_gatt_base[iommu_page] = GPTE_ENCODE(addr);

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


		seg_size += s->length;

		need = nextneed;

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

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

		ps = s;

	}

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