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: Jiaxun Yang <jiaxun.yang@flygoat.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index a6c4407d3ec835a972b78f15fb3033f7492b2d60..f4269f5109c758b17f1f94c84c12fed77c052644 100644 (file)
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -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

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index c5e42cc376048dbc9d960a6275b40c983acb7618..30727eb63688e29fb2e86ba8ec5f9b8bddd31ecb 100644 (file)
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -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

diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig
index 644386833a7b77b3f59a2a69298d83cea0eaf295..e40f10bf2ba4dedf00ca20a784ffc704ad062e99 100644 (file)
--- a/drivers/of/Kconfig
+++ b/drivers/of/Kconfig
@@ -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

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 4c0b169ef9bfba69558d39db21fb46643b17c90b..23ade4919853c1f76864bc25810635088aa30934 100644 (file)
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -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);