leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/8xx: Simplify INVALIDATE_ADJACENT_PAGES_CPU15

Browse Source 
We now have r11 available as a scratch register so
INVALIDATE_ADJACENT_PAGES_CPU15() can be simplified.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/bdafd651b4ac3a851fd09249f5f3699c50da29f2.1606231483.git.christophe.leroy@csgroup.eu
This commit is contained in:
Christophe Leroy 2020-11-24 15:24:56 +00:00 committed by Michael Ellerman
parent bccc58986a
commit 576e02bbf1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/head_8xx.S
View File

@ -180,14 +180,13 @@ SystemCall:
*/ */
#ifdef CONFIG_8xx_CPU15 #ifdef CONFIG_8xx_CPU15
#define INVALIDATE_ADJACENT_PAGES_CPU15(addr) \ #define INVALIDATE_ADJACENT_PAGES_CPU15(addr, tmp) \
addi addr, addr, PAGE_SIZE; \ addi tmp, addr, PAGE_SIZE; \
tlbie addr; \ tlbie tmp; \
addi addr, addr, -(PAGE_SIZE << 1); \ addi tmp, addr, -PAGE_SIZE; \
tlbie addr; \ tlbie tmp
addi addr, addr, PAGE_SIZE
#else #else
#define INVALIDATE_ADJACENT_PAGES_CPU15(addr) #define INVALIDATE_ADJACENT_PAGES_CPU15(addr, tmp)
#endif #endif
InstructionTLBMiss: InstructionTLBMiss:
@ -198,7 +197,7 @@ InstructionTLBMiss:
* kernel page tables. * kernel page tables.
*/ */
mfspr r10, SPRN_SRR0 /* Get effective address of fault */ mfspr r10, SPRN_SRR0 /* Get effective address of fault */
INVALIDATE_ADJACENT_PAGES_CPU15(r10) INVALIDATE_ADJACENT_PAGES_CPU15(r10, r11)
mtspr SPRN_MD_EPN, r10 mtspr SPRN_MD_EPN, r10
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
mfcr r11 mfcr r11