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 06/14] Alpha: adapt for dma_map_ops changes
Date: Tue, 27 Mar 2012 15:42:40 +0200 [thread overview]
Message-ID: <1332855768-32583-7-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 Alpha 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/alpha/include/asm/dma-mapping.h | 18 ++++++++++++------
arch/alpha/kernel/pci-noop.c | 10 ++++++----
arch/alpha/kernel/pci_iommu.c | 10 ++++++----
3 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
index 4567aca..dfa32f0 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,16 +12,22 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
#include <asm-generic/dma-mapping-common.h>
-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)
{
- return get_dma_ops(dev)->alloc_coherent(dev, size, dma_handle, gfp);
+ return get_dma_ops(dev)->alloc(dev, size, dma_handle, gfp, attrs);
}
-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)
{
- get_dma_ops(dev)->free_coherent(dev, size, vaddr, dma_handle);
+ get_dma_ops(dev)->free(dev, size, vaddr, dma_handle, attrs);
}
static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index 04eea48..df24b76 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -108,7 +108,8 @@ sys_pciconfig_write(unsigned long bus, unsigned long dfn,
}
static void *alpha_noop_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;
@@ -123,7 +124,8 @@ static void *alpha_noop_alloc_coherent(struct device *dev, size_t size,
}
static void alpha_noop_free_coherent(struct device *dev, size_t size,
- void *cpu_addr, dma_addr_t dma_addr)
+ void *cpu_addr, dma_addr_t dma_addr,
+ struct dma_attrs *attrs)
{
free_pages((unsigned long)cpu_addr, get_order(size));
}
@@ -174,8 +176,8 @@ static int alpha_noop_set_mask(struct device *dev, u64 mask)
}
struct dma_map_ops alpha_noop_ops = {
- .alloc_coherent = alpha_noop_alloc_coherent,
- .free_coherent = alpha_noop_free_coherent,
+ .alloc = alpha_noop_alloc_coherent,
+ .free = alpha_noop_free_coherent,
.map_page = alpha_noop_map_page,
.map_sg = alpha_noop_map_sg,
.mapping_error = alpha_noop_mapping_error,
diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index 4361080..cd63479 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -434,7 +434,8 @@ static void alpha_pci_unmap_page(struct device *dev, dma_addr_t dma_addr,
else DMA_ADDRP is undefined. */
static void *alpha_pci_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_addrp, gfp_t gfp)
+ dma_addr_t *dma_addrp, gfp_t gfp,
+ struct dma_attrs *attrs)
{
struct pci_dev *pdev = alpha_gendev_to_pci(dev);
void *cpu_addr;
@@ -478,7 +479,8 @@ try_again:
DMA_ADDR past this call are illegal. */
static void alpha_pci_free_coherent(struct device *dev, size_t size,
- void *cpu_addr, dma_addr_t dma_addr)
+ void *cpu_addr, dma_addr_t dma_addr,
+ struct dma_attrs *attrs)
{
struct pci_dev *pdev = alpha_gendev_to_pci(dev);
pci_unmap_single(pdev, dma_addr, size, PCI_DMA_BIDIRECTIONAL);
@@ -952,8 +954,8 @@ static int alpha_pci_set_mask(struct device *dev, u64 mask)
}
struct dma_map_ops alpha_pci_ops = {
- .alloc_coherent = alpha_pci_alloc_coherent,
- .free_coherent = alpha_pci_free_coherent,
+ .alloc = alpha_pci_alloc_coherent,
+ .free = alpha_pci_free_coherent,
.map_page = alpha_pci_map_page,
.unmap_page = alpha_pci_unmap_page,
.map_sg = alpha_pci_map_sg,
--
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 ` Marek Szyprowski [this message]
2012-03-27 15:56 ` [PATCHv2 06/14] Alpha: " Matt Turner
2012-03-27 13:42 ` [PATCHv2 07/14] SH: " Marek Szyprowski
2012-03-28 4:15 ` 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-7-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).