Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2498281pxb; Tue, 9 Mar 2021 04:13:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJxMNiId5lHmoS0j+tyRI9B45R4D2QKw43uutEd4rJanpltLSu/ZEoD5ZLZO6KfvQtdaXSKC X-Received: by 2002:a17:906:2818:: with SMTP id r24mr19988985ejc.472.1615291989448; Tue, 09 Mar 2021 04:13:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615291989; cv=none; d=google.com; s=arc-20160816; b=FB9WW/tg4PTgX/2xvwf0Eyzetqytmmya5C75NjgZamWlDHSZElKq+pTw5FnEFC/+rk LBz7z6RjPB9DV9HVwdMAuQQzsvz6tU5ZHcg0bR2EuAs1EL73//2WLBVelNHYZ2Qpff+w ZfdVIvPpdYS2/E6wCNECDWbaia7UvfiuLILd/9yG2IxkvERM24TFc5+DOAv3SDyp5Ms2 z6PpnTbZAbYITZsEQkf4rBnn8lN58tzbPYMRrTrSp6qk2h3RQz8HE2ruFQ4LU2ZtD+JW llxgcegp1mX7dRj9wBiNACauiquq97b2EkASvRZSx9MNCS5J5Lr0CH9OXr0j/qPnx/nM KzIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:references:in-reply-to :message-id; bh=NGbWrHR+hwefdJ3MaWMDi3GH6rvSdTGYmH2KRPL2qLU=; b=V83XPfkMXwxn8sQ2nAFq0JP0YIwS1/VBQbyIJHxOloPFR9ACtFyxjcNwKf87qHXw23 IxMX2ByC1npkHdq7etQq9LAmPKsXNMN6A18NF/CNMRCK9/XBLmqB+RtATiOr8l2+sSO0 ZG1QsnMqneix2FC21bOiQPwsVBZn6l++mgY77dM1XxwrQh6j9hD/X9zf/mDG+rGGBtgC YDnOrwxoWEs0cOX0g0F29Xw3qz0WK8twvtStTrIkEp3BI4p6jlpe22p6SdE2K+qDk+mk d8jbG1EbZojaZ4Rsb+PI2CsFLGzCwPuBbde95oUcxxyLnpI2otDz6BRF+sy25n3Qtv/p wB8Q== 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 qu25si9375186ejb.665.2021.03.09.04.12.45; Tue, 09 Mar 2021 04:13:09 -0800 (PST) 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 S231817AbhCIMLD (ORCPT + 99 others); Tue, 9 Mar 2021 07:11:03 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:34552 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230035AbhCIMKI (ORCPT ); Tue, 9 Mar 2021 07:10:08 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DvvCx3X4yz9tyjJ; Tue, 9 Mar 2021 13:10:05 +0100 (CET) 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 tOMXkEjxxwdR; Tue, 9 Mar 2021 13:10:05 +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 4DvvCx1BYdz9tyjH; Tue, 9 Mar 2021 13:10:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CF9288B805; Tue, 9 Mar 2021 13:10:05 +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 N6Q04Ho6wv6N; Tue, 9 Mar 2021 13:10:05 +0100 (CET) Received: from po16121vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1A7318B802; Tue, 9 Mar 2021 13:10:05 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id EB78D67555; Tue, 9 Mar 2021 12:10:04 +0000 (UTC) Message-Id: In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 38/43] powerpc/32: Only use prepare_transfer_to_handler function on book3s/32 and e500 To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , npiggin@gmail.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Tue, 9 Mar 2021 12:10:04 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Only book3s/32 and e500 have significative work to do in prepare_transfer_to_handler. Other 32 bit have nothing to do at all. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/entry_32.S | 6 ++---- arch/powerpc/kernel/head_32.h | 2 ++ arch/powerpc/kernel/head_booke.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 5cfa10816261..9c333e6db5fa 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -48,6 +48,7 @@ */ .align 12 +#if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500) .globl prepare_transfer_to_handler prepare_transfer_to_handler: andi. r0,r9,MSR_PR @@ -61,15 +62,12 @@ prepare_transfer_to_handler: /* if from kernel, check interrupted DOZE/NAP mode */ 2: kuap_save_and_lock r11, r12, r9, r5, r6 -#if defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500) lwz r12,TI_LOCAL_FLAGS(r2) mtcrf 0x01,r12 bt- 31-TLF_NAPPING,4f bt- 31-TLF_SLEEPING,7f -#endif /* CONFIG_PPC_BOOK3S_32 || CONFIG_E500 */ blr -#if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500) 4: rlwinm r12,r12,0,~_TLF_NAPPING stw r12,TI_LOCAL_FLAGS(r2) b power_save_ppc32_restore @@ -80,8 +78,8 @@ prepare_transfer_to_handler: rlwinm r9,r9,0,~MSR_EE stw r9,_MSR(r11) b fast_exception_return -#endif _ASM_NOKPROBE_SYMBOL(prepare_transfer_to_handler) +#endif /* CONFIG_PPC_BOOK3S_32 || CONFIG_E500 */ .globl transfer_to_syscall transfer_to_syscall: diff --git a/arch/powerpc/kernel/head_32.h b/arch/powerpc/kernel/head_32.h index 267479072495..ca303762d8cc 100644 --- a/arch/powerpc/kernel/head_32.h +++ b/arch/powerpc/kernel/head_32.h @@ -132,7 +132,9 @@ _ASM_NOKPROBE_SYMBOL(\name\()_virt) .endm .macro prepare_transfer_to_handler +#ifdef CONFIG_PPC_BOOK3S_32 bl prepare_transfer_to_handler +#endif .endm .macro SYSCALL_ENTRY trapno diff --git a/arch/powerpc/kernel/head_booke.h b/arch/powerpc/kernel/head_booke.h index 4d583fbef0b6..a2565023d2d0 100644 --- a/arch/powerpc/kernel/head_booke.h +++ b/arch/powerpc/kernel/head_booke.h @@ -92,7 +92,9 @@ END_BTB_FLUSH_SECTION .endm .macro prepare_transfer_to_handler +#ifdef CONFIG_E500 bl prepare_transfer_to_handler +#endif .endm .macro SYSCALL_ENTRY trapno intno srr1 -- 2.25.0