Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1360434ybb; Sun, 29 Mar 2020 02:42:15 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtt/3apHvkKdK2m6hwHppDrfGYwWOB1188NROJQJemr00i1hzMU1MBrp1mNKB06KzwRlfEo X-Received: by 2002:a05:6808:6cb:: with SMTP id m11mr249663oih.130.1585474935606; Sun, 29 Mar 2020 02:42:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585474935; cv=none; d=google.com; s=arc-20160816; b=cLc0amknk5m+W2M58ytBcFNBK5wvpWxhKLnkdwcd2WUbjCTbKox3gVgXNMraOovx/3 z3+iuZ577xwCHW550gVD8H99dqUSPIuvOZNrD1yNrN9KMu/2uamIfthqC6Fv5g+WRQ9Y YRih0CUi+ZoDLC5nz6bwHamndpXSOODwHDWq1reRl90N/Vz8RZGAJSLZQhWFbp3NTEW/ f9E9igm7cFrGYeJPOo6C6qGBJQPGllqRU/J0ZA5IFAWl5ScSVbr3zHBHYUwjDZIodcx2 VS0ijjcuzZaQOJxIigFHuJkO/ZbjRXlwvFVkkn8L+kzog1c1V+X9V1dILpQdxZrSUelh AUYQ== 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=eNn5DRDn7C/9pJUU37rtm1dYHf5KRZkxtMgfccvAFn8=; b=jhlsqnub+OKukPydwXWtikVl2Rk4apG6aNerCIWLIpLVr+T4HJNDYclFso4T6a/Lh8 xP2hXpOMlU8+MkRVabojIVphiYFTDsLofZtpMSj/2IxHNAKgnpYeWgGal6n8+KzKOJuT SeCTDPeYHg6w9D8VJRMAPHigmTlqvVC5Dpg20NLvmPvlNo9nwv1i2wvVDhK7wsXSWGSt GIFtZpy3jYxFWpR1hXE2aZb2ar3dN5jIBVQzFAkWFl+a1v4HzememJduu9W9uXe7P2sW Q66bH+6xS71uhlvpYW94qowzjZvmn3LhCD0MphL+i8k8ryyUHsXChJNqtWaksAP1u7AS KUjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@c-s.fr header.s=mail header.b=kWxltBfk; 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 96si4946214oty.198.2020.03.29.02.42.03; Sun, 29 Mar 2020 02:42:15 -0700 (PDT) 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=kWxltBfk; 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 S1728045AbgC2JlQ (ORCPT + 99 others); Sun, 29 Mar 2020 05:41:16 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:49675 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727896AbgC2JlK (ORCPT ); Sun, 29 Mar 2020 05:41:10 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 48qrFG2Qfrz9v0Bm; Sun, 29 Mar 2020 11:41:06 +0200 (CEST) Authentication-Results: localhost; dkim=pass reason="1024-bit key; insecure key" header.d=c-s.fr header.i=@c-s.fr header.b=kWxltBfk; 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 QPY8a36xIR9s; Sun, 29 Mar 2020 11:41:06 +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 48qrFG0608z9v0BM; Sun, 29 Mar 2020 11:41:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=c-s.fr; s=mail; t=1585474866; bh=eNn5DRDn7C/9pJUU37rtm1dYHf5KRZkxtMgfccvAFn8=; h=In-Reply-To:References:From:Subject:To:Cc:Date:From; b=kWxltBfk1HA4+qEaqffeQ208JvA59gL9cs848ojXt3vb19gJTvzlVdqkbb40qHpmK B/T4zWhlq+mMGVKhRK7+Slpy/Mg+RQTbov7uwL+SgqIVx8PvEcfiwOYxIBrcoH9fyr qSqdOaJY5OivJQtijREn25VAlYBNYALGdF8ikdjs= Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id F2B358B770; Sun, 29 Mar 2020 11:41:08 +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 0dIkw25vn5rS; Sun, 29 Mar 2020 11:41:08 +0200 (CEST) Received: from pc16570vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id B9D028B752; Sun, 29 Mar 2020 11:41:08 +0200 (CEST) Received: by pc16570vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 8B41665653; Sun, 29 Mar 2020 09:41:08 +0000 (UTC) Message-Id: <5cfd9e5721750ba3a5995548f1c1aa491686b8f2.1585474724.git.christophe.leroy@c-s.fr> In-Reply-To: References: From: Christophe Leroy Subject: [PATCH 08/12] powerpc/rtas: Remove machine_check_in_rtas() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , naveen.n.rao@linux.vnet.ibm.com Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Sun, 29 Mar 2020 09:41:08 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org machine_check_in_rtas() is just a trap. Do the trap directly in the machine check exception handler. Signed-off-by: Christophe Leroy --- arch/powerpc/kernel/entry_32.S | 6 ------ arch/powerpc/kernel/head_32.S | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index a6371fb8f761..e652f6506888 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -1391,10 +1391,4 @@ _GLOBAL(enter_rtas) mtspr SPRN_SRR0,r8 mtspr SPRN_SRR1,r9 RFI /* return to caller */ - - .globl machine_check_in_rtas -machine_check_in_rtas: - twi 31,0,0 - /* XXX load up BATs and panic */ - #endif /* CONFIG_PPC_RTAS */ diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index daaa153950c2..cbd30cac2496 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -297,7 +297,7 @@ MachineCheck: cmpwi cr1, r4, 0 #endif beq cr1, machine_check_tramp - b machine_check_in_rtas + twi 31, 0, 0 #else b machine_check_tramp #endif -- 2.25.0