hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

csky: bugfix tlb_get_pgd error. 

It's wrong to mask/unmask highest bit in addr to translate the vaddr
to paddr. We should use PAGE_OFFSET and PHYS_OFFSET.

Wrong implement:
  return ((get_pgd()|(1<<31)) - PHYS_OFFSET) & ~1;

When PHYS_OFFSET=0xc0000000 and get_pgd() return 0xe0000000, it'll
return 0x60000000. It's wrong and should be 0xa0000000.

Now correct it to:
  return ((get_pgd() - PHYS_OFFSET) & ~1) + PAGE_OFFSET;

Signed-off-by: Guo Ren <ren_guo@c-sky.com>
This commit is contained in:
Guo Ren 2018-11-20 16:06:57 +08:00
parent b4b84da364
commit 63e19c8216
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/csky/include/asm/mmu_context.h
View File

@ -16,7 +16,7 @@
static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel) static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel)
{ {
pgd &= ~(1<<31); pgd -= PAGE_OFFSET;
pgd += PHYS_OFFSET; pgd += PHYS_OFFSET;
pgd |= 1; pgd |= 1;
setup_pgd(pgd, kernel); setup_pgd(pgd, kernel);
@ -29,7 +29,7 @@ static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel)
static inline unsigned long tlb_get_pgd(void) static inline unsigned long tlb_get_pgd(void)
{ {
return ((get_pgd()|(1<<31)) - PHYS_OFFSET) & ~1; return ((get_pgd() - PHYS_OFFSET) & ~1) + PAGE_OFFSET;
} }
#define cpu_context(cpu, mm) ((mm)->context.asid[cpu]) #define cpu_context(cpu, mm) ((mm)->context.asid[cpu])