set up dma_ops appropriately

This patch introduces a global pointer, dma_ops, which points to an
appropriate dma_mapping_ops that the kernel should use. This is a
common way to handle multiple dma_mapping_ops (X86, POWER, and SPARC).

dma_ops is set in platform_dma_init. We also set it by hand where
machvec_init is callev via subsys_initcall.

- IA64_DIG_VTD uses vtd_dma_ops.
- IA64_HP_ZX1 uses sba_dma_ops.
- IA64_HP_ZX1_SWIOTLB uses hwsw_dma_ops.
- IA64_SGI_SN2 uses sn_dma_ops.
- The rest use swiotlb_dma_ops.

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>

3 files changed, 7 insertions, 3 deletions

diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h
index 59c17e446683..d40722c386b4 100644
--- a/arch/ia64/include/asm/machvec.h
+++ b/arch/ia64/include/asm/machvec.h
@@ -298,6 +298,8 @@ extern void machvec_init_from_cmdline(const char *cmdline);
 #  error Unknown configuration.  Update arch/ia64/include/asm/machvec.h.
 # endif /* CONFIG_IA64_GENERIC */
 
+extern void swiotlb_dma_init(void);
+
 /*
  * Define default versions so we can extend machvec for new platforms without having
  * to update the machvec files for all existing platforms.
@@ -328,7 +330,7 @@ extern void machvec_init_from_cmdline(const char *cmdline);
 # define platform_kernel_launch_event   machvec_noop
 #endif
 #ifndef platform_dma_init
-# define platform_dma_init              swiotlb_init
+# define platform_dma_init              swiotlb_dma_init
 #endif
 #ifndef platform_dma_alloc_coherent
 # define platform_dma_alloc_coherent    swiotlb_alloc_coherent
diff --git a/arch/ia64/include/asm/machvec_hpzx1.h b/arch/ia64/include/asm/machvec_hpzx1.h
index 2f57f5144b9f..dd4140b4dd2f 100644
--- a/arch/ia64/include/asm/machvec_hpzx1.h
+++ b/arch/ia64/include/asm/machvec_hpzx1.h
@@ -2,6 +2,7 @@
 #define _ASM_IA64_MACHVEC_HPZX1_h
 
 extern ia64_mv_setup_t                  dig_setup;
+extern ia64_mv_dma_init                 sba_dma_init;
 extern ia64_mv_dma_alloc_coherent       sba_alloc_coherent;
 extern ia64_mv_dma_free_coherent        sba_free_coherent;
 extern ia64_mv_dma_map_single_attrs     sba_map_single_attrs;
@@ -20,7 +21,7 @@ extern ia64_mv_dma_mapping_error	sba_dma_mapping_error;
  */
 #define platform_name                           "hpzx1"
 #define platform_setup                          dig_setup
-#define platform_dma_init                       machvec_noop
+#define platform_dma_init                       sba_dma_init
 #define platform_dma_alloc_coherent             sba_alloc_coherent
 #define platform_dma_free_coherent              sba_free_coherent
 #define platform_dma_map_single_attrs           sba_map_single_attrs
diff --git a/arch/ia64/include/asm/machvec_sn2.h b/arch/ia64/include/asm/machvec_sn2.h
index 781308ea7b88..c1f6f871da81 100644
--- a/arch/ia64/include/asm/machvec_sn2.h
+++ b/arch/ia64/include/asm/machvec_sn2.h
@@ -55,6 +55,7 @@ extern ia64_mv_readb_t __sn_readb_relaxed;
 extern ia64_mv_readw_t __sn_readw_relaxed;
 extern ia64_mv_readl_t __sn_readl_relaxed;
 extern ia64_mv_readq_t __sn_readq_relaxed;
+extern ia64_mv_dma_init                 sn_dma_init;
 extern ia64_mv_dma_alloc_coherent       sn_dma_alloc_coherent;
 extern ia64_mv_dma_free_coherent        sn_dma_free_coherent;
 extern ia64_mv_dma_map_single_attrs     sn_dma_map_single_attrs;
@@ -110,7 +111,7 @@ extern ia64_mv_pci_fixup_bus_t		sn_pci_fixup_bus;
 #define platform_pci_get_legacy_mem     sn_pci_get_legacy_mem
 #define platform_pci_legacy_read        sn_pci_legacy_read
 #define platform_pci_legacy_write       sn_pci_legacy_write
-#define platform_dma_init               machvec_noop
+#define platform_dma_init               sn_dma_init
 #define platform_dma_alloc_coherent     sn_dma_alloc_coherent
 #define platform_dma_free_coherent      sn_dma_free_coherent
 #define platform_dma_map_single_attrs   sn_dma_map_single_attrs