From 9dd2731d15e5c45944aae0fa8af533ee7dc3c8f7 Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Fri, 12 Mar 2021 12:21:09 +0100
Subject: [PATCH] aarch64: Remove comparison with GIC-specific intid

GIC_INTID_SPURIOUS is a GIC-specific intid so it's not valid for custom
interrupt controllers. Rework a bit the logic by comparing the intid to
the maximum intid possible instead.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
---
 arch/arm64/core/isr_wrapper.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/core/isr_wrapper.S b/arch/arm64/core/isr_wrapper.S
index 7554219e228..7f70f180b9a 100644
--- a/arch/arm64/core/isr_wrapper.S
+++ b/arch/arm64/core/isr_wrapper.S
@@ -46,9 +46,9 @@ SECTION_FUNC(TEXT, _isr_wrapper)
 	bl	z_soc_irq_get_active
 #endif /* !CONFIG_ARM_CUSTOM_INTERRUPT_CONTROLLER */
 
-	/* Spurious */
-	cmp	x0, #(GIC_INTID_SPURIOUS)
-	beq	spurious_continue
+	/* IRQ out of bounds */
+	cmp	x0, #(CONFIG_NUM_IRQS - 1)
+	b.hi	spurious_continue
 
 	stp	x0, xzr, [sp, #-16]!