* [PATCH] powerpc/booke-64: fix tlbsrx. path in bolted tlb handler
@ 2012-06-12 22:02 Scott Wood
2012-09-07 4:23 ` Benjamin Herrenschmidt
0 siblings, 1 reply; 3+ messages in thread
From: Scott Wood @ 2012-06-12 22:02 UTC (permalink / raw)
To: benh; +Cc: linuxppc-dev
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: Scott Wood <scott@tyr.buserror.net>
---
arch/powerpc/mm/tlb_low_64e.S | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S
index ff672bd..efe0f33 100644
--- a/arch/powerpc/mm/tlb_low_64e.S
+++ b/arch/powerpc/mm/tlb_low_64e.S
@@ -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
--
1.7.5.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] powerpc/booke-64: fix tlbsrx. path in bolted tlb handler
2012-06-12 22:02 [PATCH] powerpc/booke-64: fix tlbsrx. path in bolted tlb handler Scott Wood
@ 2012-09-07 4:23 ` Benjamin Herrenschmidt
[not found] ` <504A4C43.3040206@freescale.com>
0 siblings, 1 reply; 3+ messages in thread
From: Benjamin Herrenschmidt @ 2012-09-07 4:23 UTC (permalink / raw)
To: scott; +Cc: linuxppc-dev
On Tue, 2012-06-12 at 17:02 -0500, Scott Wood wrote:
> 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.
> Signed-off-by: Scott Wood <scott@tyr.buserror.net>
> ---
> arch/powerpc/mm/tlb_low_64e.S | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S
> index ff672bd..efe0f33 100644
> --- a/arch/powerpc/mm/tlb_low_64e.S
> +++ b/arch/powerpc/mm/tlb_low_64e.S
> @@ -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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-07 23:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-06-12 22:02 [PATCH] powerpc/booke-64: fix tlbsrx. path in bolted tlb handler Scott Wood
2012-09-07 4:23 ` Benjamin Herrenschmidt
[not found] ` <504A4C43.3040206@freescale.com>
2012-09-07 23:03 ` Scott Wood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).