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

x86: rename iommu_num_pages function to iommu_nr_pages 



This series of patches re-introduces the iommu_num_pages function so that
it can be used by each architecture specific IOMMU implementations.  The
series also changes IOMMU implementations for X86, Alpha, PowerPC and
UltraSparc.  The other implementations are not yet changed because the
modifications required are not obvious and I can't test them on real
hardware.

This patch:

This is a preparation patch for introducing a generic iommu_num_pages function.

Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
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 b418da16

arch/x86/kernel/amd_iommu.c

+4 −4
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int iommu_flush_pages(struct amd_iommu *iommu, u16 domid, 
		u64 address, size_t size)

{

	int s = 0;

	unsigned pages = iommu_num_pages(address, size);

	unsigned pages = iommu_nr_pages(address, size);



	address &= PAGE_MASK;
@@ -679,7 +679,7 @@ static struct dma_ops_domain *dma_ops_domain_alloc(struct amd_iommu *iommu, 
	if (iommu->exclusion_start &&

	    iommu->exclusion_start < dma_dom->aperture_size) {

		unsigned long startpage = iommu->exclusion_start >> PAGE_SHIFT;

		int pages = iommu_num_pages(iommu->exclusion_start,

		int pages = iommu_nr_pages(iommu->exclusion_start,

					    iommu->exclusion_length);

		dma_ops_reserve_addresses(dma_dom, startpage, pages);

	}
@@ -935,7 +935,7 @@ static dma_addr_t __map_single(struct device *dev, 
	unsigned long align_mask = 0;

	int i;



	pages = iommu_num_pages(paddr, size);

	pages = iommu_nr_pages(paddr, size);

	paddr &= PAGE_MASK;



	if (align)
@@ -980,7 +980,7 @@ static void __unmap_single(struct amd_iommu *iommu, 
	if ((dma_addr == 0) || (dma_addr + size > dma_dom->aperture_size))

		return;



	pages = iommu_num_pages(dma_addr, size);

	pages = iommu_nr_pages(dma_addr, size);

	dma_addr &= PAGE_MASK;

	start = dma_addr;

arch/x86/kernel/pci-dma.c

+2 −2
Original line number Diff line number Diff line
@@ -125,13 +125,13 @@ void __init pci_iommu_alloc(void) 
	pci_swiotlb_init();

}



unsigned long iommu_num_pages(unsigned long addr, unsigned long len)

unsigned long iommu_nr_pages(unsigned long addr, unsigned long len)

{

	unsigned long size = roundup((addr & ~PAGE_MASK) + len, PAGE_SIZE);



	return size >> PAGE_SHIFT;

}

EXPORT_SYMBOL(iommu_num_pages);

EXPORT_SYMBOL(iommu_nr_pages);

#endif



void *dma_generic_alloc_coherent(struct device *dev, size_t size,

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_num_pages(phys_mem, size);

	unsigned long npages = iommu_nr_pages(phys_mem, 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_num_pages(dma_addr, size);

	npages = iommu_nr_pages(dma_addr, 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_num_pages(s->offset, s->length);

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

		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_num_pages(s->offset, s->length);

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

		ps = s;

	}

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

include/asm-x86/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ extern int force_iommu, no_iommu; 
extern int iommu_detected;

extern int dmar_disabled;



extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);

extern unsigned long iommu_nr_pages(unsigned long addr, unsigned long len);



#ifdef CONFIG_GART_IOMMU

extern int gart_iommu_aperture;

CRA Git | Maintained and supported by SUSTech CRA and CCSE