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

Commit 270eec76 authored by Max Filippov's avatar Max Filippov
Browse files

xtensa: support highmem in aliasing cache flushing code 



Use __flush_invalidate_dcache_page_alias with alias set to color of the
page physical address instead of __flush_invalidate_dcache_page: this
works for high memory pages and mapping/unmapping to the TLBTEMP area is
virtually free.

Allow building configurations with aliasing cache and highmem enabled.

Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 8504b503

arch/xtensa/mm/cache.c

+6 −10
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ 
 *

 */



#if (DCACHE_WAY_SIZE > PAGE_SIZE) && defined(CONFIG_HIGHMEM)

#error "HIGHMEM is not supported on cores with aliasing cache."

#endif



#if (DCACHE_WAY_SIZE > PAGE_SIZE)

static inline void kmap_invalidate_coherent(struct page *page,

					    unsigned long vaddr)
@@ -166,7 +162,8 @@ void flush_dcache_page(struct page *page) 
		if (!alias && !mapping)

			return;



		__flush_invalidate_dcache_page((long)page_address(page));

		virt = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK);

		__flush_invalidate_dcache_page_alias(virt, phys);



		virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK);
@@ -231,13 +228,12 @@ update_mmu_cache(struct vm_area_struct * vma, unsigned long addr, pte_t *ptep) 
#if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK



	if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) {



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

		unsigned long phys = page_to_phys(page);

		unsigned long tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);



		__flush_invalidate_dcache_page(paddr);

		unsigned long tmp;



		tmp = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK);

		__flush_invalidate_dcache_page_alias(tmp, phys);

		tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK);

		__flush_invalidate_dcache_page_alias(tmp, phys);

		__invalidate_icache_page_alias(tmp, phys);