| Message ID | 20170914220513.9359-11-paul.burton@imgtec.com |
|---|---|
| State | Accepted |
| Commit | d1cbeafd5e5e43ec8869a6e5e0b6dd720e51252a |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Add asm-generic/io.h; virt_to_phys(), phys_to_virt() for all arches | expand |
Am 15.09.2017 um 00:05 schrieb Paul Burton: > Convert the mips architecture to make use of the new asm-generic/io.h to > provide address mapping functions. As mips actually performs > non-identity mapping between physical & virtual addresses we can't > simply make use of the generic functions, with the exception of being > able to drop our no-op unmap_physmem() and definitions of unused map > flags. > > Signed-off-by: Paul Burton <paul.burton@imgtec.com> > Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
On Thu, Sep 14, 2017 at 03:05:10PM -0700, Paul Burton wrote: > Convert the mips architecture to make use of the new asm-generic/io.h to > provide address mapping functions. As mips actually performs > non-identity mapping between physical & virtual addresses we can't > simply make use of the generic functions, with the exception of being > able to drop our no-op unmap_physmem() and definitions of unused map > flags. > > Signed-off-by: Paul Burton <paul.burton@imgtec.com> > Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> > Acked-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> Applied to u-boot/master, thanks!
diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index ee7a59290d..45d7ca0cc6 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -95,6 +95,7 @@ static inline unsigned long virt_to_phys(volatile const void *address) #endif return CPHYSADDR(addr); } +#define virt_to_phys virt_to_phys /* * phys_to_virt - map physical address to virtual @@ -112,6 +113,7 @@ static inline void *phys_to_virt(unsigned long address) { return (void *)(address + PAGE_OFFSET - PHYS_OFFSET); } +#define phys_to_virt phys_to_virt /* * ISA I/O bus memory addresses are 1:1 with the physical address. @@ -490,10 +492,7 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int */ #define sync() mmiowb() -#define MAP_NOCACHE (1) -#define MAP_WRCOMBINE (0) -#define MAP_WRBACK (0) -#define MAP_WRTHROUGH (0) +#define MAP_NOCACHE 1 static inline void * map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) @@ -503,13 +502,7 @@ map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) return (void *)CKSEG0ADDR(paddr); } - -/* - * Take down a mapping set up by map_physmem(). - */ -static inline void unmap_physmem(void *vaddr, unsigned long flags) -{ -} +#define map_physmem map_physmem #define __BUILD_CLRBITS(bwlq, sfx, end, type) \ \ @@ -566,4 +559,6 @@ BUILD_CLRSETBITS(q, le64, le64, u64) BUILD_CLRSETBITS(q, be64, be64, u64) BUILD_CLRSETBITS(q, 64, _, u64) +#include <asm-generic/io.h> + #endif /* _ASM_IO_H */
Convert the mips architecture to make use of the new asm-generic/io.h to provide address mapping functions. As mips actually performs non-identity mapping between physical & virtual addresses we can't simply make use of the generic functions, with the exception of being able to drop our no-op unmap_physmem() and definitions of unused map flags. Signed-off-by: Paul Burton <paul.burton@imgtec.com> Cc: Daniel Schwierzeck <daniel.schwierzeck@gmail.com> --- Changes in v2: None arch/mips/include/asm/io.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)