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

Commit fec777c3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Ingo Molnar
Browse files

x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y) 



The generic DMA-direct (CONFIG_DMA_DIRECT_OPS=y) implementation is now
functionally equivalent to the x86 nommu dma_map implementation, so
switch over to using it.

That includes switching from using x86_dma_supported in various IOMMU
drivers to use dma_direct_supported instead, which provides the same
functionality.

Tested-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Muli Ben-Yehuda <mulix@mulix.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: iommu@lists.linux-foundation.org
Link: http://lkml.kernel.org/r/20180319103826.12853-4-hch@lst.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 038d07a2

arch/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ config X86 
	select CLOCKSOURCE_VALIDATE_LAST_CYCLE

	select CLOCKSOURCE_WATCHDOG

	select DCACHE_WORD_ACCESS

	select DMA_DIRECT_OPS

	select EDAC_ATOMIC_SCRUB

	select EDAC_SUPPORT

	select GENERIC_CLOCKEVENTS

arch/x86/include/asm/dma-mapping.h

+0 −8
Original line number Diff line number Diff line
@@ -36,14 +36,6 @@ int arch_dma_supported(struct device *dev, u64 mask); 
bool arch_dma_alloc_attrs(struct device **dev, gfp_t *gfp);

#define arch_dma_alloc_attrs arch_dma_alloc_attrs



extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,

					dma_addr_t *dma_addr, gfp_t flag,

					unsigned long attrs);



extern void dma_generic_free_coherent(struct device *dev, size_t size,

				      void *vaddr, dma_addr_t dma_addr,

				      unsigned long attrs);



static inline gfp_t dma_alloc_coherent_gfp_flags(struct device *dev, gfp_t gfp)

{

	if (dev->coherent_dma_mask <= DMA_BIT_MASK(24))

arch/x86/include/asm/iommu.h

+0 −3
Original line number Diff line number Diff line
@@ -2,13 +2,10 @@ 
#ifndef _ASM_X86_IOMMU_H

#define _ASM_X86_IOMMU_H



extern const struct dma_map_ops nommu_dma_ops;

extern int force_iommu, no_iommu;

extern int iommu_detected;

extern int iommu_pass_through;



int x86_dma_supported(struct device *dev, u64 mask);



/* 10 seconds */

#define DMAR_OPERATION_TIMEOUT ((cycles_t) tsc_khz*10*1000)

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ obj-$(CONFIG_X86_ESPFIX64) += espfix_64.o 
obj-$(CONFIG_SYSFS)	+= ksysfs.o

obj-y			+= bootflag.o e820.o

obj-y			+= pci-dma.o quirks.o topology.o kdebugfs.o

obj-y			+= alternative.o i8253.o pci-nommu.o hw_breakpoint.o

obj-y			+= alternative.o i8253.o hw_breakpoint.o

obj-y			+= tsc.o tsc_msr.o io_delay.o rtc.o

obj-y			+= pci-iommu_table.o

obj-y			+= resource.o

arch/x86/kernel/amd_gart_64.c

+3 −4
Original line number Diff line number Diff line
@@ -501,8 +501,7 @@ gart_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_addr, 
		}

		__free_pages(page, get_order(size));

	} else

		return dma_generic_alloc_coherent(dev, size, dma_addr, flag,

						  attrs);

		return dma_direct_alloc(dev, size, dma_addr, flag, attrs);



	return NULL;

}
@@ -513,7 +512,7 @@ gart_free_coherent(struct device *dev, size_t size, void *vaddr, 
		   dma_addr_t dma_addr, unsigned long attrs)

{

	gart_unmap_page(dev, dma_addr, size, DMA_BIDIRECTIONAL, 0);

	dma_generic_free_coherent(dev, size, vaddr, dma_addr, attrs);

	dma_direct_free(dev, size, vaddr, dma_addr, attrs);

}



static int gart_mapping_error(struct device *dev, dma_addr_t dma_addr)
@@ -705,7 +704,7 @@ static const struct dma_map_ops gart_dma_ops = { 
	.alloc				= gart_alloc_coherent,

	.free				= gart_free_coherent,

	.mapping_error			= gart_mapping_error,

	.dma_supported			= x86_dma_supported,

	.dma_supported			= dma_direct_supported,

};



static void gart_iommu_shutdown(void)