From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753279AbbCZVc1 (ORCPT ); Thu, 26 Mar 2015 17:32:27 -0400 Received: from mail-bl2on0115.outbound.protection.outlook.com ([65.55.169.115]:41389 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753013AbbCZVcZ (ORCPT ); Thu, 26 Mar 2015 17:32:25 -0400 Date: Thu, 26 Mar 2015 16:32:15 -0500 From: Scott Wood To: LEROY Christophe CC: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , , Subject: Re: [v3, 01/11] powerpc/8xx: remove remaining unnecessary code in FixupDAR Message-ID: <20150326213215.GA21815@home.buserror.net> References: <20150203113816.E77811A5F13@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20150203113816.E77811A5F13@localhost.localdomain> User-Agent: Mutt/1.5.23 (2014-03-12) X-Originating-IP: [2601:2:5800:3f7:12bf:48ff:fe84:c9a0] X-ClientProxiedBy: DM2PR09CA0031.namprd09.prod.outlook.com (25.160.127.41) To CY1PR03MB1487.namprd03.prod.outlook.com (25.163.17.17) Authentication-Results: c-s.fr; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1487; X-Forefront-Antispam-Report: BMV:1;SFV:NSPM;SFS:(10019020)(6009001)(51704005)(24454002)(54356999)(76176999)(50986999)(86362001)(47776003)(50466002)(42186005)(53416004)(122386002)(2950100001)(40100003)(77156002)(46406003)(19580405001)(83506001)(23726002)(33656002)(97756001)(92566002)(87976001)(110136001)(62966003)(46102003)(3826002);DIR:OUT;SFP:1102;SCL:1;SRVR:CY1PR03MB1487;H:home.buserror.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(5002010)(5005006);SRVR:CY1PR03MB1487;BCL:0;PCL:0;RULEID:;SRVR:CY1PR03MB1487; X-Forefront-PRVS: 0527DFA348 X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2015 21:32:22.0324 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB1487 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 03, 2015 at 12:38:16PM +0100, LEROY Christophe wrote: > Since commit 33fb845a6f01 ("powerpc/8xx: Don't use MD_TWC for walk"), MD_EPN and > MD_TWC are not writen anymore in FixupDAR so saving r3 has become useless. > > Signed-off-by: Christophe Leroy > --- > v2: no change > v3: no change This doesn't apply cleanly. > arch/powerpc/kernel/head_8xx.S | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S > index 3d4b8ee..79b8a23 100644 > --- a/arch/powerpc/kernel/head_8xx.S > +++ b/arch/powerpc/kernel/head_8xx.S > @@ -532,9 +532,6 @@ DARFixed:/* Return from dcbx instruction bug workaround */ > /* define if you don't want to use self modifying code */ > #define NO_SELF_MODIFYING_CODE > FixupDAR:/* Entry point for dcbx workaround. */ > -#ifdef CONFIG_8xx_CPU6 > - mtspr SPRN_DAR, r3 > -#endif > mtspr SPRN_SPRG_SCRATCH2, r10 > /* fetch instruction from memory. */ > mfspr r10, SPRN_SRR0 This hunk looks OK but should start at line 500. > @@ -551,9 +548,6 @@ FixupDAR:/* Entry point for dcbx workaround. */ > /* Extract level 2 index */ > rlwinm r11, r11, 32 - (PAGE_SHIFT - 2), 32 - PAGE_SHIFT, 29 > lwzx r11, r10, r11 /* Get the pte */ > -#ifdef CONFIG_8xx_CPU6 > - mfspr r3, SPRN_DAR > -#endif > /* concat physical page address(r11) and page offset(r10) */ > mfspr r10, SPRN_SRR0 > rlwimi r11, r10, 0, 32 - PAGE_SHIFT, 31 There is no ifdef CONFIG_8xx_CPU6 after any of the the "Get the pte" lines, and none of them are "lwzx r11, r10, r11". What tree is this patchset against? -Scott