Merge commit 'v2.6.32-rc7'
[safe/jmp/linux-2.6] / arch / x86 / include / asm / dma-mapping.h
index b81f822..6a25d5d 100644 (file)
@@ -2,65 +2,32 @@
 #define _ASM_X86_DMA_MAPPING_H
 
 /*
- * IOMMU interface. See Documentation/DMA-mapping.txt and DMA-API.txt for
- * documentation.
+ * IOMMU interface. See Documentation/PCI/PCI-DMA-mapping.txt and
+ * Documentation/DMA-API.txt for documentation.
  */
 
+#include <linux/kmemcheck.h>
 #include <linux/scatterlist.h>
+#include <linux/dma-debug.h>
 #include <linux/dma-attrs.h>
 #include <asm/io.h>
 #include <asm/swiotlb.h>
 #include <asm-generic/dma-coherent.h>
 
+#ifdef CONFIG_ISA
+# define ISA_DMA_BIT_MASK DMA_BIT_MASK(24)
+#else
+# define ISA_DMA_BIT_MASK DMA_BIT_MASK(32)
+#endif
+
 extern dma_addr_t bad_dma_address;
 extern int iommu_merge;
 extern struct device x86_dma_fallback_dev;
 extern int panic_on_overflow;
 
-struct dma_mapping_ops {
-       int             (*mapping_error)(struct device *dev,
-                                        dma_addr_t dma_addr);
-       void*           (*alloc_coherent)(struct device *dev, size_t size,
-                               dma_addr_t *dma_handle, gfp_t gfp);
-       void            (*free_coherent)(struct device *dev, size_t size,
-                               void *vaddr, dma_addr_t dma_handle);
-       void            (*sync_single_for_cpu)(struct device *hwdev,
-                               dma_addr_t dma_handle, size_t size,
-                               int direction);
-       void            (*sync_single_for_device)(struct device *hwdev,
-                               dma_addr_t dma_handle, size_t size,
-                               int direction);
-       void            (*sync_single_range_for_cpu)(struct device *hwdev,
-                               dma_addr_t dma_handle, unsigned long offset,
-                               size_t size, int direction);
-       void            (*sync_single_range_for_device)(struct device *hwdev,
-                               dma_addr_t dma_handle, unsigned long offset,
-                               size_t size, int direction);
-       void            (*sync_sg_for_cpu)(struct device *hwdev,
-                               struct scatterlist *sg, int nelems,
-                               int direction);
-       void            (*sync_sg_for_device)(struct device *hwdev,
-                               struct scatterlist *sg, int nelems,
-                               int direction);
-       int             (*map_sg)(struct device *hwdev, struct scatterlist *sg,
-                               int nents, int direction);
-       void            (*unmap_sg)(struct device *hwdev,
-                               struct scatterlist *sg, int nents,
-                               int direction);
-       dma_addr_t      (*map_page)(struct device *dev, struct page *page,
-                                   unsigned long offset, size_t size,
-                                   enum dma_data_direction dir,
-                                   struct dma_attrs *attrs);
-       void            (*unmap_page)(struct device *dev, dma_addr_t dma_handle,
-                                     size_t size, enum dma_data_direction dir,
-                                     struct dma_attrs *attrs);
-       int             (*dma_supported)(struct device *hwdev, u64 mask);
-       int             is_phys;
-};
-
-extern struct dma_mapping_ops *dma_ops;
-
-static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
+extern struct dma_map_ops *dma_ops;
+
+static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 {
 #ifdef CONFIG_X86_32
        return dma_ops;
@@ -72,10 +39,12 @@ static inline struct dma_mapping_ops *get_dma_ops(struct device *dev)
 #endif
 }
 
+#include <asm-generic/dma-mapping-common.h>
+
 /* Make sure we keep the same behaviour */
 static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(dev);
+       struct dma_map_ops *ops = get_dma_ops(dev);
        if (ops->mapping_error)
                return ops->mapping_error(dev, dma_addr);
 
@@ -92,140 +61,22 @@ extern int dma_set_mask(struct device *dev, u64 mask);
 extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,
                                        dma_addr_t *dma_addr, gfp_t flag);
 
-static inline dma_addr_t
-dma_map_single(struct device *hwdev, void *ptr, size_t size,
-              int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       return ops->map_page(hwdev, virt_to_page(ptr),
-                            (unsigned long)ptr & ~PAGE_MASK, size,
-                            direction, NULL);
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t addr, size_t size,
-                int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->unmap_page)
-               ops->unmap_page(dev, addr, size, direction, NULL);
-}
-
-static inline int
-dma_map_sg(struct device *hwdev, struct scatterlist *sg,
-          int nents, int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       return ops->map_sg(hwdev, sg, nents, direction);
-}
-
-static inline void
-dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
-            int direction)
+static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
+       if (!dev->dma_mask)
+               return 0;
 
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->unmap_sg)
-               ops->unmap_sg(hwdev, sg, nents, direction);
+       return addr + size <= *dev->dma_mask;
 }
 
-static inline void
-dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
-                       size_t size, int direction)
+static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_single_for_cpu)
-               ops->sync_single_for_cpu(hwdev, dma_handle, size, direction);
-       flush_write_buffers();
+       return paddr;
 }
 
-static inline void
-dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
-                          size_t size, int direction)
+static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_single_for_device)
-               ops->sync_single_for_device(hwdev, dma_handle, size, direction);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_single_range_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
-                             unsigned long offset, size_t size, int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_single_range_for_cpu)
-               ops->sync_single_range_for_cpu(hwdev, dma_handle, offset,
-                                              size, direction);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_single_range_for_device(struct device *hwdev, dma_addr_t dma_handle,
-                                unsigned long offset, size_t size,
-                                int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_single_range_for_device)
-               ops->sync_single_range_for_device(hwdev, dma_handle,
-                                                 offset, size, direction);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
-                   int nelems, int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_sg_for_cpu)
-               ops->sync_sg_for_cpu(hwdev, sg, nelems, direction);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
-                      int nelems, int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       if (ops->sync_sg_for_device)
-               ops->sync_sg_for_device(hwdev, sg, nelems, direction);
-
-       flush_write_buffers();
-}
-
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                                     size_t offset, size_t size,
-                                     int direction)
-{
-       struct dma_mapping_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(direction));
-       return ops->map_page(dev, page, offset, size, direction, NULL);
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
-                                 size_t size, int direction)
-{
-       dma_unmap_single(dev, addr, size, direction);
+       return daddr;
 }
 
 static inline void
@@ -249,7 +100,7 @@ static inline unsigned long dma_alloc_coherent_mask(struct device *dev,
 
        dma_mask = dev->coherent_dma_mask;
        if (!dma_mask)
-               dma_mask = (gfp & GFP_DMA) ? DMA_24BIT_MASK : DMA_32BIT_MASK;
+               dma_mask = (gfp & GFP_DMA) ? DMA_BIT_MASK(24) : DMA_BIT_MASK(32);
 
        return dma_mask;
 }
@@ -258,10 +109,10 @@ static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)
 {
        unsigned long dma_mask = dma_alloc_coherent_mask(dev, gfp);
 
-       if (dma_mask <= DMA_24BIT_MASK)
+       if (dma_mask <= DMA_BIT_MASK(24))
                gfp |= GFP_DMA;
 #ifdef CONFIG_X86_64
-       if (dma_mask <= DMA_32BIT_MASK && !(gfp & GFP_DMA))
+       if (dma_mask <= DMA_BIT_MASK(32) && !(gfp & GFP_DMA))
                gfp |= GFP_DMA32;
 #endif
        return gfp;
@@ -271,7 +122,7 @@ static inline void *
 dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
                gfp_t gfp)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(dev);
+       struct dma_map_ops *ops = get_dma_ops(dev);
        void *memory;
 
        gfp &= ~(__GFP_DMA | __GFP_HIGHMEM | __GFP_DMA32);
@@ -279,10 +130,8 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
        if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
                return memory;
 
-       if (!dev) {
+       if (!dev)
                dev = &x86_dma_fallback_dev;
-               gfp |= GFP_DMA;
-       }
 
        if (!is_device_dma_capable(dev))
                return NULL;
@@ -290,20 +139,24 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
        if (!ops->alloc_coherent)
                return NULL;
 
-       return ops->alloc_coherent(dev, size, dma_handle,
-                                  dma_alloc_coherent_gfp_flags(dev, gfp));
+       memory = ops->alloc_coherent(dev, size, dma_handle,
+                                    dma_alloc_coherent_gfp_flags(dev, gfp));
+       debug_dma_alloc_coherent(dev, size, *dma_handle, memory);
+
+       return memory;
 }
 
 static inline void dma_free_coherent(struct device *dev, size_t size,
                                     void *vaddr, dma_addr_t bus)
 {
-       struct dma_mapping_ops *ops = get_dma_ops(dev);
+       struct dma_map_ops *ops = get_dma_ops(dev);
 
        WARN_ON(irqs_disabled());       /* for portability */
 
        if (dma_release_from_coherent(dev, get_order(size), vaddr))
                return;
 
+       debug_dma_free_coherent(dev, size, vaddr, bus);
        if (ops->free_coherent)
                ops->free_coherent(dev, size, vaddr, bus);
 }