xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Rewrite 4xx flush_cache_instruction() in C

Browse Source 
Nothing prevents flush_cache_instruction() from being writen in C.

Do it to improve readability and maintainability.

This function is very small and isn't called from assembly,
make it static inline in asm/cacheflush.h

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/93d93fc69b4b3ad3ceba2fc0756333c0c0245bb7.1597384512.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy
2020-08-14 05:56:26 +00:00
committed by Michael Ellerman
parent f663f33120
commit de39b19452
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
arch/powerpc/include/asm/cacheflush.h
View File

@@ -98,7 +98,15 @@ static inline void invalidate_dcache_range(unsigned long start,
mb(); /* sync */ mb(); /* sync */
} }
#ifdef CONFIG_4xx
static inline void flush_instruction_cache(void)
{
iccci((void *)KERNELBASE);
isync();
}
#else
void flush_instruction_cache(void); void flush_instruction_cache(void);
#endif
#include <asm-generic/cacheflush.h> #include <asm-generic/cacheflush.h>

7
arch/powerpc/kernel/misc_32.S
View File

@@ -259,12 +259,8 @@ _ASM_NOKPROBE_SYMBOL(real_writeb)
/* /*
* Flush instruction cache. * Flush instruction cache.
*/ */
#if !defined(CONFIG_PPC_8xx) && !defined(CONFIG_PPC_BOOK3S_32) #ifdef CONFIG_FSL_BOOKE
_GLOBAL(flush_instruction_cache) _GLOBAL(flush_instruction_cache)
#if defined(CONFIG_4xx)
lis r3, KERNELBASE@h
iccci 0,r3
#elif defined(CONFIG_FSL_BOOKE)
#ifdef CONFIG_E200 #ifdef CONFIG_E200
mfspr r3,SPRN_L1CSR0 mfspr r3,SPRN_L1CSR0
ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC ori r3,r3,L1CSR0_CFI|L1CSR0_CLFC
@@ -276,7 +272,6 @@ _GLOBAL(flush_instruction_cache)
mfspr r3,SPRN_L1CSR1 mfspr r3,SPRN_L1CSR1
ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR
mtspr SPRN_L1CSR1,r3 mtspr SPRN_L1CSR1,r3
#endif /* CONFIG_4xx */
isync isync
blr blr
EXPORT_SYMBOL(flush_instruction_cache) EXPORT_SYMBOL(flush_instruction_cache)