| Message ID | 50098f49877cea0f46730a9df82dcabf84160e4b.1597384512.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e426ab39f41045a4c163031272b2f48d944b69c0 |
| Headers | show |
| Series | [v2,1/4] powerpc: Remove flush_instruction_cache for book3s/32 | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (f04b169e953c4db1a3a3c1d23eea09c726f01ee5) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 29 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Fri, 14 Aug 2020 05:56:24 +0000 (UTC), Christophe Leroy wrote: > The only callers of flush_instruction_cache() are: > > arch/powerpc/kernel/swsusp_booke.S: bl flush_instruction_cache > arch/powerpc/mm/nohash/40x.c: flush_instruction_cache(); > arch/powerpc/mm/nohash/44x.c: flush_instruction_cache(); > arch/powerpc/mm/nohash/fsl_booke.c: flush_instruction_cache(); > arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); > arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); > > [...] Applied to powerpc/next. [1/4] powerpc: Remove flush_instruction_cache for book3s/32 https://git.kernel.org/powerpc/c/e426ab39f41045a4c163031272b2f48d944b69c0 [2/4] powerpc: Move flush_instruction_cache() prototype in asm/cacheflush.h https://git.kernel.org/powerpc/c/f663f3312051402d32952c44d156a20c0b854753 [3/4] powerpc: Rewrite 4xx flush_cache_instruction() in C https://git.kernel.org/powerpc/c/de39b19452e784de5f90ae899851ab29a29bb42c [4/4] powerpc: Rewrite FSL_BOOKE flush_cache_instruction() in C https://git.kernel.org/powerpc/c/704dfe931df951895dea98bd1d9cacbb601b6451 cheers
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index b24f866fef81..5c074c2ff5b5 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -271,9 +271,8 @@ _ASM_NOKPROBE_SYMBOL(real_writeb) /* * Flush instruction cache. - * This is a no-op on the 601. */ -#ifndef CONFIG_PPC_8xx +#if !defined(CONFIG_PPC_8xx) && !defined(CONFIG_PPC_BOOK3S_32) _GLOBAL(flush_instruction_cache) #if defined(CONFIG_4xx) lis r3, KERNELBASE@h @@ -290,18 +289,11 @@ _GLOBAL(flush_instruction_cache) mfspr r3,SPRN_L1CSR1 ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR mtspr SPRN_L1CSR1,r3 -#elif defined(CONFIG_PPC_BOOK3S_601) - blr /* for 601, do nothing */ -#else - /* 603/604 processor - use invalidate-all bit in HID0 */ - mfspr r3,SPRN_HID0 - ori r3,r3,HID0_ICFI - mtspr SPRN_HID0,r3 #endif /* CONFIG_4xx */ isync blr EXPORT_SYMBOL(flush_instruction_cache) -#endif /* CONFIG_PPC_8xx */ +#endif /* * Copy a whole page. We use the dcbz instruction on the destination
The only callers of flush_instruction_cache() are: arch/powerpc/kernel/swsusp_booke.S: bl flush_instruction_cache arch/powerpc/mm/nohash/40x.c: flush_instruction_cache(); arch/powerpc/mm/nohash/44x.c: flush_instruction_cache(); arch/powerpc/mm/nohash/fsl_booke.c: flush_instruction_cache(); arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); This function is not used by book3s/32, drop it. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/kernel/misc_32.S | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)