From: Christoph Hellwig <hch@lst.de> To: Ralf Baechle <ralf@linux-mips.org>, James Hogan <jhogan@kernel.org> Cc: Florian Fainelli <f.fainelli@gmail.com>, David Daney <david.daney@cavium.com>, Kevin Cernekee <cernekee@gmail.com>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Tom Bogendoerfer <tsbogend@alpha.franken.de>, Huacai Chen <chenhc@lemote.com>, Paul Burton <paul.burton@mips.com>, iommu@lists.linux-foundation.org, linux-mips@linux-mips.org Subject: [PATCH 16/25] MIPS: move coherentio setup to setup.c Date: Fri, 15 Jun 2018 13:08:45 +0200 [thread overview] Message-ID: <20180615110854.19253-17-hch@lst.de> (raw) In-Reply-To: <20180615110854.19253-1-hch@lst.de> We want to be able to use it even when not building dma-default.c in the near future. Signed-off-by: Christoph Hellwig <hch@lst.de> --- arch/mips/kernel/setup.c | 24 ++++++++++++++++++++++++ arch/mips/mm/dma-default.c | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 2c96c0c68116..3d4524309b5c 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -36,6 +36,7 @@ #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> @@ -1055,3 +1056,26 @@ static int __init debugfs_mips(void) } arch_initcall(debugfs_mips); #endif + +#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT) +/* User defined DMA coherency from command line. */ +enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT; +EXPORT_SYMBOL_GPL(coherentio); +int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */ + +static int __init setcoherentio(char *str) +{ + coherentio = IO_COHERENCE_ENABLED; + pr_info("Hardware DMA cache coherency (command line)\n"); + return 0; +} +early_param("coherentio", setcoherentio); + +static int __init setnocoherentio(char *str) +{ + coherentio = IO_COHERENCE_DISABLED; + pr_info("Software DMA cache coherency (command line)\n"); + return 0; +} +early_param("nocoherentio", setnocoherentio); +#endif diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 2db6c2a6f964..10b56e8a2076 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c @@ -24,29 +24,6 @@ #include <dma-coherence.h> -#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT) -/* User defined DMA coherency from command line. */ -enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT; -EXPORT_SYMBOL_GPL(coherentio); -int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */ - -static int __init setcoherentio(char *str) -{ - coherentio = IO_COHERENCE_ENABLED; - pr_info("Hardware DMA cache coherency (command line)\n"); - return 0; -} -early_param("coherentio", setcoherentio); - -static int __init setnocoherentio(char *str) -{ - coherentio = IO_COHERENCE_DISABLED; - pr_info("Software DMA cache coherency (command line)\n"); - return 0; -} -early_param("nocoherentio", setnocoherentio); -#endif - static inline struct page *dma_addr_to_page(struct device *dev, dma_addr_t dma_addr) { -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Ralf Baechle <ralf-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org>, James Hogan <jhogan-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org, Tom Bogendoerfer <tsbogend-I1c7kopa9pxLokYuJOExCg@public.gmane.org>, David Daney <david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org>, Kevin Cernekee <cernekee-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, Jiaxun Yang <jiaxun.yang-nEvAom26CKtBDgjK7y7TUQ@public.gmane.org>, Paul Burton <paul.burton-8NJIiSa5LzA@public.gmane.org>, Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Huacai Chen <chenhc-h23VmSynlr/QT0dZR+AlfA@public.gmane.org> Subject: [PATCH 16/25] MIPS: move coherentio setup to setup.c Date: Fri, 15 Jun 2018 13:08:45 +0200 [thread overview] Message-ID: <20180615110854.19253-17-hch@lst.de> (raw) In-Reply-To: <20180615110854.19253-1-hch-jcswGhMUV9g@public.gmane.org> We want to be able to use it even when not building dma-default.c in the near future. Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- arch/mips/kernel/setup.c | 24 ++++++++++++++++++++++++ arch/mips/mm/dma-default.c | 23 ----------------------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 2c96c0c68116..3d4524309b5c 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -36,6 +36,7 @@ #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> @@ -1055,3 +1056,26 @@ static int __init debugfs_mips(void) } arch_initcall(debugfs_mips); #endif + +#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT) +/* User defined DMA coherency from command line. */ +enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT; +EXPORT_SYMBOL_GPL(coherentio); +int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */ + +static int __init setcoherentio(char *str) +{ + coherentio = IO_COHERENCE_ENABLED; + pr_info("Hardware DMA cache coherency (command line)\n"); + return 0; +} +early_param("coherentio", setcoherentio); + +static int __init setnocoherentio(char *str) +{ + coherentio = IO_COHERENCE_DISABLED; + pr_info("Software DMA cache coherency (command line)\n"); + return 0; +} +early_param("nocoherentio", setnocoherentio); +#endif diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c index 2db6c2a6f964..10b56e8a2076 100644 --- a/arch/mips/mm/dma-default.c +++ b/arch/mips/mm/dma-default.c @@ -24,29 +24,6 @@ #include <dma-coherence.h> -#if defined(CONFIG_DMA_MAYBE_COHERENT) && !defined(CONFIG_DMA_PERDEV_COHERENT) -/* User defined DMA coherency from command line. */ -enum coherent_io_user_state coherentio = IO_COHERENCE_DEFAULT; -EXPORT_SYMBOL_GPL(coherentio); -int hw_coherentio = 0; /* Actual hardware supported DMA coherency setting. */ - -static int __init setcoherentio(char *str) -{ - coherentio = IO_COHERENCE_ENABLED; - pr_info("Hardware DMA cache coherency (command line)\n"); - return 0; -} -early_param("coherentio", setcoherentio); - -static int __init setnocoherentio(char *str) -{ - coherentio = IO_COHERENCE_DISABLED; - pr_info("Software DMA cache coherency (command line)\n"); - return 0; -} -early_param("nocoherentio", setnocoherentio); -#endif - static inline struct page *dma_addr_to_page(struct device *dev, dma_addr_t dma_addr) { -- 2.17.1
next prev parent reply other threads:[~2018-06-15 11:16 UTC|newest] Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-06-15 11:08 switch mips to use the generic dma map ops v2 Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 01/25] MIPS: remove a dead ifdef from mach-ath25/dma-coherence.h Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 02/25] MIPS: simplify CONFIG_DMA_NONCOHERENT ifdefs Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 03/25] MIPS: remove CONFIG_DMA_COHERENT Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 04/25] MIPS: Octeon: unexport __phys_to_dma and __dma_to_phys Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 05/25] MIPS: Octeon: refactor swiotlb code Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 06/25] MIPS: loongson: remove loongson_dma_supported Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 07/25] MIPS: consolidate the swiotlb implementations Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 08/25] MIPS: remove the mips_dma_map_ops indirection Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 09/25] MIPS: make the default mips dma implementation optional Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 10/25] MIPS: Octeon: remove mips dma-default stubs Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 11/25] MIPS: Octeon: move swiotlb declarations out of dma-coherence.h Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 12/25] MIPS: loongson: untangle dma implementations Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 13/25] MIPS: loongson: remove loongson-3 handling from dma-coherence.h Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 14/25] MIPS: use dma_direct_ops for coherent I/O Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 15/25] MIPS: IP27: use dma_direct_ops Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig [this message] 2018-06-15 11:08 ` [PATCH 16/25] MIPS: move coherentio setup to setup.c Christoph Hellwig 2018-06-15 11:08 ` [PATCH 17/25] MIPS: use generic dma noncoherent ops for simple noncoherent platforms Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 18/25] MIPS: loongson64: use generic dma noncoherent ops Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-19 23:19 ` Paul Burton 2018-06-19 23:19 ` Paul Burton 2018-06-19 23:19 ` Paul Burton 2018-06-20 7:23 ` Christoph Hellwig 2018-06-20 7:23 ` Christoph Hellwig 2018-06-20 7:23 ` Christoph Hellwig 2018-07-10 12:35 ` Christoph Hellwig 2018-07-10 12:35 ` Christoph Hellwig 2018-07-10 18:02 ` Paul Burton 2018-07-10 18:02 ` Paul Burton 2018-06-15 11:08 ` [PATCH 19/25] MIPS: IP32: " Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 20/25] MIPS: ath25: " Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 21/25] MIPS: jazz: split dma mapping operations from dma-default Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-07-11 12:39 ` Tom Bogendoerfer 2018-06-15 11:08 ` [PATCH 22/25] dma-noncoherent: add a arch_sync_dma_for_cpu_all hook Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 23/25] MIPS: bmips: use generic dma noncoherent ops Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 24/25] MIPS: remove the old dma-default implementation Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig 2018-06-15 11:08 ` [PATCH 25/25] MIPS: remove unneeded includes from dma-mapping.h Christoph Hellwig 2018-06-15 11:08 ` Christoph Hellwig -- strict thread matches above, loose matches on Subject: below -- 2018-05-25 9:20 [RFC] switch mips to use the generic dma map ops Christoph Hellwig 2018-05-25 9:21 ` [PATCH 16/25] MIPS: move coherentio setup to setup.c Christoph Hellwig 2018-05-25 9:21 ` Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180615110854.19253-17-hch@lst.de \ --to=hch@lst.de \ --cc=cernekee@gmail.com \ --cc=chenhc@lemote.com \ --cc=david.daney@cavium.com \ --cc=f.fainelli@gmail.com \ --cc=iommu@lists.linux-foundation.org \ --cc=jhogan@kernel.org \ --cc=jiaxun.yang@flygoat.com \ --cc=linux-mips@linux-mips.org \ --cc=paul.burton@mips.com \ --cc=ralf@linux-mips.org \ --cc=tsbogend@alpha.franken.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.