From 917f69b8b74e0b3283fcd1f2885949847d787d24 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 5 Jan 2009 23:36:08 +0900
Subject: [PATCH] add dma_mapping_ops for SWIOTLB and SBA IOMMU
This is for IA64_HP_ZX1_SWIOTLB.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/ia64/hp/common/hwsw_iommu.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/arch/ia64/hp/common/hwsw_iommu.c b/arch/ia64/hp/common/hwsw_iommu.c
index 2769dbfd03bf..a40dcdd22eeb 100644
--- a/arch/ia64/hp/common/hwsw_iommu.c
+++ b/arch/ia64/hp/common/hwsw_iommu.c
@@ -13,8 +13,8 @@
*/
#include <linux/device.h>
+#include <linux/dma-mapping.h>
#include <linux/swiotlb.h>
-
#include <asm/machvec.h>
/* swiotlb declarations & definitions: */
@@ -193,3 +193,18 @@ EXPORT_SYMBOL(hwsw_sync_single_for_cpu);
EXPORT_SYMBOL(hwsw_sync_single_for_device);
EXPORT_SYMBOL(hwsw_sync_sg_for_cpu);
EXPORT_SYMBOL(hwsw_sync_sg_for_device);
+
+struct dma_mapping_ops hwsw_dma_ops = {
+ .alloc_coherent = hwsw_alloc_coherent,
+ .free_coherent = hwsw_free_coherent,
+ .map_single_attrs = hwsw_map_single_attrs,
+ .unmap_single_attrs = hwsw_unmap_single_attrs,
+ .map_sg_attrs = hwsw_map_sg_attrs,
+ .unmap_sg_attrs = hwsw_unmap_sg_attrs,
+ .sync_single_for_cpu = hwsw_sync_single_for_cpu,
+ .sync_sg_for_cpu = hwsw_sync_sg_for_cpu,
+ .sync_single_for_device = hwsw_sync_single_for_device,
+ .sync_sg_for_device = hwsw_sync_sg_for_device,
+ .dma_supported_op = hwsw_dma_supported,
+ .mapping_error = hwsw_dma_mapping_error,
+};