All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roland Dreier <rdreier@cisco.com>
To: akpm@linux-foundation.org, tony.luck@intel.com
Cc: Jeff Garzik <jeff@garzik.org>, Al Viro <viro@ftp.linux.org.uk>,
	torvalds@linux-foundation.org, Tejun Heo <htejun@gmail.com>,
	Christoph Hellwig <hch@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Martin Schwidefsky <schwidefsky@de.ibm.com>,
	linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org
Subject: [PATCH] ia64: Fix noncoherent DMA API so devres builds
Date: Sun, 11 Feb 2007 21:30:21 -0800	[thread overview]
Message-ID: <adalkj49c42.fsf_-_@cisco.com> (raw)
In-Reply-To: <adamz3kbarc.fsf@cisco.com> (Roland Dreier's message of "Sun, 11 Feb 2007 14:16:39 -0800")

On ia64, drivers/base/dma-mapping.c doesn't build because it calls
dma_alloc_noncoherent() and dma_free_noncoherent(), which appear to be
terminally broken; the calls end up generating errors like

    drivers/base/dma-mapping.c: In function 'dmam_noncoherent_release':
    drivers/base/dma-mapping.c:32: error: 'struct ia64_machine_vector' has no member named 'platform_dma_free_coherent'

because the multiple levels of macro expansion in <asm/dma-mapping.h>
and <asm/machvec.h> end up turning a call to dma_free_noncoherent()
into ia64_mv.platform_dma_free_coherent (instead of the intended
ia64_mv.dma_free_coherent).

This patch fixes this by converting dma_{alloc,free}_noncoherent()
into inline functions that call the corresponding coherent functions,
instead of trying to do this with macros.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
---
 include/asm-ia64/dma-mapping.h |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index ebd5887..6299b51 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -8,9 +8,20 @@
 #include <asm/machvec.h>
 
 #define dma_alloc_coherent	platform_dma_alloc_coherent
-#define dma_alloc_noncoherent	platform_dma_alloc_coherent	/* coherent mem. is cheap */
+/* coherent mem. is cheap */
+static inline void *
+dma_alloc_noncoherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
+		      gfp_t flag)
+{
+	return dma_alloc_coherent(dev, size, dma_handle, flag);
+}
 #define dma_free_coherent	platform_dma_free_coherent
-#define dma_free_noncoherent	platform_dma_free_coherent
+static inline void
+dma_free_noncoherent(struct device *dev, size_t size, void *cpu_addr,
+		     dma_addr_t dma_handle)
+{
+	dma_free_coherent(dev, size, cpu_addr, dma_handle);
+}
 #define dma_map_single		platform_dma_map_single
 #define dma_map_sg		platform_dma_map_sg
 #define dma_unmap_single	platform_dma_unmap_single

  reply	other threads:[~2007-02-12  5:30 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-02-10 11:45 [patch] linux/io.h: forward declare struct pci_dev Heiko Carstens
2007-02-11  3:49 ` Christoph Hellwig
2007-02-11  6:26   ` Tejun Heo
2007-02-11  6:34     ` Al Viro
2007-02-11  6:46       ` Tejun Heo
2007-02-11  6:55       ` Randy Dunlap
2007-02-11  7:10       ` Christoph Hellwig
2007-02-11  8:21         ` Al Viro
2007-02-11 15:09       ` Jeff Garzik
2007-02-11 15:31       ` Heiko Carstens
2007-02-11 15:41         ` [PATCH] sort the devres mess out Al Viro
2007-02-11 15:49           ` Jeff Garzik
2007-02-11 22:16             ` Roland Dreier
2007-02-12  5:30               ` Roland Dreier [this message]
2007-02-12 21:06                 ` [PATCH] ia64: Fix noncoherent DMA API so devres builds Luck, Tony

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=adalkj49c42.fsf_-_@cisco.com \
    --to=rdreier@cisco.com \
    --cc=akpm@linux-foundation.org \
    --cc=hch@infradead.org \
    --cc=htejun@gmail.com \
    --cc=jeff@garzik.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-s390@vger.kernel.org \
    --cc=schwidefsky@de.ibm.com \
    --cc=tony.luck@intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@ftp.linux.org.uk \
    --subject='Re: [PATCH] ia64: Fix noncoherent DMA API so devres builds' \
    /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

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.