Commit e618c7ae authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/mem: Call flush_coherent_icache() at higher level 



flush_coherent_icache() doesn't need the address anymore,
so it can be called immediately when entering the public
functions and doesn't need to be disseminated among
lower level functions.

And use page_to_phys() instead of open coding the calculation
of phys address to call flush_dcache_icache_phys().

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5f063986e325d2efdd404b8f8c5f4bcbd4eb11a6.1617895813.git.christophe.leroy@csgroup.eu
parent 131637a1

arch/powerpc/mm/cacheflush.c

+3 −8
Original line number Diff line number Diff line
@@ -143,9 +143,6 @@ static void __flush_dcache_icache(void *p) 
{

	unsigned long addr = (unsigned long)p;



	if (flush_coherent_icache())

		return;



	clean_dcache_range(addr, addr + PAGE_SIZE);



	/*
@@ -182,6 +179,8 @@ static void flush_dcache_icache_hugepage(struct page *page) 


void flush_dcache_icache_page(struct page *page)

{

	if (flush_coherent_icache())

		return;



	if (PageCompound(page))

		return flush_dcache_icache_hugepage(page);
@@ -195,11 +194,7 @@ void flush_dcache_icache_page(struct page *page) 
		__flush_dcache_icache(start);

		kunmap_atomic(start);

	} else {

		unsigned long addr = page_to_pfn(page) << PAGE_SHIFT;



		if (flush_coherent_icache())

			return;

		flush_dcache_icache_phys(addr);

		flush_dcache_icache_phys(page_to_phys(page));

	}

#endif

}