|
@@ -25,11 +25,11 @@
|
|
#include <linux/module.h>
|
|
#include <linux/module.h>
|
|
#include <asm/page.h>
|
|
#include <asm/page.h>
|
|
|
|
|
|
|
|
+#define HEXAGON_MAPPING_ERROR 0
|
|
|
|
+
|
|
const struct dma_map_ops *dma_ops;
|
|
const struct dma_map_ops *dma_ops;
|
|
EXPORT_SYMBOL(dma_ops);
|
|
EXPORT_SYMBOL(dma_ops);
|
|
|
|
|
|
-int bad_dma_address; /* globals are automatically initialized to zero */
|
|
|
|
-
|
|
|
|
static inline void *dma_addr_to_virt(dma_addr_t dma_addr)
|
|
static inline void *dma_addr_to_virt(dma_addr_t dma_addr)
|
|
{
|
|
{
|
|
return phys_to_virt((unsigned long) dma_addr);
|
|
return phys_to_virt((unsigned long) dma_addr);
|
|
@@ -181,7 +181,7 @@ static dma_addr_t hexagon_map_page(struct device *dev, struct page *page,
|
|
WARN_ON(size == 0);
|
|
WARN_ON(size == 0);
|
|
|
|
|
|
if (!check_addr("map_single", dev, bus, size))
|
|
if (!check_addr("map_single", dev, bus, size))
|
|
- return bad_dma_address;
|
|
|
|
|
|
+ return HEXAGON_MAPPING_ERROR;
|
|
|
|
|
|
if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
|
|
if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC))
|
|
dma_sync(dma_addr_to_virt(bus), size, dir);
|
|
dma_sync(dma_addr_to_virt(bus), size, dir);
|
|
@@ -203,6 +203,11 @@ static void hexagon_sync_single_for_device(struct device *dev,
|
|
dma_sync(dma_addr_to_virt(dma_handle), size, dir);
|
|
dma_sync(dma_addr_to_virt(dma_handle), size, dir);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static int hexagon_mapping_error(struct device *dev, dma_addr_t dma_addr)
|
|
|
|
+{
|
|
|
|
+ return dma_addr == HEXAGON_MAPPING_ERROR;
|
|
|
|
+}
|
|
|
|
+
|
|
const struct dma_map_ops hexagon_dma_ops = {
|
|
const struct dma_map_ops hexagon_dma_ops = {
|
|
.alloc = hexagon_dma_alloc_coherent,
|
|
.alloc = hexagon_dma_alloc_coherent,
|
|
.free = hexagon_free_coherent,
|
|
.free = hexagon_free_coherent,
|
|
@@ -210,6 +215,7 @@ const struct dma_map_ops hexagon_dma_ops = {
|
|
.map_page = hexagon_map_page,
|
|
.map_page = hexagon_map_page,
|
|
.sync_single_for_cpu = hexagon_sync_single_for_cpu,
|
|
.sync_single_for_cpu = hexagon_sync_single_for_cpu,
|
|
.sync_single_for_device = hexagon_sync_single_for_device,
|
|
.sync_single_for_device = hexagon_sync_single_for_device,
|
|
|
|
+ .mapping_error = hexagon_mapping_error,
|
|
.is_phys = 1,
|
|
.is_phys = 1,
|
|
};
|
|
};
|
|
|
|
|