From: Christophe Leroy <christophe.leroy@csgroup.eu>
To: "Michal Suchánek" <msuchanek@suse.de>
Cc: linux-kernel@vger.kernel.org, Nicholas Piggin <npiggin@gmail.com>,
Paul Mackerras <paulus@samba.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: [PATCH] powerpc/traps: fix recoverability of machine check handling on book3s/32
Date: Fri, 11 Sep 2020 11:54:49 +0200 [thread overview]
Message-ID: <69e1863a-468d-55d7-f2b2-e700b22609a3@csgroup.eu> (raw)
In-Reply-To: <20200911091542.GE29521@kitsune.suse.cz>
Hello,
Le 11/09/2020 à 11:15, Michal Suchánek a écrit :
> Hello,
>
> does this logic apply to "Unrecoverable System Reset" as well?
I don't know, I don't think I have any way the generate a System Reset
on my board to check it.
Christophe
>
> Thanks
>
> Michal
>
> On Tue, Jan 22, 2019 at 02:11:24PM +0000, Christophe Leroy wrote:
>> Looks like book3s/32 doesn't set RI on machine check, so
>> checking RI before calling die() will always be fatal
>> allthought this is not an issue in most cases.
>>
>> Fixes: b96672dd840f ("powerpc: Machine check interrupt is a non-maskable interrupt")
>> Fixes: daf00ae71dad ("powerpc/traps: restore recoverability of machine_check interrupts")
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> Cc: stable@vger.kernel.org
>> ---
>> arch/powerpc/kernel/traps.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
>> index 64936b60d521..c740f8bfccc9 100644
>> --- a/arch/powerpc/kernel/traps.c
>> +++ b/arch/powerpc/kernel/traps.c
>> @@ -763,15 +763,15 @@ void machine_check_exception(struct pt_regs *regs)
>> if (check_io_access(regs))
>> goto bail;
>>
>> - /* Must die if the interrupt is not recoverable */
>> - if (!(regs->msr & MSR_RI))
>> - nmi_panic(regs, "Unrecoverable Machine check");
>> -
>> if (!nested)
>> nmi_exit();
>>
>> die("Machine check", regs, SIGBUS);
>>
>> + /* Must die if the interrupt is not recoverable */
>> + if (!(regs->msr & MSR_RI))
>> + nmi_panic(regs, "Unrecoverable Machine check");
>> +
>> return;
>>
>> bail:
>> --
>> 2.13.3
>>
next prev parent reply other threads:[~2020-09-11 9:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-22 14:11 [PATCH] powerpc/traps: fix recoverability of machine check handling on book3s/32 Christophe Leroy
2019-01-23 8:56 ` Nicholas Piggin
2019-02-22 9:47 ` Michael Ellerman
2020-09-11 9:15 ` [PATCH] " Michal Suchánek
2020-09-11 9:54 ` Christophe Leroy [this message]
2020-09-11 13:23 ` Michael Ellerman
2020-09-14 12:46 ` Michal Suchánek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=69e1863a-468d-55d7-f2b2-e700b22609a3@csgroup.eu \
--to=christophe.leroy@csgroup.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=msuchanek@suse.de \
--cc=npiggin@gmail.com \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).