openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/5f063986e325d2efdd404b8f8c5f4bcbd4eb11a6.1617895813.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2021-04-08 15:30:28 +00:00 committed by Michael Ellerman
parent 131637a17d
commit e618c7aea1
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/powerpc/mm/cacheflush.c
View File

@ -143,9 +143,6 @@ static void __flush_dcache_icache(void *p)
{ {
unsigned long addr = (unsigned long)p; unsigned long addr = (unsigned long)p;
if (flush_coherent_icache())
return;
clean_dcache_range(addr, addr + PAGE_SIZE); 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) void flush_dcache_icache_page(struct page *page)
{ {
if (flush_coherent_icache())
return;
if (PageCompound(page)) if (PageCompound(page))
return flush_dcache_icache_hugepage(page); return flush_dcache_icache_hugepage(page);
@ -195,11 +194,7 @@ void flush_dcache_icache_page(struct page *page)
__flush_dcache_icache(start); __flush_dcache_icache(start);
kunmap_atomic(start); kunmap_atomic(start);
} else { } else {
unsigned long addr = page_to_pfn(page) << PAGE_SHIFT; flush_dcache_icache_phys(page_to_phys(page));
if (flush_coherent_icache())
return;
flush_dcache_icache_phys(addr);
} }
#endif #endif
} }