Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp2498987pxb; Tue, 9 Mar 2021 04:14:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJyneoo01X1CtvKSLBZ46AP0fUD9uMGWDANdjJDBAJXnsjqczR6LQve7OVkal1d3spu6TH+x X-Received: by 2002:a17:906:a090:: with SMTP id q16mr19780012ejy.236.1615292052264; Tue, 09 Mar 2021 04:14:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615292052; cv=none; d=google.com; s=arc-20160816; b=citD+a89408Ux7RmlYSDeKeyaJRkh7AOaTkP52GTxkGyZYjwZtE1+ZBm7OzSpfeLjt GeppRlzxmgs/stkgagaw0I1i29xeC4d8IEdHDvQrJ+1HJORUFXuDwWxXEjSiAQPlRmZL hYFApqBMheOApB4FcIxJ9qna7BO2Y+JAh1GYxd2W9ygLB5MPPx1MsfqPGsqnrso0w3Tg lvRx392WI7FteBDiO7Er+Foohq8f/63zthAYIobw8RPGQpiiMaKV6eXyq/xPrVxiunfT e7hIRp0YN4r6g7qYUHe5aPRoR6/k7zRPWfBKAckmo7EWYsZCB1pbsRElcoACr5WGhprz wONw== 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=/YrCcpvStNVMHKTBexiY53GZSR4deMv9yFgR1kod86Y=; b=aC2TiPDAAnjo4ZnPmhCN+Bmi0Yzrm8KsFWRSATNDWPZJTl50WbIfsujl768LOPfOtf 3QbaNAjo9Jc9QyK3B2CckIDUWtd4ZkAuKaxk9+zs1vylt71sPXvp2y2zPzO+R3y1uOlz MdfZtzCkL3vpbLjOk3CkrdLWO7TPlQsT64si6+tak3nttELmkrCv8Z4SR1RgPnVUB+KR FKCs+dKlbK8oLYxA2VHcKBNqWJqRE+tafK6fJY0KEHh3MgbhDVToXKxsUU1YzYHChX6A 4SOpV3rXnBzvIR+z9cpNHs0pSR38i17uJtt91iKKiIansG8RvvexjTyKlseYEfYC3sOA 7RTw== 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 gf2si8996984ejb.736.2021.03.09.04.13.49; Tue, 09 Mar 2021 04:14:12 -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 S231516AbhCIMK6 (ORCPT + 99 others); Tue, 9 Mar 2021 07:10:58 -0500 Received: from pegase1.c-s.fr ([93.17.236.30]:28411 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231321AbhCIMKF (ORCPT ); Tue, 9 Mar 2021 07:10:05 -0500 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4DvvCv16hCz9tyjF; Tue, 9 Mar 2021 13:10:03 +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 EOrWV_vEg6UO; Tue, 9 Mar 2021 13:10:03 +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 4DvvCt74njz9tyjJ; Tue, 9 Mar 2021 13:10:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 554CD8B7FC; Tue, 9 Mar 2021 13:10:04 +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 R2PkV2PUuxor; Tue, 9 Mar 2021 13:10:04 +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 11A048B804; Tue, 9 Mar 2021 13:10:04 +0100 (CET) Received: by po16121vm.idsi0.si.c-s.fr (Postfix, from userid 0) id E353D67555; Tue, 9 Mar 2021 12:10:03 +0000 (UTC) Message-Id: <6bc7fdcfbcae1d8f81af2e13eaca43d3e2bf2ebc.1615291474.git.christophe.leroy@csgroup.eu> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH v2 37/43] powerpc/32: Return directly from power_save_ppc32_restore() 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:03 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org transfer_to_handler_cont: is now just a blr. Directly perform blr in power_save_ppc32_restore(). Also remove useless setting of r11 in e500 version of power_save_ppc32_restore(). Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/entry_32.S | 3 --- arch/powerpc/kernel/idle_6xx.S | 2 +- arch/powerpc/kernel/idle_e500.S | 10 +--------- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 815a4ff1ba76..5cfa10816261 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -67,8 +67,6 @@ prepare_transfer_to_handler: bt- 31-TLF_NAPPING,4f bt- 31-TLF_SLEEPING,7f #endif /* CONFIG_PPC_BOOK3S_32 || CONFIG_E500 */ - .globl transfer_to_handler_cont -transfer_to_handler_cont: blr #if defined (CONFIG_PPC_BOOK3S_32) || defined(CONFIG_E500) @@ -84,7 +82,6 @@ transfer_to_handler_cont: b fast_exception_return #endif _ASM_NOKPROBE_SYMBOL(prepare_transfer_to_handler) -_ASM_NOKPROBE_SYMBOL(transfer_to_handler_cont) .globl transfer_to_syscall transfer_to_syscall: diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index 153366e178c4..13cad9297d82 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S @@ -176,7 +176,7 @@ BEGIN_FTR_SECTION lwz r9,nap_save_hid1@l(r9) mtspr SPRN_HID1, r9 END_FTR_SECTION_IFSET(CPU_FTR_DUAL_PLL_750FX) - b transfer_to_handler_cont + blr _ASM_NOKPROBE_SYMBOL(power_save_ppc32_restore) .data diff --git a/arch/powerpc/kernel/idle_e500.S b/arch/powerpc/kernel/idle_e500.S index 7795727e7f08..9e1bc4502c50 100644 --- a/arch/powerpc/kernel/idle_e500.S +++ b/arch/powerpc/kernel/idle_e500.S @@ -81,13 +81,5 @@ END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP) _GLOBAL(power_save_ppc32_restore) lwz r9,_LINK(r11) /* interrupted in e500_idle */ stw r9,_NIP(r11) /* make it do a blr */ - -#ifdef CONFIG_SMP - lwz r11,TASK_CPU(r2) /* get cpu number * 4 */ - slwi r11,r11,2 -#else - li r11,0 -#endif - - b transfer_to_handler_cont + blr _ASM_NOKPROBE_SYMBOL(power_save_ppc32_restore) -- 2.25.0