Commit beec903f authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Tony Luck
Browse files

ia64: remove iommu_dma_supported 



The generic dma_direct_supported helper already used by intel-iommu on
x86 does a better job than the ia64 reimplementation.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 77308e27

arch/ia64/kernel/pci-dma.c

+0 −13
Original line number Diff line number Diff line
@@ -51,18 +51,6 @@ iommu_dma_init(void) 
	return;

}



int iommu_dma_supported(struct device *dev, u64 mask)

{

	/* Copied from i386. Doesn't make much sense, because it will

	   only work for pci_alloc_coherent.

	   The caller just has to use GFP_DMA in this case. */

	if (mask < DMA_BIT_MASK(24))

		return 0;



	return 1;

}

EXPORT_SYMBOL(iommu_dma_supported);



void __init pci_iommu_alloc(void)

{

	dma_ops = &intel_dma_ops;
@@ -71,7 +59,6 @@ void __init pci_iommu_alloc(void) 
	intel_dma_ops.sync_sg_for_cpu = machvec_dma_sync_sg;

	intel_dma_ops.sync_single_for_device = machvec_dma_sync_single;

	intel_dma_ops.sync_sg_for_device = machvec_dma_sync_sg;

	intel_dma_ops.dma_supported = iommu_dma_supported;



	/*

	 * The order of these functions is important for

drivers/iommu/intel-iommu.c

+0 −2
Original line number Diff line number Diff line
@@ -3903,9 +3903,7 @@ const struct dma_map_ops intel_dma_ops = { 
	.map_page = intel_map_page,

	.unmap_page = intel_unmap_page,

	.mapping_error = intel_mapping_error,

#ifdef CONFIG_X86

	.dma_supported = dma_direct_supported,

#endif

};



static inline int iommu_domain_cache_init(void)