diff mbox series

[U-Boot,v2,08/13] x86: Use asm-generic/io.h

Message ID 20170914220513.9359-9-paul.burton@imgtec.com
State Accepted
Delegated to: Tom Rini
Headers show
Series Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches | expand

Commit Message

Paul Burton Sept. 14, 2017, 10:05 p.m. UTC 
Convert the x86 architecture to make use of the new asm-generic/io.h to
provide address mapping functions. As the generic implementations are
suitable for x86 this is primarily a matter of moving code.

This has only been build-tested, feedback from architecture maintainers
is welcome.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

Changes in v2: None

 arch/x86/include/asm/io.h | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

Comments

Tom Rini Oct. 3, 2017, 12:52 p.m. UTC | #1 
On Thu, Sep 14, 2017 at 03:05:08PM -0700, Paul Burton wrote:

> Convert the x86 architecture to make use of the new asm-generic/io.h to
> provide address mapping functions. As the generic implementations are
> suitable for x86 this is primarily a matter of moving code.
> 
> This has only been build-tested, feedback from architecture maintainers
> is welcome.
> 
> Signed-off-by: Paul Burton <paul.burton@imgtec.com>
> Cc: Simon Glass <sjg@chromium.org>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index a72daf2263..263dd8fd17 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -230,35 +230,6 @@  static inline void sync(void)
 {
 }
 
-/*
- * Given a physical address and a length, return a virtual address
- * that can be used to access the memory range with the caching
- * properties specified by "flags".
- */
-#define MAP_NOCACHE	(0)
-#define MAP_WRCOMBINE	(0)
-#define MAP_WRBACK	(0)
-#define MAP_WRTHROUGH	(0)
-
-static inline void *
-map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
-{
-	return (void *)(uintptr_t)paddr;
-}
-
-/*
- * Take down a mapping set up by map_physmem().
- */
-static inline void unmap_physmem(void *vaddr, unsigned long flags)
-{
-
-}
-
-static inline phys_addr_t virt_to_phys(void * vaddr)
-{
-	return (phys_addr_t)(uintptr_t)(vaddr);
-}
-
 /*
  * TODO: The kernel offers some more advanced versions of barriers, it might
  * have some advantages to use them instead of the simple one here.
@@ -267,4 +238,6 @@  static inline phys_addr_t virt_to_phys(void * vaddr)
 #define __iormb()	dmb()
 #define __iowmb()	dmb()
 
+#include <asm-generic/io.h>
+
 #endif /* _ASM_IO_H */