LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nios2: fix map_physmem to do real cache mapping 

Fix the map_physmem() to do real cache mapping.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Marek Vasut <marex@denx.de>
This commit is contained in:
Thomas Chou 2015-10-27 08:30:22 +08:00
parent ed02c532be
commit 1ce61cbbe7
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/nios2/cpu/cpu.c
View File

@ -117,7 +117,8 @@ static int altera_nios2_probe(struct udevice *dev)
"altr,has-initda", 0); "altr,has-initda", 0);
gd->arch.has_mmu = fdtdec_get_int(blob, node, gd->arch.has_mmu = fdtdec_get_int(blob, node,
"altr,has-mmu", 0); "altr,has-mmu", 0);
gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x8000000; gd->arch.io_region_base = gd->arch.has_mmu ? 0xe0000000 : 0x80000000;
gd->arch.mem_region_base = gd->arch.has_mmu ? 0xc0000000 : 0x00000000;
return 0; return 0;
} }

1
arch/nios2/include/asm/global_data.h
View File

@ -18,6 +18,7 @@ struct arch_global_data {
int has_initda; int has_initda;
int has_mmu; int has_mmu;
u32 io_region_base; u32 io_region_base;
u32 mem_region_base;
}; };
#include <asm-generic/global_data.h> #include <asm-generic/global_data.h>

8
arch/nios2/include/asm/io.h
View File

@ -18,7 +18,7 @@ static inline void sync(void)
* that can be used to access the memory range with the caching * that can be used to access the memory range with the caching
* properties specified by "flags". * properties specified by "flags".
*/ */
#define MAP_NOCACHE (0) #define MAP_NOCACHE (1)
#define MAP_WRCOMBINE (0) #define MAP_WRCOMBINE (0)
#define MAP_WRBACK (0) #define MAP_WRBACK (0)
#define MAP_WRTHROUGH (0) #define MAP_WRTHROUGH (0)
@ -26,7 +26,11 @@ static inline void sync(void)
static inline void * static inline void *
map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags) map_physmem(phys_addr_t paddr, unsigned long len, unsigned long flags)
{ {
return (void *)paddr; DECLARE_GLOBAL_DATA_PTR;
if (flags)
return (void *)(paddr | gd->arch.io_region_base);
else
return (void *)(paddr | gd->arch.mem_region_base);
} }
/* /*