Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c82e4417 authored by FUJITA Tomonori's avatar FUJITA Tomonori Committed by Ingo Molnar
Browse files

add dma_mapping_ops for SWIOTLB 



There is already dma_mapping_ops for SWIOTLB but there are some
missing hooks.

This is for IA64_DIG_VTD, IA64_HP_ZX1_SWIOTLB, IA64_SGI_UV,
IA64_HP_SIM, IA64_XEN_GUEST and IA64_GENERIC.

Signed-off-by: default avatarFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Acked-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b4391dd1

arch/ia64/kernel/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -43,9 +43,7 @@ ifneq ($(CONFIG_IA64_ESI),) 
obj-y				+= esi_stub.o	# must be in kernel proper

endif

obj-$(CONFIG_DMAR)		+= pci-dma.o

ifeq ($(CONFIG_DMAR), y)

obj-$(CONFIG_SWIOTLB)		+= pci-swiotlb.o

endif



# The gate DSO image is built using a special linker script.

targets += gate.so gate-syms.o

arch/ia64/kernel/pci-dma.c

+0 −3
Original line number Diff line number Diff line
@@ -32,9 +32,6 @@ int force_iommu __read_mostly = 1; 
int force_iommu __read_mostly;

#endif



/* Set this to 1 if there is a HW IOMMU in the system */

int iommu_detected __read_mostly;



/* Dummy device used for NULL arguments (normally ISA). Better would

   be probably a smaller DMA mask, but this is bug-to-bug compatible

   to i386. */

arch/ia64/kernel/pci-swiotlb.c

+8 −1
Original line number Diff line number Diff line
@@ -13,12 +13,18 @@ 
int swiotlb __read_mostly;

EXPORT_SYMBOL(swiotlb);



/* Set this to 1 if there is a HW IOMMU in the system */

int iommu_detected __read_mostly;



struct dma_mapping_ops swiotlb_dma_ops = {

	.mapping_error = swiotlb_dma_mapping_error,

	.alloc_coherent = swiotlb_alloc_coherent,

	.free_coherent = swiotlb_free_coherent,

	.map_single = swiotlb_map_single,

	.unmap_single = swiotlb_unmap_single,

	.map_single_attrs = swiotlb_map_single_attrs,

	.unmap_single_attrs = swiotlb_unmap_single_attrs,

	.map_sg_attrs = swiotlb_map_sg_attrs,

	.unmap_sg_attrs	= swiotlb_unmap_sg_attrs,

	.sync_single_for_cpu = swiotlb_sync_single_for_cpu,

	.sync_single_for_device = swiotlb_sync_single_for_device,

	.sync_single_range_for_cpu = swiotlb_sync_single_range_for_cpu,
@@ -28,6 +34,7 @@ struct dma_mapping_ops swiotlb_dma_ops = { 
	.map_sg = swiotlb_map_sg,

	.unmap_sg = swiotlb_unmap_sg,

	.dma_supported_op = swiotlb_dma_supported,

	.mapping_error = swiotlb_dma_mapping_error,

};



void __init pci_swiotlb_init(void)