Commit 1149e8a7 authored by Scott Wood's avatar Scott Wood Committed by Scott Wood

powerpc/booke-64: fix tlbsrx. path in bolted tlb handler

It was branching to the cleanup part of the non-bolted handler,
which would have been bad if there were any chips with tlbsrx.
that use the bolted handler.
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
parent 78f3d050
...@@ -136,7 +136,7 @@ BEGIN_MMU_FTR_SECTION ...@@ -136,7 +136,7 @@ BEGIN_MMU_FTR_SECTION
*/ */
PPC_TLBSRX_DOT(0,R16) PPC_TLBSRX_DOT(0,R16)
ldx r14,r14,r15 /* grab pgd entry */ ldx r14,r14,r15 /* grab pgd entry */
beq normal_tlb_miss_done /* tlb exists already, bail */ beq tlb_miss_done_bolted /* tlb exists already, bail */
MMU_FTR_SECTION_ELSE MMU_FTR_SECTION_ELSE
ldx r14,r14,r15 /* grab pgd entry */ ldx r14,r14,r15 /* grab pgd entry */
ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV)
...@@ -192,6 +192,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) ...@@ -192,6 +192,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV)
mtspr SPRN_MAS7_MAS3,r15 mtspr SPRN_MAS7_MAS3,r15
tlbwe tlbwe
tlb_miss_done_bolted:
TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK)
tlb_epilog_bolted tlb_epilog_bolted
rfi rfi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment