[4/6] rpc/64/kuap: restore AMR in system reset exception

Message ID	20200429062607.1675792-5-npiggin@gmail.com (mailing list archive)
State	Superseded
Headers	show Return-Path: <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org> From: Nicholas Piggin <npiggin@gmail.com> To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 4/6] rpc/64/kuap: restore AMR in system reset exception Date: Wed, 29 Apr 2020 16:26:04 +1000 Message-Id: <20200429062607.1675792-5-npiggin@gmail.com> In-Reply-To: <20200429062607.1675792-1-npiggin@gmail.com> References: <20200429062607.1675792-1-npiggin@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Cc: Nicholas Piggin <npiggin@gmail.com> Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>
Series	assorted kuap fixes \| expand [0/6] assorted kuap fixes [1/6] powerpc/64/kuap: move kuap checks out of MSR[RI]=0 regions of exit code [2/6] missing isync [3/6] powerpc/64/kuap: interrupt exit kuap restore add missing isync, conditionally restore AMR [4/6] rpc/64/kuap: restore AMR in system reset exception [5/6] powerpc/64/kuap: restore AMR in fast_interrupt_return [6/6] powerpc/64/kuap: conditionally restore AMR in kuap_restore_amr asm

Message ID

20200429062607.1675792-5-npiggin@gmail.com (mailing list archive)

State

Superseded

Headers

From: Nicholas Piggin <npiggin@gmail.com>
To: linuxppc-dev@lists.ozlabs.org
Subject: [PATCH 4/6] rpc/64/kuap: restore AMR in system reset exception
Date: Wed, 29 Apr 2020 16:26:04 +1000
Message-Id: <20200429062607.1675792-5-npiggin@gmail.com>
In-Reply-To: <20200429062607.1675792-1-npiggin@gmail.com>
References: <20200429062607.1675792-1-npiggin@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Cc: Nicholas Piggin <npiggin@gmail.com>
Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org
Sender: "Linuxppc-dev"
 <linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org>

Series

assorted kuap fixes | expand

Checks

Context	Check	Description
snowpatch_ozlabs/apply_patch	success	Successfully applied on branch powerpc/merge (54dc28ff5e0b3585224d49a31b53e030342ca5c3)
snowpatch_ozlabs/checkpatch	warning	total: 1 errors, 2 warnings, 0 checks, 7 lines checked
snowpatch_ozlabs/needsstable	success	Patch has no Fixes tags

Context

Check

Description

snowpatch_ozlabs/apply_patch

success

Successfully applied on branch powerpc/merge (54dc28ff5e0b3585224d49a31b53e030342ca5c3)

snowpatch_ozlabs/checkpatch

warning

total: 1 errors, 2 warnings, 0 checks, 7 lines checked

snowpatch_ozlabs/needsstable

success

Patch has no Fixes tags

Commit Message

Nicholas Piggin April 29, 2020, 6:26 a.m. UTC

system reset interrupt handler locks AMR and exits with
PTION_RESTORE_REGS without restoring AMR. Similarly to the soft-NMI
ler, it needs to restore.

ed-off-by: Nicholas Piggin <npiggin@gmail.com>
---
 arch/powerpc/kernel/exceptions-64s.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 728ccb0f560c..b0ad930cbae5 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -971,6 +971,7 @@  EXC_COMMON_BEGIN(system_reset_common)
 	ld	r10,SOFTE(r1)
 	stb	r10,PACAIRQSOFTMASK(r13)
 
+	kuap_restore_amr r10
 	EXCEPTION_RESTORE_REGS
 	RFI_TO_USER_OR_KERNEL