Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 63e19c82 authored by Guo Ren's avatar Guo Ren
Browse files

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: default avatarGuo Ren <ren_guo@c-sky.com>
parent b4b84da3

arch/csky/include/asm/mmu_context.h

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


static inline void tlbmiss_handler_setup_pgd(unsigned long pgd, bool kernel)

{

	pgd &= ~(1<<31);

	pgd -= PAGE_OFFSET;

	pgd += PHYS_OFFSET;

	pgd |= 1;

	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)

{

	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])