Commit 7b513cf2 authored by Guo Ren's avatar Guo Ren
Browse files

csky: Fixup PTE global for 2.5:1.5 virtual memory 



Fixup commit c2d1adfa9a24 "csky: Add memory layout 2.5G(user):1.5G
(kernel)". That patch broke the global bit in PTE.

C-SKY TLB's entry contain two pages:
vpn, vpn + 1 -> ppn0, ppn1

All PPN's attributes contain global bit and final global is PPN0.G
& PPN1.G. So we must keep PPN0.G and PPN1.G same in one TLB's
entry.

Signed-off-by: default avatarGuo Ren <guoren@linux.alibaba.com>
parent 8e35ac73

arch/csky/include/asm/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 


#define pmd_page(pmd)	(pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT))

#define pte_clear(mm, addr, ptep)	set_pte((ptep), \

	(((unsigned int) addr & PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0)))

	(((unsigned int) addr >= PAGE_OFFSET) ? __pte(_PAGE_GLOBAL) : __pte(0)))

#define pte_none(pte)		(!(pte_val(pte) & ~_PAGE_GLOBAL))

#define pte_present(pte)	(pte_val(pte) & _PAGE_PRESENT)

#define pte_pfn(x)	((unsigned long)((x).pte_low >> PAGE_SHIFT))

arch/csky/mm/init.c

+7 −1
Original line number Diff line number Diff line
@@ -30,9 +30,12 @@ 
#include <asm/tlb.h>

#include <asm/cacheflush.h>



#define PTRS_KERN_TABLE \

		((PTRS_PER_PGD - USER_PTRS_PER_PGD) * PTRS_PER_PTE)



pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_bss;

pte_t invalid_pte_table[PTRS_PER_PTE] __page_aligned_bss;

pte_t kernel_pte_tables[(PTRS_PER_PGD - USER_PTRS_PER_PGD)*PTRS_PER_PTE] __page_aligned_bss;

pte_t kernel_pte_tables[PTRS_KERN_TABLE] __page_aligned_bss;



EXPORT_SYMBOL(invalid_pte_table);

unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
@@ -149,6 +152,9 @@ void __init mmu_init(unsigned long min_pfn, unsigned long max_pfn) 
		swapper_pg_dir[i].pgd =

			__pa(kernel_pte_tables + (PTRS_PER_PTE * (i - USER_PTRS_PER_PGD)));



	for (i = 0; i < PTRS_KERN_TABLE; i++)

		set_pte(&kernel_pte_tables[i], __pte(_PAGE_GLOBAL));



	for (i = min_pfn; i < max_pfn; i++)

		set_pte(&kernel_pte_tables[i - PFN_DOWN(va_pa_offset)], pfn_pte(i, PAGE_KERNEL));