ipc/sem.c: use ERR_CAST
[safe/jmp/linux-2.6] / lib / swiotlb.c
index dc1cd1f..5fddf72 100644 (file)
@@ -28,6 +28,7 @@
 #include <linux/types.h>
 #include <linux/ctype.h>
 #include <linux/highmem.h>
+#include <linux/gfp.h>
 
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -97,6 +98,8 @@ static phys_addr_t *io_tlb_orig_addr;
  */
 static DEFINE_SPINLOCK(io_tlb_lock);
 
+static int late_alloc;
+
 static int __init
 setup_io_tlb_npages(char *str)
 {
@@ -109,40 +112,22 @@ setup_io_tlb_npages(char *str)
                ++str;
        if (!strcmp(str, "force"))
                swiotlb_force = 1;
+
        return 1;
 }
 __setup("swiotlb=", setup_io_tlb_npages);
 /* make io_tlb_overflow tunable too? */
 
-dma_addr_t __weak swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
-{
-       return paddr;
-}
-
-phys_addr_t __weak swiotlb_bus_to_phys(struct device *hwdev, dma_addr_t baddr)
-{
-       return baddr;
-}
-
+/* Note that this doesn't work with highmem page */
 static dma_addr_t swiotlb_virt_to_bus(struct device *hwdev,
                                      volatile void *address)
 {
-       return swiotlb_phys_to_bus(hwdev, virt_to_phys(address));
-}
-
-void * __weak swiotlb_bus_to_virt(struct device *hwdev, dma_addr_t address)
-{
-       return phys_to_virt(swiotlb_bus_to_phys(hwdev, address));
-}
-
-int __weak swiotlb_arch_address_needs_mapping(struct device *hwdev,
-                                              dma_addr_t addr, size_t size)
-{
-       return !is_buffer_dma_capable(dma_get_mask(hwdev), addr, size);
+       return phys_to_dma(hwdev, virt_to_phys(address));
 }
 
-static void swiotlb_print_info(unsigned long bytes)
+void swiotlb_print_info(void)
 {
+       unsigned long bytes = io_tlb_nslabs << IO_TLB_SHIFT;
        phys_addr_t pstart, pend;
 
        pstart = virt_to_phys(io_tlb_start);
@@ -160,7 +145,7 @@ static void swiotlb_print_info(unsigned long bytes)
  * structures for the software IO TLB used to implement the DMA API.
  */
 void __init
-swiotlb_init_with_default_size(size_t default_size)
+swiotlb_init_with_default_size(size_t default_size, int verbose)
 {
        unsigned long i, bytes;
 
@@ -196,14 +181,14 @@ swiotlb_init_with_default_size(size_t default_size)
        io_tlb_overflow_buffer = alloc_bootmem_low(io_tlb_overflow);
        if (!io_tlb_overflow_buffer)
                panic("Cannot allocate SWIOTLB overflow buffer!\n");
-
-       swiotlb_print_info(bytes);
+       if (verbose)
+               swiotlb_print_info();
 }
 
 void __init
-swiotlb_init(void)
+swiotlb_init(int verbose)
 {
-       swiotlb_init_with_default_size(64 * (1<<20));   /* default to 64MB */
+       swiotlb_init_with_default_size(64 * (1<<20), verbose);  /* default to 64MB */
 }
 
 /*
@@ -280,7 +265,9 @@ swiotlb_late_init_with_default_size(size_t default_size)
        if (!io_tlb_overflow_buffer)
                goto cleanup4;
 
-       swiotlb_print_info(bytes);
+       swiotlb_print_info();
+
+       late_alloc = 1;
 
        return 0;
 
@@ -301,15 +288,36 @@ cleanup1:
        return -ENOMEM;
 }
 
-static inline int
-address_needs_mapping(struct device *hwdev, dma_addr_t addr, size_t size)
+void __init swiotlb_free(void)
 {
-       return swiotlb_arch_address_needs_mapping(hwdev, addr, size);
+       if (!io_tlb_overflow_buffer)
+               return;
+
+       if (late_alloc) {
+               free_pages((unsigned long)io_tlb_overflow_buffer,
+                          get_order(io_tlb_overflow));
+               free_pages((unsigned long)io_tlb_orig_addr,
+                          get_order(io_tlb_nslabs * sizeof(phys_addr_t)));
+               free_pages((unsigned long)io_tlb_list, get_order(io_tlb_nslabs *
+                                                                sizeof(int)));
+               free_pages((unsigned long)io_tlb_start,
+                          get_order(io_tlb_nslabs << IO_TLB_SHIFT));
+       } else {
+               free_bootmem_late(__pa(io_tlb_overflow_buffer),
+                                 io_tlb_overflow);
+               free_bootmem_late(__pa(io_tlb_orig_addr),
+                                 io_tlb_nslabs * sizeof(phys_addr_t));
+               free_bootmem_late(__pa(io_tlb_list),
+                                 io_tlb_nslabs * sizeof(int));
+               free_bootmem_late(__pa(io_tlb_start),
+                                 io_tlb_nslabs << IO_TLB_SHIFT);
+       }
 }
 
-static int is_swiotlb_buffer(char *addr)
+static int is_swiotlb_buffer(phys_addr_t paddr)
 {
-       return addr >= io_tlb_start && addr < io_tlb_end;
+       return paddr >= virt_to_phys(io_tlb_start) &&
+               paddr < virt_to_phys(io_tlb_end);
 }
 
 /*
@@ -478,7 +486,7 @@ do_unmap_single(struct device *hwdev, char *dma_addr, size_t size, int dir)
 
        /*
         * Return the buffer to the free list by setting the corresponding
-        * entries to indicate the number of contigous entries available.
+        * entries to indicate the number of contiguous entries available.
         * While returning the entries to the free list, we merge the entries
         * with slots below and above the pool being returned.
         */
@@ -542,9 +550,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
                dma_mask = hwdev->coherent_dma_mask;
 
        ret = (void *)__get_free_pages(flags, order);
-       if (ret &&
-           !is_buffer_dma_capable(dma_mask, swiotlb_virt_to_bus(hwdev, ret),
-                                  size)) {
+       if (ret && swiotlb_virt_to_bus(hwdev, ret) + size - 1 > dma_mask) {
                /*
                 * The allocated memory isn't reachable by the device.
                 */
@@ -566,7 +572,7 @@ swiotlb_alloc_coherent(struct device *hwdev, size_t size,
        dev_addr = swiotlb_virt_to_bus(hwdev, ret);
 
        /* Confirm address can be DMA'd by device */
-       if (!is_buffer_dma_capable(dma_mask, dev_addr, size)) {
+       if (dev_addr + size - 1 > dma_mask) {
                printk("hwdev DMA mask = 0x%016Lx, dev_addr = 0x%016Lx\n",
                       (unsigned long long)dma_mask,
                       (unsigned long long)dev_addr);
@@ -582,11 +588,13 @@ EXPORT_SYMBOL(swiotlb_alloc_coherent);
 
 void
 swiotlb_free_coherent(struct device *hwdev, size_t size, void *vaddr,
-                     dma_addr_t dma_handle)
+                     dma_addr_t dev_addr)
 {
+       phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
+
        WARN_ON(irqs_disabled());
-       if (!is_swiotlb_buffer(vaddr))
-               free_pages((unsigned long) vaddr, get_order(size));
+       if (!is_swiotlb_buffer(paddr))
+               free_pages((unsigned long)vaddr, get_order(size));
        else
                /* DMA_TO_DEVICE to avoid memcpy in unmap_single */
                do_unmap_single(hwdev, vaddr, size, DMA_TO_DEVICE);
@@ -606,12 +614,15 @@ swiotlb_full(struct device *dev, size_t size, int dir, int do_panic)
        printk(KERN_ERR "DMA: Out of SW-IOMMU space for %zu bytes at "
               "device %s\n", size, dev ? dev_name(dev) : "?");
 
-       if (size > io_tlb_overflow && do_panic) {
-               if (dir == DMA_FROM_DEVICE || dir == DMA_BIDIRECTIONAL)
-                       panic("DMA: Memory would be corrupted\n");
-               if (dir == DMA_TO_DEVICE || dir == DMA_BIDIRECTIONAL)
-                       panic("DMA: Random memory would be DMAed\n");
-       }
+       if (size <= io_tlb_overflow || !do_panic)
+               return;
+
+       if (dir == DMA_BIDIRECTIONAL)
+               panic("DMA: Random memory could be DMA accessed\n");
+       if (dir == DMA_FROM_DEVICE)
+               panic("DMA: Random memory could be DMA written\n");
+       if (dir == DMA_TO_DEVICE)
+               panic("DMA: Random memory could be DMA read\n");
 }
 
 /*
@@ -627,7 +638,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
                            struct dma_attrs *attrs)
 {
        phys_addr_t phys = page_to_phys(page) + offset;
-       dma_addr_t dev_addr = swiotlb_phys_to_bus(dev, phys);
+       dma_addr_t dev_addr = phys_to_dma(dev, phys);
        void *map;
 
        BUG_ON(dir == DMA_NONE);
@@ -636,7 +647,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
         * we can safely return the device addr and not worry about bounce
         * buffering it.
         */
-       if (!address_needs_mapping(dev, dev_addr, size) && !swiotlb_force)
+       if (dma_capable(dev, dev_addr, size) && !swiotlb_force)
                return dev_addr;
 
        /*
@@ -653,7 +664,7 @@ dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
        /*
         * Ensure that the address returned is DMA'ble
         */
-       if (address_needs_mapping(dev, dev_addr, size))
+       if (!dma_capable(dev, dev_addr, size))
                panic("map_single: bounce buffer is not DMA'ble");
 
        return dev_addr;
@@ -671,19 +682,25 @@ EXPORT_SYMBOL_GPL(swiotlb_map_page);
 static void unmap_single(struct device *hwdev, dma_addr_t dev_addr,
                         size_t size, int dir)
 {
-       char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);
+       phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
 
        BUG_ON(dir == DMA_NONE);
 
-       if (is_swiotlb_buffer(dma_addr)) {
-               do_unmap_single(hwdev, dma_addr, size, dir);
+       if (is_swiotlb_buffer(paddr)) {
+               do_unmap_single(hwdev, phys_to_virt(paddr), size, dir);
                return;
        }
 
        if (dir != DMA_FROM_DEVICE)
                return;
 
-       dma_mark_clean(dma_addr, size);
+       /*
+        * phys_to_virt doesn't work with hihgmem page but we could
+        * call dma_mark_clean() with hihgmem page here. However, we
+        * are fine since dma_mark_clean() is null on POWERPC. We can
+        * make dma_mark_clean() take a physical address if necessary.
+        */
+       dma_mark_clean(phys_to_virt(paddr), size);
 }
 
 void swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr,
@@ -708,19 +725,19 @@ static void
 swiotlb_sync_single(struct device *hwdev, dma_addr_t dev_addr,
                    size_t size, int dir, int target)
 {
-       char *dma_addr = swiotlb_bus_to_virt(hwdev, dev_addr);
+       phys_addr_t paddr = dma_to_phys(hwdev, dev_addr);
 
        BUG_ON(dir == DMA_NONE);
 
-       if (is_swiotlb_buffer(dma_addr)) {
-               sync_single(hwdev, dma_addr, size, dir, target);
+       if (is_swiotlb_buffer(paddr)) {
+               sync_single(hwdev, phys_to_virt(paddr), size, dir, target);
                return;
        }
 
        if (dir != DMA_FROM_DEVICE)
                return;
 
-       dma_mark_clean(dma_addr, size);
+       dma_mark_clean(phys_to_virt(paddr), size);
 }
 
 void
@@ -797,10 +814,10 @@ swiotlb_map_sg_attrs(struct device *hwdev, struct scatterlist *sgl, int nelems,
 
        for_each_sg(sgl, sg, nelems, i) {
                phys_addr_t paddr = sg_phys(sg);
-               dma_addr_t dev_addr = swiotlb_phys_to_bus(hwdev, paddr);
+               dma_addr_t dev_addr = phys_to_dma(hwdev, paddr);
 
                if (swiotlb_force ||
-                   address_needs_mapping(hwdev, dev_addr, sg->length)) {
+                   !dma_capable(hwdev, dev_addr, sg->length)) {
                        void *map = map_single(hwdev, sg_phys(sg),
                                               sg->length, dir);
                        if (!map) {