From patchwork Tue Jun 12 22:02:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Scott Wood X-Patchwork-Id: 164509 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 499BE1009BF for ; Wed, 13 Jun 2012 08:30:11 +1000 (EST) Received: from VA3EHSNDR001.bigfish.com (va3outboundsmtppool2.messaging.microsoft.com [157.55.133.164]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client CN "mail.global.frontbridge.com", Issuer "Microsoft Secure Server Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id E1F8EB6FB9 for ; Wed, 13 Jun 2012 08:02:50 +1000 (EST) Received: from va3outboundpool.messaging.microsoft.com (10.7.14.236) by VA3EHSNDR001.bigfish.com (10.7.40.50) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 12 Jun 2012 22:01:43 +0000 Received: from mail71-va3-R.bigfish.com (10.7.14.237) by VA3EHSOBE010.bigfish.com (10.7.40.12) with Microsoft SMTP Server id 14.1.225.22; Tue, 12 Jun 2012 22:01:42 +0000 Received: from mail71-va3 (localhost [127.0.0.1]) by mail71-va3-R.bigfish.com (Postfix) with ESMTP id 687F24043F; Tue, 12 Jun 2012 22:01:42 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-OUTBOUND-SPAM: yes X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275chz2dh87h2a8h668h839h944hd25he96hf0ah41h42h) X-FB-DOMAIN-IP-MATCH: fail Received: from mail71-va3 (localhost.localdomain [127.0.0.1]) by mail71-va3 (MessageSwitch) id 133953850058422_6793; Tue, 12 Jun 2012 22:01:40 +0000 (UTC) Received: from VA3EHSMHS024.bigfish.com (unknown [10.7.14.246]) by mail71-va3.bigfish.com (Postfix) with ESMTP id 0A786C0715; Tue, 12 Jun 2012 22:01:40 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by VA3EHSMHS024.bigfish.com (10.7.99.34) with Microsoft SMTP Server (TLS) id 14.1.225.23; Tue, 12 Jun 2012 22:01:39 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.2.298.5; Tue, 12 Jun 2012 17:02:40 -0500 Received: from tyr.buserror.net ([10.214.84.183]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id q5CM2Xdp013746; Tue, 12 Jun 2012 15:02:39 -0700 Date: Tue, 12 Jun 2012 17:02:32 -0500 From: Scott Wood To: Subject: [PATCH] powerpc/booke-64: fix tlbsrx. path in bolted tlb handler Message-ID: <20120612220232.GA17228@tyr.buserror.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com X-Mailman-Approved-At: Wed, 13 Jun 2012 08:28:13 +1000 Cc: linuxppc-dev@lists.ozlabs.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15rc1 Precedence: list Reply-To: scott@tyr.buserror.net List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "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 --- 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