[PATCH 1/2] asm-generic: add MMU variants of io.h functions

* [PATCH 1/2] asm-generic: add MMU variants of io.h functions
@ 2011-07-02 15:53 Jonas Bonn
  2011-07-02 15:53 ` [PATCH 2/2] iomap: make IOPORT/PCI mapping functions conditional Jonas Bonn
  2011-07-02 16:38 ` [PATCH 1/2] asm-generic: add MMU variants of io.h functions Mike Frysinger
  0 siblings, 2 replies; 12+ messages in thread
From: Jonas Bonn @ 2011-07-02 15:53 UTC (permalink / raw)
  To: linux-kernel, linux-arch; +Cc: Jonas Bonn, vapier, liqin.chen, gxt


Some of the implementations, in particular the ioremap variants, in
asm-generic/io.h are for systems with an MMU.  In order to be able to
use the generic header file for systems with an MMU, this patch wraps
these implementations in checks for CONFIG_MMU.

Tested on OpenRISC.

Signed-off-by: Jonas Bonn <jonas@southpole.se>
Cc: vapier@gentoo.org
Cc: liqin.chen@sunplusct.com
Cc: gxt@mprc.pku.edu.cn
---

I'm not totally certain that this doesn't have implications for the
other architectures, in particular Score which seems to have an MMU yet
uses these ioremap functions anyway...  Comments on this would be
appreciated.

Thanks,
Jonas

 include/asm-generic/io.h |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h
index e0ffa3d..50f4f43 100644
--- a/include/asm-generic/io.h
+++ b/include/asm-generic/io.h
@@ -307,7 +307,11 @@ static inline void *phys_to_virt(unsigned long address)
 
 /*
  * Change "struct page" to physical address.
+ *
+ * This implementation is for the no-MMU case only... if you have an MMU
+ * you'll need to provide your own definitions.
  */
+#ifndef CONFIG_MMU
 static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 {
 	return (void __iomem*) (unsigned long)offset;
@@ -326,6 +330,7 @@ static inline void __iomem *ioremap(phys_addr_t offset, unsigned long size)
 static inline void iounmap(void *addr)
 {
 }
+#endif /* CONFIG_MMU */
 
 #ifndef CONFIG_GENERIC_IOMAP
 static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
@@ -342,7 +347,12 @@ extern void ioport_unmap(void __iomem *p);
 #endif /* CONFIG_GENERIC_IOMAP */
 
 #define xlate_dev_kmem_ptr(p)	p
+
+#ifdef CONFIG_MMU
+#define xlate_dev_mem_ptr(p)	__va(p)
+#else
 #define xlate_dev_mem_ptr(p)	((void *) (p))
+#endif
 
 #ifndef virt_to_bus
 static inline unsigned long virt_to_bus(volatile void *address)
-- 
1.7.4.1


^ permalink raw reply related	[flat|nested] 12+ messages in thread