Merge commit 'v2.6.32-rc7'
[safe/jmp/linux-2.6] / arch / x86 / include / asm / dma-mapping.h
index f82fdc4..6a25d5d 100644 (file)
@@ -6,6 +6,7 @@
  * 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/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;
@@ -32,6 +39,8 @@ static inline struct dma_map_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)
 {
@@ -52,169 +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,
-              enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-       dma_addr_t addr;
-
-       BUG_ON(!valid_dma_direction(dir));
-       addr = ops->map_page(hwdev, virt_to_page(ptr),
-                            (unsigned long)ptr & ~PAGE_MASK, size,
-                            dir, NULL);
-       debug_dma_map_page(hwdev, virt_to_page(ptr),
-                          (unsigned long)ptr & ~PAGE_MASK, size,
-                          dir, addr, true);
-       return addr;
-}
-
-static inline void
-dma_unmap_single(struct device *dev, dma_addr_t addr, size_t size,
-                enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->unmap_page)
-               ops->unmap_page(dev, addr, size, dir, NULL);
-       debug_dma_unmap_page(dev, addr, size, dir, true);
-}
-
-static inline int
-dma_map_sg(struct device *hwdev, struct scatterlist *sg,
-          int nents, enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-       int ents;
-
-       BUG_ON(!valid_dma_direction(dir));
-       ents = ops->map_sg(hwdev, sg, nents, dir, NULL);
-       debug_dma_map_sg(hwdev, sg, nents, ents, dir);
-
-       return ents;
-}
-
-static inline void
-dma_unmap_sg(struct device *hwdev, struct scatterlist *sg, int nents,
-            enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       debug_dma_unmap_sg(hwdev, sg, nents, dir);
-       if (ops->unmap_sg)
-               ops->unmap_sg(hwdev, sg, nents, dir, NULL);
-}
-
-static inline void
-dma_sync_single_for_cpu(struct device *hwdev, dma_addr_t dma_handle,
-                       size_t size, enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_for_cpu)
-               ops->sync_single_for_cpu(hwdev, dma_handle, size, dir);
-       debug_dma_sync_single_for_cpu(hwdev, dma_handle, size, dir);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_single_for_device(struct device *hwdev, dma_addr_t dma_handle,
-                          size_t size, enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_for_device)
-               ops->sync_single_for_device(hwdev, dma_handle, size, dir);
-       debug_dma_sync_single_for_device(hwdev, dma_handle, size, dir);
-       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,
-                             enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_range_for_cpu)
-               ops->sync_single_range_for_cpu(hwdev, dma_handle, offset,
-                                              size, dir);
-       debug_dma_sync_single_range_for_cpu(hwdev, dma_handle,
-                                           offset, size, dir);
-       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,
-                                enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_single_range_for_device)
-               ops->sync_single_range_for_device(hwdev, dma_handle,
-                                                 offset, size, dir);
-       debug_dma_sync_single_range_for_device(hwdev, dma_handle,
-                                              offset, size, dir);
-       flush_write_buffers();
-}
-
-static inline void
-dma_sync_sg_for_cpu(struct device *hwdev, struct scatterlist *sg,
-                   int nelems, enum dma_data_direction dir)
+static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 {
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
+       if (!dev->dma_mask)
+               return 0;
 
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_sg_for_cpu)
-               ops->sync_sg_for_cpu(hwdev, sg, nelems, dir);
-       debug_dma_sync_sg_for_cpu(hwdev, sg, nelems, dir);
-       flush_write_buffers();
+       return addr + size <= *dev->dma_mask;
 }
 
-static inline void
-dma_sync_sg_for_device(struct device *hwdev, struct scatterlist *sg,
-                      int nelems, enum dma_data_direction dir)
+static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
-       struct dma_map_ops *ops = get_dma_ops(hwdev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->sync_sg_for_device)
-               ops->sync_sg_for_device(hwdev, sg, nelems, dir);
-       debug_dma_sync_sg_for_device(hwdev, sg, nelems, dir);
-
-       flush_write_buffers();
+       return paddr;
 }
 
-static inline dma_addr_t dma_map_page(struct device *dev, struct page *page,
-                                     size_t offset, size_t size,
-                                     enum dma_data_direction dir)
+static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
 {
-       struct dma_map_ops *ops = get_dma_ops(dev);
-       dma_addr_t addr;
-
-       BUG_ON(!valid_dma_direction(dir));
-       addr = ops->map_page(dev, page, offset, size, dir, NULL);
-       debug_dma_map_page(dev, page, offset, size, dir, addr, false);
-
-       return addr;
-}
-
-static inline void dma_unmap_page(struct device *dev, dma_addr_t addr,
-                                 size_t size, enum dma_data_direction dir)
-{
-       struct dma_map_ops *ops = get_dma_ops(dev);
-
-       BUG_ON(!valid_dma_direction(dir));
-       if (ops->unmap_page)
-               ops->unmap_page(dev, addr, size, dir, NULL);
-       debug_dma_unmap_page(dev, addr, size, dir, false);
+       return daddr;
 }
 
 static inline void
@@ -268,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;