Received: by 2002:ac0:a679:0:0:0:0:0 with SMTP id p54csp346368imp; Thu, 21 Feb 2019 02:39:53 -0800 (PST) X-Google-Smtp-Source: AHgI3IYWvCSE9I/+LE/qidQ3xN2zIxao6Yyd4gDoXyFugCyWPoBj6PjWTus3gCG1JC4toJSW2wdM X-Received: by 2002:a17:902:9691:: with SMTP id n17mr42889856plp.9.1550745593478; Thu, 21 Feb 2019 02:39:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550745593; cv=none; d=google.com; s=arc-20160816; b=HOT9YiFr4X/VdkrmF+Dyei92IozS0qF7wIpmA3HZiXqT/BCB8cbr9tRxZ7wtCL2NOo PdVL7p9D7abPF1Vl0JVQToI2BPcOIO7EivfkDnQwwExnbxwVFI8n2OffhlMmimPRyZBi X+YeykUrjpVHpHftqfITZlecUuLkPUlzRNphm/S9ore+IynaUmUiThUrY2L0LtKplEK7 WCV1LQXhMPn9z5Ie2zGLEfAvVNkNmkE7hfOguqAcaD/3uWhiLKn7dsnYaoVnrq6BpaDH R/B/UQcQ78kMzFVFheLOJhLpTHXC64hprd5IoUWcJmARoHeqIrAJ/5B++5/ITWt/ixQq QUZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:cc:to:subject:from:references :in-reply-to:message-id:dkim-signature; bh=TLXwcODONg8/rlS51oxgmUatpyunMWv8AOjcq6HYGc4=; b=xL9sluVPxQfrd3PeQYvyJPzRW8aWBLgxUQWH7HhPjCn6DwJA1fNpCY3gXxqdHCX21L 1M0fM+0h0vA3XcrFpT6grIenVei2nU6IbntYJYjQYphbV4JKWN3tFn7aLDThXcYrN92R uoa1rhPEu29EibYfH1TvZ+7tU1a5N139avGNdkZJ4EPk+dNEErnLlVUzJt/XyAcvkiGj siWkiFL4Mk5DqNz9/oLM03XAUS5MJGGdpsEgcA0GzZMI275l0NT/JtwtgSEmNX376zDg 9lxFJxByQ7ZpFKjfnk7OwPN29j0kjyFoVHtGlbZbLIjjsjsJn5cwczoDGADmppGuw70s iptw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=oqx+sAwM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c142si21154407pfb.33.2019.02.21.02.39.38; Thu, 21 Feb 2019 02:39:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=oqx+sAwM; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727828AbfBUKid (ORCPT + 99 others); Thu, 21 Feb 2019 05:38:33 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:52644 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727362AbfBUKh6 (ORCPT ); Thu, 21 Feb 2019 05:37:58 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 444rXM5P4cz9tylg; Thu, 21 Feb 2019 11:37:55 +0100 (CET) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=oqx+sAwM; dkim-adsp=pass; dkim-atps=neutral X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id X8Hu0dGS_RMQ; Thu, 21 Feb 2019 11:37:55 +0100 (CET) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 444rXM46hDz9tylQ; Thu, 21 Feb 2019 11:37:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1550745475; bh=TLXwcODONg8/rlS51oxgmUatpyunMWv8AOjcq6HYGc4=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=oqx+sAwMNd6u668in4xsLDZDNaBHNRJuqaexU6tgfjDCm2PgPJ+7Qe3J4oKgumlVJ F0slFg/jTFBsmzxmrdpOIK/JfLHlrcrJrt0KENOu908Rad6OnUAhxrY/z+vzqyBA5y NO+F0Jd4VBVGwgq3qL9b9DEMzs8NAuIpd8wJP+ms= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B734C8B859; Thu, 21 Feb 2019 11:37:56 +0100 (CET) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id JgdwUehqXavM; Thu, 21 Feb 2019 11:37:56 +0100 (CET) Received: from po16846vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 860B18B852; Thu, 21 Feb 2019 11:37:56 +0100 (CET) Received: by localhost.localdomain (Postfix, from userid 0) id 5D24D6E856; Thu, 21 Feb 2019 10:37:56 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 04/10] powerpc/603: use physical address directly in TLB miss handlers. To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 21 Feb 2019 10:37:56 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit c62ce9ef97ba ("powerpc: remove remaining bits from CONFIG_APUS"), tophys() has become a pure constant operation. PAGE_OFFSET is known at compile time so the physical address can be builtin directly. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/head_32.S | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index 2b0a26f66115..4c2cc42399aa 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -505,9 +505,8 @@ InstructionTLBMiss: bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ - lis r2,swapper_pg_dir@ha /* if kernel address, use */ - addi r2,r2,swapper_pg_dir@l /* kernel page table */ - tophys(r2,r2) + lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ + addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ lwz r2,0(r2) /* get pmd entry */ rlwinm. r2,r2,0,0,19 /* extract address of pte page */ @@ -578,9 +577,8 @@ DataLoadTLBMiss: bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ - lis r2,swapper_pg_dir@ha /* if kernel address, use */ - addi r2,r2,swapper_pg_dir@l /* kernel page table */ - tophys(r2,r2) + lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ + addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ lwz r2,0(r2) /* get pmd entry */ rlwinm. r2,r2,0,0,19 /* extract address of pte page */ @@ -661,9 +659,8 @@ DataStoreTLBMiss: bge- 112f mfspr r2,SPRN_SRR1 /* and MSR_PR bit from SRR1 */ rlwimi r1,r2,32-12,29,29 /* shift MSR_PR to _PAGE_USER posn */ - lis r2,swapper_pg_dir@ha /* if kernel address, use */ - addi r2,r2,swapper_pg_dir@l /* kernel page table */ - tophys(r2,r2) + lis r2, (swapper_pg_dir - PAGE_OFFSET)@ha /* if kernel address, use */ + addi r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l /* kernel page table */ 112: rlwimi r2,r3,12,20,29 /* insert top 10 bits of address */ lwz r2,0(r2) /* get pmd entry */ rlwinm. r2,r2,0,0,19 /* extract address of pte page */ -- 2.13.3