generic, x86: fix add iommu_num_pages helper function
authorFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Tue, 29 Jul 2008 04:38:53 +0000 (13:38 +0900)
committerIngo Molnar <mingo@elte.hu>
Tue, 29 Jul 2008 10:12:48 +0000 (12:12 +0200)
This IOMMU helper function doesn't work for some architectures:

  http://marc.info/?l=linux-kernel&m=121699304403202&w=2

It also breaks POWER and SPARC builds:

  http://marc.info/?l=linux-kernel&m=121730388001890&w=2

Currently, only x86 IOMMUs use this so let's move it to x86 for
now.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/pci-dma.c
include/asm-x86/iommu.h
include/linux/iommu-helper.h
lib/iommu-helper.c

index 8dbffb846de9b66c5a1aec5cc542dc959acfa924..87d4d6964ec2b9ecb5d83ad01c081589218dc303 100644 (file)
@@ -123,6 +123,14 @@ void __init pci_iommu_alloc(void)
 
        pci_swiotlb_init();
 }
+
+unsigned long iommu_num_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);
 #endif
 
 /*
index ecc8061904a9ee27210d27efd74dfe4534212fb6..5f888cc5be49a0eb87fab02d32ec050a686d0387 100644 (file)
@@ -7,6 +7,8 @@ extern struct dma_mapping_ops nommu_dma_ops;
 extern int force_iommu, no_iommu;
 extern int iommu_detected;
 
+extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
+
 #ifdef CONFIG_GART_IOMMU
 extern int gart_iommu_aperture;
 extern int gart_iommu_aperture_allowed;
index f8598f583944a5355b4ee33ddef3a785b3adcc79..c975caf75385d2e634cdb151dae416e2487533a0 100644 (file)
@@ -8,4 +8,3 @@ extern unsigned long iommu_area_alloc(unsigned long *map, unsigned long size,
                                      unsigned long align_mask);
 extern void iommu_area_free(unsigned long *map, unsigned long start,
                            unsigned int nr);
-extern unsigned long iommu_num_pages(unsigned long addr, unsigned long len);
index 889ddce2021e26870b0b287ad0d28e7032e99028..a3b8d4c3f77a5e7e466bd8f5e5591f3dcaa2c3bd 100644 (file)
@@ -80,11 +80,3 @@ void iommu_area_free(unsigned long *map, unsigned long start, unsigned int nr)
        }
 }
 EXPORT_SYMBOL(iommu_area_free);
-
-unsigned long iommu_num_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);