From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5402C433E6 for ; Tue, 16 Mar 2021 10:49:58 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D3F6E64FA5 for ; Tue, 16 Mar 2021 10:49:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D3F6E64FA5 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=csgroup.eu Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4F096D43h0z3c7D for ; Tue, 16 Mar 2021 21:49:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=93.17.236.30; helo=pegase1.c-s.fr; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4F095Z2MPTz30Gm for ; Tue, 16 Mar 2021 21:49:18 +1100 (AEDT) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4F095Q1n67z9v09L; Tue, 16 Mar 2021 11:49:14 +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 zN3uq9cqPwFs; Tue, 16 Mar 2021 11:49:14 +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 4F095Q0j7lz9v09K; Tue, 16 Mar 2021 11:49:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id E5C898B799; Tue, 16 Mar 2021 11:49:14 +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 17WApwqlZS7n; Tue, 16 Mar 2021 11:49:14 +0100 (CET) Received: from [192.168.4.90] (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id A68968B792; Tue, 16 Mar 2021 11:49:10 +0100 (CET) Subject: Re: [PATCH v2 04/11] powerpc/64e/interrupt: use new interrupt return To: Nicholas Piggin , linuxppc-dev@lists.ozlabs.org References: <20210316104206.407354-1-npiggin@gmail.com> <20210316104206.407354-5-npiggin@gmail.com> From: Christophe Leroy Message-ID: <53a3a1e1-b2c5-116c-174b-dd4beefa6515@csgroup.eu> Date: Tue, 16 Mar 2021 11:49:05 +0100 User-Agent: Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.8.0 MIME-Version: 1.0 In-Reply-To: <20210316104206.407354-5-npiggin@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: fr Content-Transfer-Encoding: 8bit X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Scott Wood Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" Le 16/03/2021 à 11:41, Nicholas Piggin a écrit : > Update the new C and asm interrupt return code to account for 64e > specifics, switch over to use it. > > The now-unused old ret_from_except code, that was moved to 64e after the > 64s conversion, is removed. > > Signed-off-by: Nicholas Piggin > --- > arch/powerpc/include/asm/asm-prototypes.h | 2 - > arch/powerpc/include/asm/ppc_asm.h | 20 -- > arch/powerpc/kernel/asm-offsets.c | 10 - > arch/powerpc/kernel/exceptions-64e.S | 321 ++-------------------- > arch/powerpc/kernel/irq.c | 76 ----- > 5 files changed, 25 insertions(+), 404 deletions(-) > > diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c > index 85ba2b0bc8d8..c880ad18b851 100644 > --- a/arch/powerpc/kernel/asm-offsets.c > +++ b/arch/powerpc/kernel/asm-offsets.c > @@ -282,21 +282,11 @@ int main(void) > OFFSET(PACAHWCPUID, paca_struct, hw_cpu_id); > OFFSET(PACAKEXECSTATE, paca_struct, kexec_state); > OFFSET(PACA_DSCR_DEFAULT, paca_struct, dscr_default); > - OFFSET(ACCOUNT_STARTTIME, paca_struct, accounting.starttime); > - OFFSET(ACCOUNT_STARTTIME_USER, paca_struct, accounting.starttime_user); > - OFFSET(ACCOUNT_USER_TIME, paca_struct, accounting.utime); > - OFFSET(ACCOUNT_SYSTEM_TIME, paca_struct, accounting.stime); > #ifdef CONFIG_PPC_BOOK3E > OFFSET(PACA_TRAP_SAVE, paca_struct, trap_save); > #endif > OFFSET(PACA_SPRG_VDSO, paca_struct, sprg_vdso); > #else /* CONFIG_PPC64 */ The #else is useless > -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE > - OFFSET(ACCOUNT_STARTTIME, thread_info, accounting.starttime); > - OFFSET(ACCOUNT_STARTTIME_USER, thread_info, accounting.starttime_user); > - OFFSET(ACCOUNT_USER_TIME, thread_info, accounting.utime); > - OFFSET(ACCOUNT_SYSTEM_TIME, thread_info, accounting.stime); > -#endif > #endif /* CONFIG_PPC64 */ > > /* RTAS */