diff mbox

[U-Boot,11/27] x86: Use asm-generic/io.h

Message ID 20161001141931.32354-12-paul.burton@imgtec.com
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

Paul Burton Oct. 1, 2016, 2:19 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>
---

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

Comments

Simon Glass Oct. 3, 2016, 9:49 p.m. UTC | #1 
On 1 October 2016 at 08:19, Paul Burton <paul.burton@imgtec.com> 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>
> ---
>
>  arch/x86/include/asm/io.h | 31 ++-----------------------------
>  1 file changed, 2 insertions(+), 29 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox

Patch

diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 3156781..6f29a73 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -289,35 +289,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.
  */
@@ -325,4 +296,6 @@  static inline phys_addr_t virt_to_phys(void * vaddr)
 #define __iormb()	dmb()
 #define __iowmb()	dmb()
 
+#include <asm-generic/io.h>
+
 #endif