powerpc/booke-64: fix tlbsrx. path in bolted tlb handler
PATCH 1/1 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.
--- arch/powerpc/mm/tlb_low_64e.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
arch/powerpc/mm/tlb_low_64e.S +2 -1
@@ -128,7 +128,7 @@ BEGIN_MMU_FTR_SECTION */ PPC_TLBSRX_DOT(0,r16) 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 ldx r14,r14,r15 /* grab pgd entry */ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV)
@@ -184,6 +184,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) mtspr SPRN_MAS7_MAS3,r15 tlbwe +tlb_miss_done_bolted: TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) tlb_epilog_bolted rfi
Signature · 1 line
1.7.5.4
Quoted 3 lines · Scott Wood
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.
Still relevant ? It doesn't apply anymore :-)
Cheers,
Ben.
Quoted 26 lines
Signed-off-by Scott Wood <[email protected]>--- arch/powerpc/mm/tlb_low_64e.S | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)arch/powerpc/mm/tlb_low_64e.S +2
-1@@ -128,7 +128,7 @@ BEGIN_MMU_FTR_SECTION */ PPC_TLBSRX_DOT(0,r16) 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 ldx r14,r14,r15 /* grab pgd entry */ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV)@@ -184,6 +184,7 @@ ALT_MMU_FTR_SECTION_END_IFSET(MMU_FTR_USE_TLBRSRV) mtspr SPRN_MAS7_MAS3,r15 tlbwe +tlb_miss_done_bolted: TLB_MISS_STATS_X(MMSTAT_TLB_MISS_NORM_OK) tlb_epilog_bolted rfi
A message that is not in the archive (sent off-list or not yet received): [email protected]
Quoted 7 lines · Scott Wood
Quoted 6 lines · Benjamin Herrenschmidt
Quoted 3 lines · Scott Wood
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.
Still relevant ? It doesn't apply anymore :-)
It's still relevant -- I'll respin.
-Scott