From: Marek Szyprowski <m.szyprowski@samsung.com>
To: linux-kernel@vger.kernel.org
Cc: linux-mips@linux-mips.org, Kevin Cernekee <cernekee@gmail.com>,
linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org,
linux-mm@kvack.org, sparclinux@vger.kernel.org,
Guan Xuetao <gxt@mprc.pku.edu.cn>,
Marek Szyprowski <m.szyprowski@samsung.com>,
linux-arch@vger.kernel.org,
Stephen Rothwell <sfr@canb.auug.org.au>,
Jonathan Corbet <corbet@lwn.net>,
x86@kernel.org, Matt Turner <mattst88@gmail.com>,
Dezhong Diao <dediao@cisco.com>,
Fenghua Yu <fenghua.yu@intel.com>, Arnd Bergmann <arnd@arndb.de>,
microblaze-uclinux@itee.uq.edu.au,
linaro-mm-sig@lists.linaro.org,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Andrzej Pietrasiewicz <andrzej.p@samsung.com>,
Thomas Gleixner <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
Richard Henderson <rth@twiddle.net>,
discuss@x86-64.org, Michal Simek <monstr@monstr.eu>,
Tony Luck <tony.luck@intel.com>,
Richard Kuo <rkuo@codeaurora.org>,
FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>,
Kyungmin Park <kyungmin.park@samsung.com>,
Paul Mundt <lethal@linux-sh.org>,
linux-alpha@vger.kernel.org,
Andrew Morton <akpm@linux-foundation.org>,
linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCHv2 07/14] SH: adapt for dma_map_ops changes
Date: Tue, 27 Mar 2012 15:42:41 +0200 [thread overview]
Message-ID: <1332855768-32583-8-git-send-email-m.szyprowski@samsung.com> (raw)
In-Reply-To: <1332855768-32583-1-git-send-email-m.szyprowski@samsung.com>
From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Adapt core SH architecture code for dma_map_ops changes: replace
alloc/free_coherent with generic alloc/free methods.
Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
---
arch/sh/include/asm/dma-mapping.h | 28 ++++++++++++++++++----------
arch/sh/kernel/dma-nommu.c | 4 ++--
arch/sh/mm/consistent.c | 6 ++++--
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/arch/sh/include/asm/dma-mapping.h b/arch/sh/include/asm/dma-mapping.h
index 1a73c3e..8bd965e 100644
--- a/arch/sh/include/asm/dma-mapping.h
+++ b/arch/sh/include/asm/dma-mapping.h
@@ -52,25 +52,31 @@ static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
return dma_addr == 0;
}
-static inline void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t gfp)
+#define dma_alloc_coherent(d,s,h,f) dma_alloc_attrs(d,s,h,f,NULL)
+
+static inline void *dma_alloc_attrs(struct device *dev, size_t size,
+ dma_addr_t *dma_handle, gfp_t gfp,
+ struct dma_attrs *attrs)
{
struct dma_map_ops *ops = get_dma_ops(dev);
void *memory;
if (dma_alloc_from_coherent(dev, size, dma_handle, &memory))
return memory;
- if (!ops->alloc_coherent)
+ if (!ops->alloc)
return NULL;
- memory = ops->alloc_coherent(dev, size, dma_handle, gfp);
+ memory = ops->alloc(dev, size, dma_handle, gfp, attrs);
debug_dma_alloc_coherent(dev, size, *dma_handle, memory);
return memory;
}
-static inline void dma_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle)
+#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
+
+static inline void dma_free_attrs(struct device *dev, size_t size,
+ void *vaddr, dma_addr_t dma_handle,
+ struct dma_attrs *attrs)
{
struct dma_map_ops *ops = get_dma_ops(dev);
@@ -78,14 +84,16 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
return;
debug_dma_free_coherent(dev, size, vaddr, dma_handle);
- if (ops->free_coherent)
- ops->free_coherent(dev, size, vaddr, dma_handle);
+ if (ops->free)
+ ops->free(dev, size, vaddr, dma_handle, attrs);
}
/* arch/sh/mm/consistent.c */
extern void *dma_generic_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_addr, gfp_t flag);
+ dma_addr_t *dma_addr, gfp_t flag,
+ struct dma_attrs *attrs);
extern void dma_generic_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle);
+ void *vaddr, dma_addr_t dma_handle,
+ struct dma_attrs *attrs);
#endif /* __ASM_SH_DMA_MAPPING_H */
diff --git a/arch/sh/kernel/dma-nommu.c b/arch/sh/kernel/dma-nommu.c
index 3c55b87..5b0bfcd 100644
--- a/arch/sh/kernel/dma-nommu.c
+++ b/arch/sh/kernel/dma-nommu.c
@@ -63,8 +63,8 @@ static void nommu_sync_sg(struct device *dev, struct scatterlist *sg,
#endif
struct dma_map_ops nommu_dma_ops = {
- .alloc_coherent = dma_generic_alloc_coherent,
- .free_coherent = dma_generic_free_coherent,
+ .alloc = dma_generic_alloc_coherent,
+ .free = dma_generic_free_coherent,
.map_page = nommu_map_page,
.map_sg = nommu_map_sg,
#ifdef CONFIG_DMA_NONCOHERENT
diff --git a/arch/sh/mm/consistent.c b/arch/sh/mm/consistent.c
index f251b5f..b81d9db 100644
--- a/arch/sh/mm/consistent.c
+++ b/arch/sh/mm/consistent.c
@@ -33,7 +33,8 @@ static int __init dma_init(void)
fs_initcall(dma_init);
void *dma_generic_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle, gfp_t gfp)
+ dma_addr_t *dma_handle, gfp_t gfp,
+ struct dma_attrs *attrs)
{
void *ret, *ret_nocache;
int order = get_order(size);
@@ -64,7 +65,8 @@ void *dma_generic_alloc_coherent(struct device *dev, size_t size,
}
void dma_generic_free_coherent(struct device *dev, size_t size,
- void *vaddr, dma_addr_t dma_handle)
+ void *vaddr, dma_addr_t dma_handle,
+ struct dma_attrs *attrs)
{
int order = get_order(size);
unsigned long pfn = dma_handle >> PAGE_SHIFT;
--
1.7.1.569.g6f426
next prev parent reply other threads:[~2012-03-27 13:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-27 13:42 [PATCHv2 00/14] DMA-mapping framework redesign preparation Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 01/14] common: dma-mapping: introduce alloc_attrs and free_attrs methods Marek Szyprowski
2012-03-28 11:29 ` Sergei Shtylyov
2012-03-28 14:38 ` Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 02/14] X86 & IA64: adapt for dma_map_ops changes Marek Szyprowski
2012-03-29 13:51 ` Thomas Gleixner
2012-03-27 13:42 ` [PATCHv2 03/14] MIPS: " Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 04/14] PowerPC: " Marek Szyprowski
2012-03-28 3:56 ` Benjamin Herrenschmidt
2012-03-27 13:42 ` [PATCHv2 05/14] SPARC: " Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 06/14] Alpha: " Marek Szyprowski
2012-03-27 15:56 ` Matt Turner
2012-03-27 13:42 ` Marek Szyprowski [this message]
2012-03-28 4:15 ` [PATCHv2 07/14] SH: " Paul Mundt
2012-03-27 13:42 ` [PATCHv2 08/14] Microblaze: " Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 09/14] Unicore32: " Marek Szyprowski
2012-03-28 2:22 ` Guan Xuetao
2012-03-28 6:10 ` Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 10/14] Hexagon: " Marek Szyprowski
2012-03-27 16:41 ` Richard Kuo
2012-03-27 13:42 ` [PATCHv2 11/14] common: dma-mapping: remove old alloc_coherent and free_coherent methods Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 12/14] common: dma-mapping: introduce mmap method Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 13/14] common: DMA-mapping: add WRITE_COMBINE attribute Marek Szyprowski
2012-03-27 13:42 ` [PATCHv2 14/14] common: DMA-mapping: add NON-CONSISTENT attribute Marek Szyprowski
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=1332855768-32583-8-git-send-email-m.szyprowski@samsung.com \
--to=m.szyprowski@samsung.com \
--cc=akpm@linux-foundation.org \
--cc=andrzej.p@samsung.com \
--cc=arnd@arndb.de \
--cc=cernekee@gmail.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=dediao@cisco.com \
--cc=discuss@x86-64.org \
--cc=fenghua.yu@intel.com \
--cc=fujita.tomonori@lab.ntt.co.jp \
--cc=gxt@mprc.pku.edu.cn \
--cc=ink@jurassic.park.msu.ru \
--cc=kyungmin.park@samsung.com \
--cc=lethal@linux-sh.org \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mm@kvack.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mattst88@gmail.com \
--cc=microblaze-uclinux@itee.uq.edu.au \
--cc=monstr@monstr.eu \
--cc=rkuo@codeaurora.org \
--cc=rth@twiddle.net \
--cc=sfr@canb.auug.org.au \
--cc=sparclinux@vger.kernel.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=x86@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).