MIPS noncoherent DMA cleanups v2
Subsystems (3)
Hi Thomas,
this series cleans up some of the mips (maybe) noncoherent support. It also remove the need for the special <asm/dma-coherence.h> header only provided by mips.
Changes since v1:
- fix a bisection issue due to a missing brace
- simplify the parameter parsing given that it happens after plat_mem_init
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 1/6 MIPS/malta: simplify plat_setup_iocoherency
Given that plat_mem_setup runs before earlyparams are handled and malta selects CONFIG_DMA_MAYBE_COHERENT, coherentio can only be set to IO_COHERENCE_DEFAULT at this point. So remove the checking for other options and merge plat_enable_iocoherency into plat_setup_iocoherency to simplify the code a bit.
--- arch/mips/mti-malta/malta-setup.c | 32 +++++++++---------------------- 1 file changed, 9 insertions(+), 23 deletions(-)
arch/mips/mti-malta/malta-setup.c +9 -23
@@ -90,16 +90,15 @@ static void __init fd_activate(void) }#endif -static int __init plat_enable_iocoherency (void ) +static void __init plat_setup_iocoherency (void ) { -int supported =0 ;u32 cfg;if (mips_revision_sconid ==MIPS_REVISION_SCON_BONITO ) {if (BONITO_PCICACHECTRL &BONITO_PCICACHECTRL_CPUCOH_PRES ) {BONITO_PCICACHECTRL |=BONITO_PCICACHECTRL_CPUCOH_EN ;pr_info ("Enabled Bonito CPU coherency\n" ); - supported =1 ; + hw_coherentio =1 ; }if (strstr (fw_getcmdline (),"iobcuncached" )) {BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN ;
@@ -118,29 +117,16 @@ static int __init plat_enable_iocoherency(void)/* Nothing special needs to be done to enable coherency */ pr_info ("CMP IOCU detected\n" ); cfg =__raw_readl ((u32 *)CKSEG1ADDR (ROCIT_CONFIG_GEN0 )); -if (!(cfg &ROCIT_CONFIG_GEN0_PCI_IOCU )) { +if (cfg &ROCIT_CONFIG_GEN0_PCI_IOCU ) + hw_coherentio =1 ; +else pr_crit ("IOCU OPERATION DISABLED BY SWITCH - DEFAULTING TO SW IO COHERENCY\n" ); -return 0 ; - } - supported =1 ; } - hw_coherentio = supported; -return supported; -} -static void __init plat_setup_iocoherency (void ) -{ -if (plat_enable_iocoherency ()) { -if (coherentio ==IO_COHERENCE_DISABLED ) -pr_info ("Hardware DMA cache coherency disabled\n" ); -else -pr_info ("Hardware DMA cache coherency enabled\n" ); - }else { -if (coherentio ==IO_COHERENCE_ENABLED ) -pr_info ("Hardware DMA cache coherency unsupported, but enabled from command line!\n" ); -else -pr_info ("Software DMA cache coherency enabled\n" ); - } +if (hw_coherentio) +pr_info ("Hardware DMA cache coherency enabled\n" ); +else +pr_info ("Software DMA cache coherency enabled\n" ); }static void __init pci_clock_check (void )
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 1/6] MIPS/malta: simplify plat_setup_iocoherency
Quoted 5 lines · Christoph Hellwig
Given that
plat_mem_setupruns before earlyparams are handled and malta selectsCONFIG_DMA_MAYBE_COHERENT, coherentio can only be set toIO_COHERENCE_DEFAULTat this point. So remove the checking for other options and mergeplat_enable_iocoherencyintoplat_setup_iocoherencyto simplify the code a bit.
FWIW,
Maciej
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 2/6 MIPS/alchemy: factor out the DMA coherent setup
In reply to Christoph HellwigFactor out a alchemy_dma_coherent helper that determines if the platform is DMA coherent. Also stop initializing the hw_coherentio variable, given that is only ever set to a non-zero value by the malta setup code.
--- arch/mips/alchemy/common/setup.c | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-)
arch/mips/alchemy/common/setup.c +19 -14
@@ -37,6 +37,23 @@extern void __init board_setup (void );extern void __init alchemy_set_lpj (void ); +static bool alchemy_dma_coherent (void ) +{ +switch (alchemy_get_cputype ()) { +case ALCHEMY_CPU_AU1000 : +case ALCHEMY_CPU_AU1500 : +case ALCHEMY_CPU_AU1100 : +return false; +case ALCHEMY_CPU_AU1200 : +/* Au1200 AB USB does not support coherent memory */ +if ((read_c0_prid () &PRID_REV_MASK ) ==0 ) +return false; +return true; +default : +return true; + } +} +void __init plat_mem_setup (void ) {alchemy_set_lpj ();
@@ -48,20 +65,8 @@ void __init plat_mem_setup(void)/* Clear to obtain best system bus performance */ clear_c0_config (1 <<19 );/* Clear Config[OD] */ - hw_coherentio =0 ; - coherentio =IO_COHERENCE_ENABLED ; -switch (alchemy_get_cputype ()) { -case ALCHEMY_CPU_AU1000 : -case ALCHEMY_CPU_AU1500 : -case ALCHEMY_CPU_AU1100 : - coherentio =IO_COHERENCE_DISABLED ; -break ; -case ALCHEMY_CPU_AU1200 : -/* Au1200 AB USB does not support coherent memory */ -if (0 == (read_c0_prid () &PRID_REV_MASK )) - coherentio =IO_COHERENCE_DISABLED ; -break ; - } + coherentio =alchemy_dma_coherent () ? +IO_COHERENCE_ENABLED :IO_COHERENCE_DISABLED ;board_setup ();/* board specific setup */
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 3/6 MIPS: refactor the runtime coherent vs noncoherent DMA indicators
In reply to Christoph HellwigReplace the global coherentio enum, and the hw_coherentio (fake) boolean variables with a single boolean dma_default_coherent flag.
--- arch/mips/alchemy/common/setup.c | 3 +-- arch/mips/include/asm/dma-coherence.h | 24 ++++-------------------- arch/mips/kernel/setup.c | 10 ++++------ arch/mips/mm/c-r4k.c | 8 ++------ arch/mips/mti-malta/malta-setup.c | 6 +++--- arch/mips/pci/pci-alchemy.c | 5 ++--- 6 files changed, 16 insertions(+), 40 deletions(-)
arch/mips/alchemy/common/setup.c +1 -2
@@ -65,8 +65,7 @@ void __init plat_mem_setup(void)/* Clear to obtain best system bus performance */ clear_c0_config (1 <<19 );/* Clear Config[OD] */ - coherentio =alchemy_dma_coherent () ? -IO_COHERENCE_ENABLED :IO_COHERENCE_DISABLED ; + dma_default_coherent =alchemy_dma_coherent ();board_setup ();/* board specific setup */
arch/mips/include/asm/dma-coherence.h +4 -20
@@ -9,30 +9,14 @@#ifndef __ASM_DMA_COHERENCE_H#define __ASM_DMA_COHERENCE_H -enum coherent_io_user_state { -IO_COHERENCE_DEFAULT , -IO_COHERENCE_ENABLED , -IO_COHERENCE_DISABLED , -}; - -#if defined(CONFIG_DMA_PERDEV_COHERENT ) -/* Don't provide (hw_)coherentio to avoid misuse */ -#elif defined(CONFIG_DMA_MAYBE_COHERENT ) -extern enum coherent_io_user_state coherentio; -extern int hw_coherentio; - +#ifdef CONFIG_DMA_MAYBE_COHERENT +extern bool dma_default_coherent;static inline bool dev_is_dma_coherent (struct device *dev) { -return coherentio ==IO_COHERENCE_ENABLED || - (coherentio ==IO_COHERENCE_DEFAULT && hw_coherentio); +return dma_default_coherent; }#else -#ifdef CONFIG_DMA_NONCOHERENT -#define coherentio IO_COHERENCE_DISABLED -#else -#define coherentio IO_COHERENCE_ENABLED +#define dma_default_coherent (!IS_ENABLED(CONFIG_DMA_NONCOHERENT))#endif -#define hw_coherentio 0 -#endif /* CONFIG_DMA_MAYBE_COHERENT */ #endif
arch/mips/kernel/setup.c +4 -6
@@ -807,14 +807,12 @@ arch_initcall(debugfs_mips);#endif #ifdef CONFIG_DMA_MAYBE_COHERENT -/* User defined DMA coherency from command line. */ -enum coherent_io_user_state coherentio =IO_COHERENCE_DEFAULT ; -EXPORT_SYMBOL_GPL (coherentio); -int hw_coherentio;/* Actual hardware supported DMA coherency setting. */ +bool dma_default_coherent; +EXPORT_SYMBOL_GPL (dma_default_coherent);static int __init setcoherentio (char *str) { - coherentio =IO_COHERENCE_ENABLED ; + dma_default_coherent = true;pr_info ("Hardware DMA cache coherency (command line)\n" );return 0 ; }
@@ -822,7 +820,7 @@ early_param("coherentio", setcoherentio);static int __init setnocoherentio (char *str) { - coherentio =IO_COHERENCE_DISABLED ; + dma_default_coherent = true;pr_info ("Software DMA cache coherency (command line)\n" );return 0 ; }
arch/mips/mm/c-r4k.c +2 -6
@@ -1913,15 +1913,11 @@ void r4k_cache_init(void) __local_flush_icache_user_range = local_r4k_flush_icache_user_range;#ifdef CONFIG_DMA_NONCOHERENT -#ifdef CONFIG_DMA_MAYBE_COHERENT -if (coherentio ==IO_COHERENCE_ENABLED || - (coherentio ==IO_COHERENCE_DEFAULT && hw_coherentio)) { +if (dma_default_coherent) { _dma_cache_wback_inv = (void *)cache_noop; _dma_cache_wback = (void *)cache_noop; _dma_cache_inv = (void *)cache_noop; - } else -#endif /* CONFIG_DMA_MAYBE_COHERENT */ - { + }else { _dma_cache_wback_inv = r4k_dma_cache_wback_inv; _dma_cache_wback = r4k_dma_cache_wback_inv; _dma_cache_inv = r4k_dma_cache_inv;
arch/mips/mti-malta/malta-setup.c +3 -3
@@ -98,7 +98,7 @@ static void __init plat_setup_iocoherency(void)if (BONITO_PCICACHECTRL &BONITO_PCICACHECTRL_CPUCOH_PRES ) {BONITO_PCICACHECTRL |=BONITO_PCICACHECTRL_CPUCOH_EN ;pr_info ("Enabled Bonito CPU coherency\n" ); - hw_coherentio =1 ; + dma_default_coherent = true; }if (strstr (fw_getcmdline (),"iobcuncached" )) {BONITO_PCICACHECTRL &= ~BONITO_PCICACHECTRL_IOBCCOH_EN ;
@@ -118,12 +118,12 @@ static void __init plat_setup_iocoherency(void)pr_info ("CMP IOCU detected\n" ); cfg =__raw_readl ((u32 *)CKSEG1ADDR (ROCIT_CONFIG_GEN0 ));if (cfg &ROCIT_CONFIG_GEN0_PCI_IOCU ) - hw_coherentio =1 ; + dma_default_coherent = true;else pr_crit ("IOCU OPERATION DISABLED BY SWITCH - DEFAULTING TO SW IO COHERENCY\n" ); } -if (hw_coherentio) +if (dma_default_coherent)pr_info ("Hardware DMA cache coherency enabled\n" );else pr_info ("Software DMA cache coherency enabled\n" );
arch/mips/pci/pci-alchemy.c +2 -3
@@ -429,9 +429,8 @@ static int alchemy_pci_probe(struct platform_device *pdev) ctx->alchemy_pci_ctrl.io_map_base = (unsigned long )virt_io;/* Au1500 revisions older than AD have borked coherent PCI */ -if ((alchemy_get_cputype () ==ALCHEMY_CPU_AU1500 ) && - (read_c0_prid () <0x01030202 ) && - (coherentio ==IO_COHERENCE_DISABLED )) { +if (alchemy_get_cputype () ==ALCHEMY_CPU_AU1500 && +read_c0_prid () <0x01030202 && !dma_default_coherent) { val =__raw_readl (ctx->regs +PCI_REG_CONFIG ); val |=PCI_CONFIG_NC ;__raw_writel (val, ctx->regs +PCI_REG_CONFIG );
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 4/6 driver core: lift dma_default_coherent into common code
In reply to Christoph HellwigLift the dma_default_coherent variable from the mips architecture code to the driver core. This allows an architecture to sdefault all device to be DMA coherent at run time, even if the kernel is build with support for DMA noncoherent device. By allowing device_initialize to set the ->dma_coherent field to this default the amount of arch hooks required for this behavior can be greatly reduced.
--- arch/mips/Kconfig | 1 - arch/mips/alchemy/common/setup.c | 2 +- arch/mips/include/asm/dma-coherence.h | 22 ---------------------- arch/mips/kernel/setup.c | 4 ---- arch/mips/mm/c-r4k.c | 2 +- arch/mips/mm/dma-noncoherent.c | 1 - arch/mips/mti-malta/malta-setup.c | 2 +- arch/mips/pci/pci-alchemy.c | 2 +- arch/mips/pistachio/init.c | 1 - drivers/base/core.c | 6 ++++++ include/linux/dma-map-ops.h | 5 ++--- kernel/dma/Kconfig | 3 --- kernel/dma/mapping.c | 2 ++ 13 files changed, 14 insertions(+), 39 deletions(-) delete mode 100644 arch/mips/include/asm/dma-coherence.h
arch/mips/Kconfig +0 -1
@@ -1128,7 +1128,6 @@ config ARCH_SUPPORTS_UPROBES bool config DMA_MAYBE_COHERENT - select ARCH_HAS_DMA_COHERENCE_H select DMA_NONCOHERENT bool
arch/mips/alchemy/common/setup.c +1 -1
@@ -28,8 +28,8 @@#include <linux/init.h> #include <linux/ioport.h> #include <linux/mm.h> +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ -#include <asm/dma-coherence.h> #include <asm/mipsregs.h> #include <au1000.h>
arch/mips/include/asm/dma-coherence.h deleted +0 -22
@@ -1,22 +0,0 @@ -/* -* This file is subject to the terms and conditions of the GNU General Public -* License. See the file "COPYING" in the main directory of this archive -* for more details. -* -* Copyright (C) 2006 Ralf Baechle <[email protected]> -* -*/ -#ifndef __ASM_DMA_COHERENCE_H -#define __ASM_DMA_COHERENCE_H - -#ifdef CONFIG_DMA_MAYBE_COHERENT -extern bool dma_default_coherent; -static inline bool dev_is_dma_coherent (struct device *dev) -{ -return dma_default_coherent; -} -#else -#define dma_default_coherent (!IS_ENABLED(CONFIG_DMA_NONCOHERENT)) -#endif - -#endif
arch/mips/kernel/setup.c +0 -4
@@ -37,7 +37,6 @@#include <asm/cdmm.h> #include <asm/cpu.h> #include <asm/debug.h> -#include <asm/dma-coherence.h> #include <asm/sections.h> #include <asm/setup.h> #include <asm/smp-ops.h>
@@ -807,9 +806,6 @@ arch_initcall(debugfs_mips);#endif #ifdef CONFIG_DMA_MAYBE_COHERENT -bool dma_default_coherent; -EXPORT_SYMBOL_GPL (dma_default_coherent); -static int __init setcoherentio (char *str) { dma_default_coherent = true;
arch/mips/mm/c-r4k.c +1 -1
@@ -19,6 +19,7 @@#include <linux/mm.h> #include <linux/export.h> #include <linux/bitops.h> +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ #include <asm/bcache.h> #include <asm/bootinfo.h>
@@ -35,7 +36,6 @@#include <asm/war.h> #include <asm/cacheflush.h> /* for run_uncached() */ #include <asm/traps.h> -#include <asm/dma-coherence.h> #include <asm/mips-cps.h> /*
arch/mips/mm/dma-noncoherent.c +0 -1
@@ -10,7 +10,6 @@#include <asm/cache.h> #include <asm/cpu-type.h> -#include <asm/dma-coherence.h> #include <asm/io.h> /*
arch/mips/mti-malta/malta-setup.c +1 -1
@@ -13,8 +13,8 @@#include <linux/pci.h> #include <linux/screen_info.h> #include <linux/time.h> +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ -#include <asm/dma-coherence.h> #include <asm/fw/fw.h> #include <asm/mips-cps.h> #include <asm/mips-boards/generic.h>
arch/mips/pci/pci-alchemy.c +1 -1
@@ -17,8 +17,8 @@#include <linux/init.h> #include <linux/syscore_ops.h> #include <linux/vmalloc.h> +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ -#include <asm/dma-coherence.h> #include <asm/mach-au1x00/au1000.h> #include <asm/tlbmisc.h>
arch/mips/pistachio/init.c +0 -1
@@ -13,7 +13,6 @@#include <linux/of_fdt.h> #include <asm/cacheflush.h> -#include <asm/dma-coherence.h> #include <asm/fw/fw.h> #include <asm/mips-boards/generic.h> #include <asm/mips-cps.h>
drivers/base/core.c +6 -0
@@ -28,6 +28,7 @@#include <linux/sched/signal.h> #include <linux/sched/mm.h> #include <linux/sysfs.h> +#include <linux/dma-map-ops.h> /* for dma_default_coherent */ #include "base.h" #include "power/power.h"
@@ -2603,6 +2604,11 @@ void device_initialize(struct device *dev)INIT_LIST_HEAD (&dev->links.suppliers);INIT_LIST_HEAD (&dev->links.defer_sync); dev->links.status =DL_DEV_NO_DRIVER ; +#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ + defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU ) || \ + defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL ) + dev->dma_coherent = dma_default_coherent; +#endif }EXPORT_SYMBOL_GPL (device_initialize);
include/linux/dma-map-ops.h +2 -3
@@ -229,11 +229,10 @@ bool dma_free_from_pool(struct device *dev, void *start, size_t size);int dma_direct_set_offset (struct device *dev,phys_addr_t cpu_start,dma_addr_t dma_start,u64 size); -#ifdef CONFIG_ARCH_HAS_DMA_COHERENCE_H -#include <asm/dma-coherence.h> -#elif defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ +#if defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE ) || \ defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU ) || \ defined(CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL ) +extern bool dma_default_coherent;static inline bool dev_is_dma_coherent (struct device *dev) {return dev->dma_coherent;
kernel/dma/Kconfig +0 -3
@@ -33,9 +33,6 @@ config NEED_DMA_MAP_STATE config ARCH_DMA_ADDR_T_64BIT def_bool 64BIT || PHYS_ADDR_T_64BIT -config ARCH_HAS_DMA_COHERENCE_H - bool - config ARCH_HAS_DMA_SET_MASK bool
kernel/dma/mapping.c +2 -0
@@ -16,6 +16,8 @@#include "debug.h" #include "direct.h" +bool dma_default_coherent; +/* * Managed DMA API */
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH 5/6 MIPS: remove CONFIG_DMA_MAYBE_COHERENT
In reply to Christoph HellwigCONFIG_DMA_MAYBE_COHERENT just guards two early init options now. Just enable them unconditionally for CONFIG_DMA_NONCOHERENT.
--- arch/mips/Kconfig | 8 ++------ arch/mips/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-)
arch/mips/Kconfig +2 -6
@@ -181,7 +181,7 @@ config MIPS_ALCHEMY select CEVT_R4K select CSRC_R4K select IRQ_MIPS_CPU - select DMA_MAYBE_COHERENT # Au1000,1500,1100 aren't, rest is + select DMA_NONCOHERENT # Au1000,1500,1100 aren't, rest is select MIPS_FIXUP_BIGPHYS_ADDR if PCI select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL
@@ -546,7 +546,7 @@ config MIPS_MALTA select CLKSRC_MIPS_GIC select COMMON_CLK select CSRC_R4K - select DMA_MAYBE_COHERENT + select DMA_NONCOHERENT select GENERIC_ISA_DMA select HAVE_PCSPKR_PLATFORM select HAVE_PCI
@@ -1127,10 +1127,6 @@ config FW_CFE config ARCH_SUPPORTS_UPROBES bool -config DMA_MAYBE_COHERENT - select DMA_NONCOHERENT - bool - config DMA_PERDEV_COHERENT bool select ARCH_HAS_SETUP_DMA_OPS
arch/mips/kernel/setup.c +1 -1
@@ -805,7 +805,7 @@ static int __init debugfs_mips(void)arch_initcall (debugfs_mips);#endif -#ifdef CONFIG_DMA_MAYBE_COHERENT +#ifdef CONFIG_DMA_NONCOHERENT static int __init setcoherentio (char *str) { dma_default_coherent = true;
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Re: [PATCH 5/6] MIPS: remove CONFIG_DMA_MAYBE_COHERENT
Quoted 59 lines · Christoph Hellwig
CONFIG_DMA_MAYBE_COHERENTjust guards two early init options now. Just enable them unconditionally forCONFIG_DMA_NONCOHERENT.Signed-off-by Christoph Hellwig <[email protected]>--- arch/mips/Kconfig | 8 ++------ arch/mips/kernel/setup.c | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-)arch/mips/Kconfig +2
-6@@ -181,7 +181,7 @@ config MIPS_ALCHEMY select CEVT_R4K select CSRC_R4K select IRQ_MIPS_CPU - select DMA_MAYBE_COHERENT # Au1000,1500,1100 aren't, rest is + select DMA_NONCOHERENT # Au1000,1500,1100 aren't, rest is select MIPS_FIXUP_BIGPHYS_ADDR if PCI select SYS_HAS_CPU_MIPS32_R1 select SYS_SUPPORTS_32BIT_KERNEL@@ -546,7 +546,7 @@ config MIPS_MALTA select CLKSRC_MIPS_GIC select COMMON_CLK select CSRC_R4K - select DMA_MAYBE_COHERENT + select DMA_NONCOHERENT select GENERIC_ISA_DMA select HAVE_PCSPKR_PLATFORM select HAVE_PCI@@ -1127,10 +1127,6 @@ config FW_CFE config ARCH_SUPPORTS_UPROBES bool -config DMA_MAYBE_COHERENT - select DMA_NONCOHERENT - bool - config DMA_PERDEV_COHERENT bool select ARCH_HAS_SETUP_DMA_OPSarch/mips/kernel/setup.c +1
-2@@ -805,7 +805,7 @@ static int __init debugfs_mips(void)arch_initcall (debugfs_mips);#endif -#ifdef CONFIG_DMA_MAYBE_COHERENT +#ifdef CONFIG_DMA_NONCOHERENT static int __init setcoherentio (char *str) { dma_default_coherent = true; --2.29.2
PATCH 6/6 MIPS: remove CONFIG_DMA_PERDEV_COHERENT
In reply to Christoph HellwigJust select DMA_NONCOHERENT and ARCH_HAS_SETUP_DMA_OPS from the MIPS_GENERIC platform instead.
--- arch/mips/Kconfig | 3 ++- arch/mips/mm/dma-noncoherent.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
arch/mips/Kconfig +2 -1
@@ -123,6 +123,7 @@ choice config MIPS_GENERIC_KERNEL bool "Generic board-agnostic MIPS kernel" + select ARCH_HAS_SETUP_DMA_OPS select MIPS_GENERIC select BOOT_RAW select BUILTIN_DTB
@@ -132,7 +133,7 @@ config MIPS_GENERIC_KERNEL select CPU_MIPSR2_IRQ_EI select CPU_MIPSR2_IRQ_VI select CSRC_R4K - select DMA_PERDEV_COHERENT + select DMA_NONCOHERENT select HAVE_PCI select IRQ_MIPS_CPU select MIPS_AUTO_PFN_OFFSET
arch/mips/mm/dma-noncoherent.c +1 -1
@@ -135,7 +135,7 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, }#endif -#ifdef CONFIG_DMA_PERDEV_COHERENT +#ifdef CONFIG_ARCH_HAS_SETUP_DMA_OPS void arch_setup_dma_ops (struct device *dev,u64 dma_base,u64 size,const struct iommu_ops *iommu,bool coherent) {
Signature · 6 lines
2.29.2 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Thomas Bogendoerfer
maintainerQuoted 10 lines · Christoph Hellwig
Hi Thomas,
this series cleans up some of the mips (maybe) noncoherent support. It also remove the need for the special <
asm/dma-coherence.h> header only provided by mips.Changes since v1:
- fix a bisection issue due to a missing brace
- simplify the parameter parsing given that it happens afterplat_mem_init
LGTM and passed all tests I did so far. I'll give it a few days for others to look at and apply it to mips-next for 5.12.
Thomas.
Signature · 6 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Thomas Bogendoerfer
maintainerQuoted 10 lines · Christoph Hellwig
Hi Thomas,
this series cleans up some of the mips (maybe) noncoherent support. It also remove the need for the special <
asm/dma-coherence.h> header only provided by mips.Changes since v1:
- fix a bisection issue due to a missing brace
- simplify the parameter parsing given that it happens afterplat_mem_init
series applied to mips-next.
Thomas.
Signature · 6 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ] _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu