Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp140921pxa; Thu, 13 Aug 2020 22:59:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9z39ymEQvkX43xh0sdB1Ef8hFKWuUhCo9APWXpO9qQS32VBt8d2pfISPsyPEhXnyIlCsJ X-Received: by 2002:a50:ee0a:: with SMTP id g10mr722401eds.289.1597384771089; Thu, 13 Aug 2020 22:59:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597384771; cv=none; d=google.com; s=arc-20160816; b=uUsBJDd7e/uF+4laQsJWPc5JSGm0pau10aXZaWKd+H8FYjtGiieTIlEhYZKC2TyTKG O2k/SzI78y1J+w8DrUy6PjxhOXoxLT0h1g2j0nNhn5sUS078tn/KobHxM6XR8gn2lfov /otahR7CAr0EQt5C1PEcQCtbr0dRb4qrFVwkbawqe6TgjWsPdrAyCTCGnUGFNTPqv1Sn OyqqSA6zTxnqo9kFzqcAth7P+/f8zhoTI4sulyWwcImBMHvTrpHeZBcMB/2nVYzhYJJz uN0OnX53pZLk4MOXvx+fTjQkfLr6y+YaadP1Ex8dEBKF4gnTIL8dBNdEHQ0HhsDF8UlU Qgzw== 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:message-id; bh=K/wSNvbk0qUGonbc9fl3fWjUB5M94rtCr/pUnM+SnGA=; b=pEpPPyosfGlCbDoRdE+x6D4+VNhr3hXUz2PVQGq6HIZ7TWBXIduiqbeFc9QxLH3QfK lAhMNdmAUzUSf/DjesD59voezOp4FD2XteZB5WtaEOlikzj6YgNMuWI7Rnj0C9rqs+SP Mk54X787O/q2MhaXgazChu55bS6/6oo4kwf1l8XvULcW7hIopYNX3ql3ccsS+eZTuQxi 6wqzaGxhVuUja/Zhy1T4fh9nUvu/SsJ5d/SAZa6wqoN1gxbsqJFkjFmz+CWnvF7f4jIS MOCFnwPsn78wYD64GHIECwY6N1O4u78BWwSoSoOcyL6VHM8mAttUGUtxUsK1t4xNOPUI qh1g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k7si4374655edr.177.2020.08.13.22.59.07; Thu, 13 Aug 2020 22:59:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726541AbgHNF42 (ORCPT + 99 others); Fri, 14 Aug 2020 01:56:28 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:12192 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbgHNF42 (ORCPT ); Fri, 14 Aug 2020 01:56:28 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4BSXkJ3g73z9vD32; Fri, 14 Aug 2020 07:56:24 +0200 (CEST) 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 szKN8eGNPEEV; Fri, 14 Aug 2020 07:56:24 +0200 (CEST) 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 4BSXkJ2kZ3z9vD2y; Fri, 14 Aug 2020 07:56:24 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 50F8E8B775; Fri, 14 Aug 2020 07:56:25 +0200 (CEST) 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 njb_um4ELroi; Fri, 14 Aug 2020 07:56:25 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 159598B767; Fri, 14 Aug 2020 07:56:25 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id AD45465C93; Fri, 14 Aug 2020 05:56:24 +0000 (UTC) Message-Id: <50098f49877cea0f46730a9df82dcabf84160e4b.1597384512.git.christophe.leroy@csgroup.eu> From: Christophe Leroy Subject: [PATCH v2 1/4] powerpc: Remove flush_instruction_cache for book3s/32 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , hch@infradead.org Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Fri, 14 Aug 2020 05:56:24 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only callers of flush_instruction_cache() are: arch/powerpc/kernel/swsusp_booke.S: bl flush_instruction_cache arch/powerpc/mm/nohash/40x.c: flush_instruction_cache(); arch/powerpc/mm/nohash/44x.c: flush_instruction_cache(); arch/powerpc/mm/nohash/fsl_booke.c: flush_instruction_cache(); arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); arch/powerpc/platforms/44x/machine_check.c: flush_instruction_cache(); This function is not used by book3s/32, drop it. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/misc_32.S | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index b24f866fef81..5c074c2ff5b5 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -271,9 +271,8 @@ _ASM_NOKPROBE_SYMBOL(real_writeb) /* * Flush instruction cache. - * This is a no-op on the 601. */ -#ifndef CONFIG_PPC_8xx +#if !defined(CONFIG_PPC_8xx) && !defined(CONFIG_PPC_BOOK3S_32) _GLOBAL(flush_instruction_cache) #if defined(CONFIG_4xx) lis r3, KERNELBASE@h @@ -290,18 +289,11 @@ _GLOBAL(flush_instruction_cache) mfspr r3,SPRN_L1CSR1 ori r3,r3,L1CSR1_ICFI|L1CSR1_ICLFR mtspr SPRN_L1CSR1,r3 -#elif defined(CONFIG_PPC_BOOK3S_601) - blr /* for 601, do nothing */ -#else - /* 603/604 processor - use invalidate-all bit in HID0 */ - mfspr r3,SPRN_HID0 - ori r3,r3,HID0_ICFI - mtspr SPRN_HID0,r3 #endif /* CONFIG_4xx */ isync blr EXPORT_SYMBOL(flush_instruction_cache) -#endif /* CONFIG_PPC_8xx */ +#endif /* * Copy a whole page. We use the dcbz instruction on the destination -- 2.25.0