Commit c00a60d6 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Christoph Hellwig
Browse files

of: address: always use dma_default_coherent for default coherency 



As for now all arches have dma_default_coherent reflecting default
DMA coherency for of devices, so there is no need to have a standalone
config option.

Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: default avatarRob Herring <robh@kernel.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1d3f56b2

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ config PPC 
	#

	select ARCH_32BIT_OFF_T if PPC32

	select ARCH_DISABLE_KASAN_INLINE	if PPC_RADIX_MMU

	select ARCH_DMA_DEFAULT_COHERENT	if !NOT_COHERENT_CACHE

	select ARCH_ENABLE_MEMORY_HOTPLUG

	select ARCH_ENABLE_MEMORY_HOTREMOVE

	select ARCH_HAS_COPY_MC			if PPC64
@@ -272,7 +273,6 @@ config PPC 
	select NEED_PER_CPU_PAGE_FIRST_CHUNK	if PPC64

	select NEED_SG_DMA_LENGTH

	select OF

	select OF_DMA_DEFAULT_COHERENT		if !NOT_COHERENT_CACHE

	select OF_EARLY_FLATTREE

	select OLD_SIGACTION			if PPC32

	select OLD_SIGSUSPEND

arch/riscv/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ config 32BIT 


config RISCV

	def_bool y

	select ARCH_DMA_DEFAULT_COHERENT

	select ARCH_ENABLE_HUGEPAGE_MIGRATION if HUGETLB_PAGE && MIGRATION

	select ARCH_ENABLE_SPLIT_PMD_PTLOCK if PGTABLE_LEVELS > 2

	select ARCH_ENABLE_THP_MIGRATION if TRANSPARENT_HUGEPAGE
@@ -121,7 +122,6 @@ config RISCV 
	select MODULES_USE_ELF_RELA if MODULES

	select MODULE_SECTIONS if MODULES

	select OF

	select OF_DMA_DEFAULT_COHERENT

	select OF_EARLY_FLATTREE

	select OF_IRQ

	select PCI_DOMAINS_GENERIC if PCI

drivers/of/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -102,8 +102,4 @@ config OF_OVERLAY 
config OF_NUMA

	bool



config OF_DMA_DEFAULT_COHERENT

	# arches should select this if DMA is coherent by default for OF devices

	bool



endif # OF

drivers/of/address.c

+1 −1
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ phys_addr_t __init of_dma_get_max_cpu_address(struct device_node *np) 
bool of_dma_is_coherent(struct device_node *np)

{

	struct device_node *node;

	bool is_coherent = IS_ENABLED(CONFIG_OF_DMA_DEFAULT_COHERENT);

	bool is_coherent = dma_default_coherent;



	node = of_node_get(np);