From: leizhen <thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> To: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> Cc: arnd-r2nGTMty4D4@public.gmane.org, stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org, catalin.marinas-5wv7dgnIgG8@public.gmane.org, will.deacon-5wv7dgnIgG8@public.gmane.org, linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org, josephl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org, yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org Subject: Re: [RFC PATCH v2 3/3] arm64: hook up IOMMU dma_ops Date: Tue, 3 Mar 2015 19:05:09 +0800 [thread overview] Message-ID: <54F59565.7000807@huawei.com> (raw) In-Reply-To: <482b3b109a3d4818b1b1e693f488a919cf1bb707.1423226542.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> On 2015/2/6 22:55, Robin Murphy wrote: > With iommu_dma_ops in place, hook them up to the configuration code, so > IOMMU-fronted devices will get them automatically. > > Signed-off-by: Robin Murphy <robin.murphy-5wv7dgnIgG8@public.gmane.org> > --- > arch/arm64/Kconfig | 1 + > arch/arm64/include/asm/dma-mapping.h | 11 ++++++----- > arch/arm64/mm/dma-mapping.c | 15 +++++++++++++++ > 3 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index b1f9a20..e2abcdc 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -66,6 +66,7 @@ config ARM64 > select HAVE_PERF_USER_STACK_DUMP > select HAVE_RCU_TABLE_FREE > select HAVE_SYSCALL_TRACEPOINTS > + select IOMMU_DMA if IOMMU_SUPPORT IOMMU_SUPPORT is selected above, so "if IOMMU_SUPPORT" can be omitted. And I suggest putting "select IOMMU_DMA" next to "select IOMMU_SUPPORT". > select IRQ_DOMAIN > select MODULES_USE_ELF_RELA > select NO_BOOTMEM > diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h > index c1b271f..5246d1a 100644 > --- a/arch/arm64/include/asm/dma-mapping.h > +++ b/arch/arm64/include/asm/dma-mapping.h > @@ -45,11 +45,8 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) > return __generic_dma_ops(dev); > } > > -static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > - struct iommu_ops *iommu, bool coherent) > -{ > - dev->archdata.dma_coherent = coherent; > -} > +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > + struct iommu_ops *iommu, bool coherent); > #define arch_setup_dma_ops arch_setup_dma_ops > > /* do not use this function in a driver */ > @@ -63,6 +60,10 @@ static inline bool is_device_dma_coherent(struct device *dev) > #include <asm-generic/dma-mapping-common.h> > > #ifdef CONFIG_IOMMU_DMA > + > +void arch_teardown_dma_ops(struct device *dev); > +#define arch_teardown_dma_ops arch_teardown_dma_ops > + > static inline struct iommu_dma_domain *get_dma_domain(struct device *dev) > { > return dev->archdata.dma_domain; > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > index 28e771c..2a30673 100644 > --- a/arch/arm64/mm/dma-mapping.c > +++ b/arch/arm64/mm/dma-mapping.c > @@ -752,6 +752,14 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > iommu_dma_release_domain(dma_domain); > } > > +void arch_teardown_dma_ops(struct device *dev) > +{ > + if (dev->archdata.dma_domain) { > + iommu_dma_detach_device(dev); > + dev->archdata.dma_ops = NULL; > + } > +} > + > #else > > static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > @@ -759,3 +767,10 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > { } > > #endif /* CONFIG_IOMMU_DMA */ > + > +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > + struct iommu_ops *iommu, bool coherent) > +{ > + dev->archdata.dma_coherent = coherent; > + __iommu_setup_dma_ops(dev, dma_base, size, iommu); > +} >
WARNING: multiple messages have this Message-ID (diff)
From: thunder.leizhen@huawei.com (leizhen) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH v2 3/3] arm64: hook up IOMMU dma_ops Date: Tue, 3 Mar 2015 19:05:09 +0800 [thread overview] Message-ID: <54F59565.7000807@huawei.com> (raw) In-Reply-To: <482b3b109a3d4818b1b1e693f488a919cf1bb707.1423226542.git.robin.murphy@arm.com> On 2015/2/6 22:55, Robin Murphy wrote: > With iommu_dma_ops in place, hook them up to the configuration code, so > IOMMU-fronted devices will get them automatically. > > Signed-off-by: Robin Murphy <robin.murphy@arm.com> > --- > arch/arm64/Kconfig | 1 + > arch/arm64/include/asm/dma-mapping.h | 11 ++++++----- > arch/arm64/mm/dma-mapping.c | 15 +++++++++++++++ > 3 files changed, 22 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig > index b1f9a20..e2abcdc 100644 > --- a/arch/arm64/Kconfig > +++ b/arch/arm64/Kconfig > @@ -66,6 +66,7 @@ config ARM64 > select HAVE_PERF_USER_STACK_DUMP > select HAVE_RCU_TABLE_FREE > select HAVE_SYSCALL_TRACEPOINTS > + select IOMMU_DMA if IOMMU_SUPPORT IOMMU_SUPPORT is selected above, so "if IOMMU_SUPPORT" can be omitted. And I suggest putting "select IOMMU_DMA" next to "select IOMMU_SUPPORT". > select IRQ_DOMAIN > select MODULES_USE_ELF_RELA > select NO_BOOTMEM > diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h > index c1b271f..5246d1a 100644 > --- a/arch/arm64/include/asm/dma-mapping.h > +++ b/arch/arm64/include/asm/dma-mapping.h > @@ -45,11 +45,8 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev) > return __generic_dma_ops(dev); > } > > -static inline void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > - struct iommu_ops *iommu, bool coherent) > -{ > - dev->archdata.dma_coherent = coherent; > -} > +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > + struct iommu_ops *iommu, bool coherent); > #define arch_setup_dma_ops arch_setup_dma_ops > > /* do not use this function in a driver */ > @@ -63,6 +60,10 @@ static inline bool is_device_dma_coherent(struct device *dev) > #include <asm-generic/dma-mapping-common.h> > > #ifdef CONFIG_IOMMU_DMA > + > +void arch_teardown_dma_ops(struct device *dev); > +#define arch_teardown_dma_ops arch_teardown_dma_ops > + > static inline struct iommu_dma_domain *get_dma_domain(struct device *dev) > { > return dev->archdata.dma_domain; > diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c > index 28e771c..2a30673 100644 > --- a/arch/arm64/mm/dma-mapping.c > +++ b/arch/arm64/mm/dma-mapping.c > @@ -752,6 +752,14 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > iommu_dma_release_domain(dma_domain); > } > > +void arch_teardown_dma_ops(struct device *dev) > +{ > + if (dev->archdata.dma_domain) { > + iommu_dma_detach_device(dev); > + dev->archdata.dma_ops = NULL; > + } > +} > + > #else > > static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > @@ -759,3 +767,10 @@ static void __iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > { } > > #endif /* CONFIG_IOMMU_DMA */ > + > +void arch_setup_dma_ops(struct device *dev, u64 dma_base, u64 size, > + struct iommu_ops *iommu, bool coherent) > +{ > + dev->archdata.dma_coherent = coherent; > + __iommu_setup_dma_ops(dev, dma_base, size, iommu); > +} >
next prev parent reply other threads:[~2015-03-03 11:05 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-02-06 14:55 [RFC PATCH v2 0/3] arm64: IOMMU-backed DMA mapping Robin Murphy 2015-02-06 14:55 ` Robin Murphy [not found] ` <cover.1423226542.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2015-02-06 14:55 ` [RFC PATCH v2 1/3] iommu: implement common IOMMU ops for " Robin Murphy 2015-02-06 14:55 ` Robin Murphy [not found] ` <da0e905ae94f2fca241a47b2a20e078255e45a81.1423226542.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2015-02-09 4:05 ` Will Deacon 2015-02-09 4:05 ` Will Deacon [not found] ` <20150209040539.GE13969-5wv7dgnIgG8@public.gmane.org> 2015-02-10 15:11 ` Robin Murphy 2015-02-10 15:11 ` Robin Murphy 2015-03-12 12:45 ` Marek Szyprowski 2015-03-12 12:45 ` Marek Szyprowski 2015-02-06 14:55 ` [RFC PATCH v2 2/3] arm64: add IOMMU dma_ops Robin Murphy 2015-02-06 14:55 ` Robin Murphy [not found] ` <058e038009ac708a40197c80e07410914c2a162e.1423226542.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2015-02-09 6:02 ` Will Deacon 2015-02-09 6:02 ` Will Deacon [not found] ` <20150209060224.GG13969-5wv7dgnIgG8@public.gmane.org> 2015-02-10 15:40 ` Robin Murphy 2015-02-10 15:40 ` Robin Murphy 2015-02-10 4:39 ` Yingjoe Chen 2015-02-10 4:39 ` Yingjoe Chen 2015-02-10 12:07 ` Robin Murphy 2015-02-10 12:07 ` Robin Murphy [not found] ` <54D9F486.10501-5wv7dgnIgG8@public.gmane.org> 2015-02-14 8:03 ` Yong Wu 2015-02-14 8:03 ` Yong Wu 2015-02-16 20:04 ` Robin Murphy 2015-02-16 20:04 ` Robin Murphy 2015-03-03 3:38 ` Yong Wu 2015-03-03 3:38 ` Yong Wu 2015-03-03 12:15 ` Robin Murphy 2015-03-03 12:15 ` Robin Murphy [not found] ` <54F5A5FE.3040506-5wv7dgnIgG8@public.gmane.org> 2015-03-05 0:19 ` Laura Abbott 2015-03-05 0:19 ` Laura Abbott [not found] ` <54F7A121.3050103-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> 2015-03-05 11:16 ` Robin Murphy 2015-03-05 11:16 ` Robin Murphy 2015-03-09 17:59 ` Russell King - ARM Linux 2015-03-09 17:59 ` Russell King - ARM Linux [not found] ` <20150309175904.GC8656-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2015-03-09 20:09 ` Robin Murphy 2015-03-09 20:09 ` Robin Murphy [not found] ` <54FDFE0D.8030807-5wv7dgnIgG8@public.gmane.org> 2015-03-10 10:16 ` Robin Murphy 2015-03-10 10:16 ` Robin Murphy 2015-03-12 12:50 ` Marek Szyprowski 2015-03-12 12:50 ` Marek Szyprowski 2015-02-06 14:55 ` [RFC PATCH v2 3/3] arm64: hook up " Robin Murphy 2015-02-06 14:55 ` Robin Murphy [not found] ` <482b3b109a3d4818b1b1e693f488a919cf1bb707.1423226542.git.robin.murphy-5wv7dgnIgG8@public.gmane.org> 2015-03-03 11:05 ` leizhen [this message] 2015-03-03 11:05 ` leizhen [not found] ` <54F59565.7000807-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> 2015-03-03 13:10 ` Robin Murphy 2015-03-03 13:10 ` Robin Murphy
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=54F59565.7000807@huawei.com \ --to=thunder.leizhen-hv44wf8li93qt0dzr+alfa@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=catalin.marinas-5wv7dgnIgG8@public.gmane.org \ --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \ --cc=josephl-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \ --cc=robin.murphy-5wv7dgnIgG8@public.gmane.org \ --cc=stefano.stabellini-mvvWK6WmYclDPfheJLI6IQ@public.gmane.org \ --cc=will.deacon-5wv7dgnIgG8@public.gmane.org \ --cc=yingjoe.chen-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \ --cc=yong.wu-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org \ /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.