From: James Morse <james.morse@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: Jonathan.Zhang@cavium.com, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, wangxiongfeng2@huawei.com, kvmarm@lists.cs.columbia.edu Subject: [PATCH v3 08/20] arm64: entry.S: convert elX_irq Date: Thu, 5 Oct 2017 20:18:00 +0100 [thread overview] Message-ID: <20171005191812.5678-9-james.morse@arm.com> (raw) In-Reply-To: <20171005191812.5678-1-james.morse@arm.com> Following our 'dai' order, irqs should be processed with debug and serror exceptions unmasked. Add a helper to unmask these two, (and fiq for good measure). Signed-off-by: James Morse <james.morse@arm.com> --- arch/arm64/include/asm/assembler.h | 4 ++++ arch/arm64/kernel/entry.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index c2a37e2f733c..7ffb2a629dc9 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -54,6 +54,10 @@ msr daif, \tmp .endm + .macro enable_da_f + msr daifclr, #(8 | 4 | 1) + .endm + /* * Enable and disable interrupts. */ diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index f7dfe5d2b1fb..df085ec003b0 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -557,7 +557,7 @@ ENDPROC(el1_sync) .align 6 el1_irq: kernel_entry 1 - enable_dbg + enable_da_f #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif @@ -766,7 +766,7 @@ ENDPROC(el0_sync) el0_irq: kernel_entry 0 el0_irq_naked: - enable_dbg + enable_da_f #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif -- 2.13.3
WARNING: multiple messages have this Message-ID (diff)
From: james.morse@arm.com (James Morse) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 08/20] arm64: entry.S: convert elX_irq Date: Thu, 5 Oct 2017 20:18:00 +0100 [thread overview] Message-ID: <20171005191812.5678-9-james.morse@arm.com> (raw) In-Reply-To: <20171005191812.5678-1-james.morse@arm.com> Following our 'dai' order, irqs should be processed with debug and serror exceptions unmasked. Add a helper to unmask these two, (and fiq for good measure). Signed-off-by: James Morse <james.morse@arm.com> --- arch/arm64/include/asm/assembler.h | 4 ++++ arch/arm64/kernel/entry.S | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index c2a37e2f733c..7ffb2a629dc9 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -54,6 +54,10 @@ msr daif, \tmp .endm + .macro enable_da_f + msr daifclr, #(8 | 4 | 1) + .endm + /* * Enable and disable interrupts. */ diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index f7dfe5d2b1fb..df085ec003b0 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -557,7 +557,7 @@ ENDPROC(el1_sync) .align 6 el1_irq: kernel_entry 1 - enable_dbg + enable_da_f #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif @@ -766,7 +766,7 @@ ENDPROC(el0_sync) el0_irq: kernel_entry 0 el0_irq_naked: - enable_dbg + enable_da_f #ifdef CONFIG_TRACE_IRQFLAGS bl trace_hardirqs_off #endif -- 2.13.3
next prev parent reply other threads:[~2017-10-05 19:20 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-10-05 19:17 [PATCH v3 00/20] SError rework + RAS&IESB for firmware first support James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:17 ` [PATCH v3 01/20] arm64: explicitly mask all exceptions James Morse 2017-10-05 19:17 ` James Morse 2017-10-11 16:30 ` Julien Thierry 2017-10-11 16:30 ` Julien Thierry 2017-10-12 12:26 ` James Morse 2017-10-12 12:26 ` James Morse 2017-10-18 14:23 ` Catalin Marinas 2017-10-18 14:23 ` Catalin Marinas 2017-10-18 14:25 ` Catalin Marinas 2017-10-18 14:25 ` Catalin Marinas 2017-10-05 19:17 ` [PATCH v3 02/20] arm64: introduce an order for exceptions James Morse 2017-10-05 19:17 ` James Morse 2017-10-11 17:11 ` Julien Thierry 2017-10-11 17:11 ` Julien Thierry 2017-10-05 19:17 ` [PATCH v3 03/20] arm64: Move the async/fiq helpers to explicitly set process context flags James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:17 ` [PATCH v3 04/20] arm64: Mask all exceptions during kernel_exit James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:17 ` [PATCH v3 05/20] arm64: entry.S: Remove disable_dbg James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:17 ` [PATCH v3 06/20] arm64: entry.S: convert el1_sync James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:17 ` [PATCH v3 07/20] arm64: entry.S convert el0_sync James Morse 2017-10-05 19:17 ` James Morse 2017-10-05 19:18 ` James Morse [this message] 2017-10-05 19:18 ` [PATCH v3 08/20] arm64: entry.S: convert elX_irq James Morse 2017-10-11 17:13 ` Julien Thierry 2017-10-11 17:13 ` Julien Thierry 2017-10-12 12:26 ` James Morse 2017-10-12 12:26 ` James Morse 2017-10-05 19:18 ` [PATCH v3 09/20] KVM: arm/arm64: mask/unmask daif around VHE guests James Morse 2017-10-05 19:18 ` James Morse 2017-10-11 9:01 ` Marc Zyngier 2017-10-11 9:01 ` Marc Zyngier 2017-10-11 15:40 ` James Morse 2017-10-11 15:40 ` James Morse 2017-10-05 19:18 ` [PATCH v3 10/20] arm64: entry.S: move SError handling into a C function for future expansion James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 11/20] arm64: cpufeature: Detect CPU RAS Extentions James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 12/20] arm64: kernel: Survive corrected RAS errors notified by SError James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 13/20] arm64: cpufeature: Enable IESB on exception entry/return for firmware-first James Morse 2017-10-05 19:18 ` James Morse 2017-10-18 16:43 ` Catalin Marinas 2017-10-18 16:43 ` Catalin Marinas 2017-10-18 17:14 ` James Morse 2017-10-18 17:14 ` James Morse 2017-10-05 19:18 ` [PATCH v3 14/20] arm64: kernel: Prepare for a DISR user James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 15/20] KVM: arm64: Set an impdef ESR for Virtual-SError using VSESR_EL2 James Morse 2017-10-05 19:18 ` James Morse 2017-10-13 9:25 ` gengdongjiu 2017-10-13 9:25 ` gengdongjiu 2017-10-13 16:53 ` James Morse 2017-10-13 16:53 ` James Morse 2017-10-05 19:18 ` [PATCH v3 16/20] KVM: arm64: Save/Restore guest DISR_EL1 James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 17/20] KVM: arm64: Save ESR_EL2 on guest SError James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 18/20] KVM: arm64: Handle RAS SErrors from EL1 on guest exit James Morse 2017-10-05 19:18 ` James Morse 2017-10-05 19:18 ` [PATCH v3 19/20] KVM: arm64: Handle RAS SErrors from EL2 " James Morse 2017-10-05 19:18 ` James Morse 2017-10-11 10:37 ` Marc Zyngier 2017-10-11 10:37 ` Marc Zyngier 2017-10-12 12:28 ` James Morse 2017-10-12 12:28 ` James Morse 2017-10-05 19:18 ` [PATCH v3 20/20] KVM: arm64: Take any host SError before entering the guest James Morse 2017-10-05 19:18 ` James Morse 2017-10-18 16:55 ` [PATCH v3 00/20] SError rework + RAS&IESB for firmware first support Catalin Marinas 2017-10-18 16:55 ` Catalin Marinas
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=20171005191812.5678-9-james.morse@arm.com \ --to=james.morse@arm.com \ --cc=Jonathan.Zhang@cavium.com \ --cc=catalin.marinas@arm.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=marc.zyngier@arm.com \ --cc=wangxiongfeng2@huawei.com \ --cc=will.deacon@arm.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.