public inbox for linux-ia64@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 3/9] ia64: remove iommu_dma_supported
@ 2018-09-17 17:10 Christoph Hellwig
  0 siblings, 0 replies; 3+ messages in thread
From: Christoph Hellwig @ 2018-09-17 17:10 UTC (permalink / raw)
  To: linux-ia64

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

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 arch/ia64/kernel/pci-dma.c  | 13 -------------
 drivers/iommu/intel-iommu.c |  2 --
 2 files changed, 15 deletions(-)

diff --git a/arch/ia64/kernel/pci-dma.c b/arch/ia64/kernel/pci-dma.c
index 50b6ad282a90..3c2884bef3d4 100644
--- a/arch/ia64/kernel/pci-dma.c
+++ b/arch/ia64/kernel/pci-dma.c
@@ -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
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 5f3f10cf9d9d..e72efef97924 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -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)
-- 
2.18.0

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* misc ia64 cleanups (resend)
@ 2018-09-20  7:26 Christoph Hellwig
  2018-09-20  7:26 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2018-09-20  7:26 UTC (permalink / raw)
  To: Tony Luck, Fenghua Yu; +Cc: linux-ia64, iommu, linux-kernel

A couple random cleanups I stumbled upon when doing dma related work.

^ permalink raw reply	[flat|nested] 3+ messages in thread
* DMA related cleanups for IA64
@ 2018-08-01 16:02 Christoph Hellwig
  2018-08-01 16:02 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
  0 siblings, 1 reply; 3+ messages in thread
From: Christoph Hellwig @ 2018-08-01 16:02 UTC (permalink / raw)
  To: Tony Luck, Fenghua Yu
  Cc: David Woodhouse, linux-ia64, linux-arch, linux-kernel, iommu

Hi all,

this is a resend of the last two series plus additional cleanups.  The
driver of it were the odd dma barriers in the ia64 sync_single_* methods,
but once I started to look into that area the fallback got bigger and
bigger..

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-20  7:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-17 17:10 [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
  -- strict thread matches above, loose matches on Subject: below --
2018-09-20  7:26 misc ia64 cleanups (resend) Christoph Hellwig
2018-09-20  7:26 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig
2018-08-01 16:02 DMA related cleanups for IA64 Christoph Hellwig
2018-08-01 16:02 ` [PATCH 3/9] ia64: remove iommu_dma_supported Christoph Hellwig

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox