Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc

[pandora-kernel.git] / arch / sparc64 / kernel / iommu_common.h

diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h
index 8390f04..53b19c8 100644 (file)
--- a/arch/sparc64/kernel/iommu_common.h
+++ b/arch/sparc64/kernel/iommu_common.h
@@ -12,6 +12,7 @@
 #include <linux/mm.h>
 #include <linux/scatterlist.h>
 #include <linux/device.h>
+#include <linux/iommu-helper.h>
 
 #include <asm/iommu.h>
 #include <asm/scatterlist.h>
@@ -22,7 +23,7 @@
 #define IO_PAGE_SHIFT                  13
 #define IO_PAGE_SIZE                   (1UL << IO_PAGE_SHIFT)
 #define IO_PAGE_MASK                   (~(IO_PAGE_SIZE-1))
-#define IO_PAGE_ALIGN(addr)            (((addr)+IO_PAGE_SIZE-1)&IO_PAGE_MASK)
+#define IO_PAGE_ALIGN(addr)            ALIGN(addr, IO_PAGE_SIZE)
 
 #define IO_TSB_ENTRIES                 (128*1024)
 #define IO_TSB_SIZE                    (IO_TSB_ENTRIES * 8)
@@ -45,17 +46,24 @@ static inline unsigned long iommu_num_pages(unsigned long vaddr,
        return npages;
 }
 
-static inline unsigned long calc_npages(struct scatterlist *sglist, int nelems)
+static inline int is_span_boundary(unsigned long entry,
+                                  unsigned long shift,
+                                  unsigned long boundary_size,
+                                  struct scatterlist *outs,
+                                  struct scatterlist *sg)
 {
-       unsigned long i, npages = 0;
-       struct scatterlist *sg;
+       unsigned long paddr = SG_ENT_PHYS_ADDRESS(outs);
+       int nr = iommu_num_pages(paddr, outs->dma_length + sg->length);
 
-       for_each_sg(sglist, sg, nelems, i) {
-               unsigned long paddr = SG_ENT_PHYS_ADDRESS(sg);
-               npages += iommu_num_pages(paddr, sg->length);
-       }
-
-       return npages;
+       return iommu_is_span_boundary(entry, nr, shift, boundary_size);
 }
 
+extern unsigned long iommu_range_alloc(struct device *dev,
+                                      struct iommu *iommu,
+                                      unsigned long npages,
+                                      unsigned long *handle);
+extern void iommu_range_free(struct iommu *iommu,
+                            dma_addr_t dma_addr,
+                            unsigned long npages);
+
 #endif /* _IOMMU_COMMON_H */