lkml.org 
[lkml]   [2023]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 4/4] of: address: Always use dma_default_coherent for default coherency
    Date
    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>
    ---
    v3: Squash setting ARCH_DMA_DEFAULT_COHERENT into this patch.
    ---
    arch/powerpc/Kconfig | 2 +-
    arch/riscv/Kconfig | 2 +-
    drivers/of/Kconfig | 4 ----
    drivers/of/address.c | 10 +---------
    4 files changed, 3 insertions(+), 15 deletions(-)

    diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
    index 57f5d2f53d06..824e00a1277b 100644
    --- 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
    @@ -273,7 +274,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 36a5b6fed0d3..6425b5c5d6d4 100644
    --- 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 644386833a7b..e40f10bf2ba4 100644
    --- 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 c105d66a1fa4..23ade4919853 100644
    --- a/drivers/of/address.c
    +++ b/drivers/of/address.c
    @@ -1103,15 +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);
    -
    - /*
    - * DT-based MIPS doesn't use OF_DMA_DEFAULT_COHERENT, but
    - * might override the system-wide default at runtime.
    - */
    -#if defined(CONFIG_MIPS) && defined(CONFIG_DMA_NONCOHERENT)
    - is_coherent = dma_default_coherent;
    -#endif
    + bool is_coherent = dma_default_coherent;

    node = of_node_get(np);

    --
    2.37.1 (Apple Git-137.1)
    \
     
     \ /
      Last update: 2023-03-27 01:10    [W:3.964 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site