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

Commit 9cef7492 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: update_mmu_cache() consolidation. 



This splits out a separate __update_cache()/__update_tlb() for
update_mmu_cache() to wrap in to. This lets us share the common
__update_cache() bits while keeping special __update_tlb() handling
broken out.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 0dfae7d5

arch/sh/include/asm/pgtable.h

+13 −2
Original line number Original line Diff line number Diff line
@@ -134,8 +134,19 @@ typedef pte_t *pte_addr_t; 
#define pgtable_cache_init()	do { } while (0)

#define pgtable_cache_init()	do { } while (0)





struct vm_area_struct;

struct vm_area_struct;

extern void update_mmu_cache(struct vm_area_struct * vma,



extern void __update_cache(struct vm_area_struct *vma,

			   unsigned long address, pte_t pte);

extern void __update_tlb(struct vm_area_struct *vma,

			 unsigned long address, pte_t pte);

			 unsigned long address, pte_t pte);



static inline void

update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_t pte)

{

	__update_cache(vma, address, pte);

	__update_tlb(vma, address, pte);

}



extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

extern pgd_t swapper_pg_dir[PTRS_PER_PGD];

extern void paging_init(void);

extern void paging_init(void);

extern void page_table_range_init(unsigned long start, unsigned long end,

extern void page_table_range_init(unsigned long start, unsigned long end,

arch/sh/mm/pg-mmu.c

+21 −0
Original line number Original line Diff line number Diff line
@@ -134,3 +134,24 @@ void clear_user_highpage(struct page *page, unsigned long vaddr) 
	kunmap_atomic(kaddr, KM_USER0);

	kunmap_atomic(kaddr, KM_USER0);

}

}

EXPORT_SYMBOL(clear_user_highpage);

EXPORT_SYMBOL(clear_user_highpage);



void __update_cache(struct vm_area_struct *vma,

		    unsigned long address, pte_t pte)

{

	struct page *page;

	unsigned long pfn = pte_pfn(pte);



	if (!boot_cpu_data.dcache.n_aliases)

		return;



	page = pfn_to_page(pfn);

	if (pfn_valid(pfn) && page_mapping(page)) {

		int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);

		if (dirty) {

			unsigned long addr = (unsigned long)page_address(page);



			if (pages_do_alias(addr, address & PAGE_MASK))

				__flush_wback_region((void *)addr, PAGE_SIZE);

		}

	}

}

arch/sh/mm/tlb-nommu.c

+6 −3
Original line number Original line Diff line number Diff line
@@ -46,10 +46,13 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) 
	BUG();

	BUG();

}

}





void update_mmu_cache(struct vm_area_struct * vma,

void __update_tlb(struct vm_area_struct *vma, unsigned long address, pte_t pte)

{

}



void __update_cache(struct vm_area_struct *vma,

		    unsigned long address, pte_t pte)

		    unsigned long address, pte_t pte)

{

{

	BUG();

}

}





void __init page_table_range_init(unsigned long start, unsigned long end,

void __init page_table_range_init(unsigned long start, unsigned long end,

arch/sh/mm/tlb-pteaex.c

+6 −7
Original line number Original line Diff line number Diff line
@@ -16,15 +16,14 @@ 
#include <asm/mmu_context.h>

#include <asm/mmu_context.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>





void update_mmu_cache(struct vm_area_struct * vma,

void __update_tlb(struct vm_area_struct *vma, unsigned long address, pte_t pte)

		      unsigned long address, pte_t pte)

{

{

	unsigned long flags;

	unsigned long flags, pteval, vpn;

	unsigned long pteval;

	unsigned long vpn;





	/* Ptrace may call this routine. */

	/*

	if (vma && current->active_mm != vma->vm_mm)

	 * Handle debugger faulting in for debugee.

	 */

	if (current->active_mm != vma->vm_mm)

		return;

		return;





	local_irq_save(flags);

	local_irq_save(flags);

arch/sh/mm/tlb-sh3.c

+6 −23
Original line number Original line Diff line number Diff line
@@ -27,32 +27,16 @@ 
#include <asm/mmu_context.h>

#include <asm/mmu_context.h>

#include <asm/cacheflush.h>

#include <asm/cacheflush.h>





void update_mmu_cache(struct vm_area_struct * vma,

void __update_tlb(struct vm_area_struct *vma, unsigned long address, pte_t pte)

		      unsigned long address, pte_t pte)

{

{

	unsigned long flags;

	unsigned long flags, pteval, vpn;

	unsigned long pteval;

	unsigned long vpn;

	unsigned long pfn = pte_pfn(pte);

	struct page *page;





	/* Ptrace may call this routine. */

	/*

	if (vma && current->active_mm != vma->vm_mm)

	 * Handle debugger faulting in for debugee.

	 */

	if (current->active_mm != vma->vm_mm)

		return;

		return;





	page = pfn_to_page(pfn);

	if (pfn_valid(pfn) && page_mapping(page)) {

#if defined(CONFIG_SH7705_CACHE_32KB)

		int dirty = test_and_clear_bit(PG_dcache_dirty, &page->flags);

		if (dirty) {

			unsigned long addr = (unsigned long)page_address(page);



			if (pages_do_alias(addr, address & PAGE_MASK))

				__flush_wback_region((void *)addr, PAGE_SIZE);

		}

#endif

	}



	local_irq_save(flags);

	local_irq_save(flags);





	/* Set PTEH register */

	/* Set PTEH register */
@@ -93,4 +77,3 @@ void local_flush_tlb_one(unsigned long asid, unsigned long page) 
	for (i = 0; i < ways; i++)

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

		ctrl_outl(data, addr + (i << 8));

		ctrl_outl(data, addr + (i << 8));

}
 
}