[11/19] nvic: Compare group priority for escalation to HF

Message ID	1505240046-11454-12-git-send-email-peter.maydell@linaro.org
State	Superseded
Headers	show Delivered-To: patches@linaro.org Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; From: Peter Maydell <peter.maydell@linaro.org> To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 11/19] nvic: Compare group priority for escalation to HF Date: Tue, 12 Sep 2017 19:13:58 +0100 Message-Id: <1505240046-11454-12-git-send-email-peter.maydell@linaro.org> In-Reply-To: <1505240046-11454-1-git-send-email-peter.maydell@linaro.org> References: <1505240046-11454-1-git-send-email-peter.maydell@linaro.org>
Series	ARMv8M: support security extn in the NVIC \| expand [00/19] ARMv8M: support security extn in the NVIC [01/19] target/arm: Implement MSR/MRS access to NS banked registers [02/19] nvic: Add banked exception states [03/19] nvic: Add cached vectpending_is_s_banked state [04/19] nvic: Add cached vectpending_prio state [05/19] nvic: Implement AIRCR changes for v8M [06/19] nvic: Make ICSR.RETTOBASE handle banked exceptions [07/19] nvic: Implement NVIC_ITNS<n> registers [08/19] nvic: Handle banked exceptions in nvic_recompute_state() [09/19] nvic: Make set_pending and clear_pending take a secure parameter [10/19] nvic: Make SHPR registers banked [11/19] nvic: Compare group priority for escalation to HF [12/19] nvic: In escalation to HardFault, support HF not being priority -1 [13/19] nvic: Implement v8M changes to fixed priority exceptions [14/19] nvic: Disable the non-secure HardFault if AIRCR.BFHFNMINS is clear [15/19] nvic: Handle v8M changes in nvic_exec_prio() [16/19] target/arm: Handle banking in negative-execution-priority check in cpu_mmu_index() [17/19] nvic: Make ICSR banked for v8M [18/19] nvic: Make SHCSR banked for v8M [19/19] nvic: Support banked exceptions in acknowledge and complete

Message ID

1505240046-11454-12-git-send-email-peter.maydell@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: best guess record for domain of
	pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted
	sender) client-ip=2001:8b0:1d0::2; 
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org,
	qemu-devel@nongnu.org
Cc: patches@linaro.org
Subject: [PATCH 11/19] nvic: Compare group priority for escalation to HF
Date: Tue, 12 Sep 2017 19:13:58 +0100
Message-Id: <1505240046-11454-12-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1505240046-11454-1-git-send-email-peter.maydell@linaro.org>
References: <1505240046-11454-1-git-send-email-peter.maydell@linaro.org>

Series

ARMv8M: support security extn in the NVIC | expand

Commit Message

Peter Maydell Sept. 12, 2017, 6:13 p.m. UTC

In armv7m_nvic_set_pending() we have to compare the
priority of an exception against the execution priority
to decide whether it needs to be escalated to HardFault.
In the specification this is a comparison against the
exception's group priority; for v7M we implemented it
as a comparison against the raw exception priority
because the two comparisons will always give the
same answer. For v8M the existence of AIRCR.PRIS and
the possibility of different PRIGROUP values for secure
and nonsecure exceptions means we need to explicitly
calculate the vector's group priority for this check.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/intc/armv7m_nvic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.7.4

Comments

Richard Henderson Sept. 19, 2017, 6:48 p.m. UTC | #1

On 09/12/2017 01:13 PM, Peter Maydell wrote:
> In armv7m_nvic_set_pending() we have to compare the

> priority of an exception against the execution priority

> to decide whether it needs to be escalated to HardFault.

> In the specification this is a comparison against the

> exception's group priority; for v7M we implemented it

> as a comparison against the raw exception priority

> because the two comparisons will always give the

> same answer. For v8M the existence of AIRCR.PRIS and

> the possibility of different PRIGROUP values for secure

> and nonsecure exceptions means we need to explicitly

> calculate the vector's group priority for this check.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  hw/intc/armv7m_nvic.c | 2 +-

>  1 file changed, 1 insertion(+), 1 deletion(-)


Reviewed-by: Richard Henderson <richard.henderson@linaro.org>


r~

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 00c03b4..3361a28 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -478,7 +478,7 @@  void armv7m_nvic_set_pending(void *opaque, int irq, bool secure)
         int running = nvic_exec_prio(s);
         bool escalate = false;
 
-        if (vec->prio >= running) {
+        if (exc_group_prio(s, vec->prio, secure) >= running) {
             trace_nvic_escalate_prio(irq, vec->prio, running);
             escalate = true;
         } else if (!vec->enabled) {

[11/19] nvic: Compare group priority for escalation to HF

Commit Message

Comments

Patch