CVS commit: src/sys/arch/arm/cortex

[Nick Hudson]

Module Name:    src
Committed By:   skrll
Date:           Thu Jun 22 08:10:29 UTC 2017

Modified Files:
        src/sys/arch/arm/cortex: gic.c

Log Message:
If we see GICC_IAR_IRQ_SSPURIOUS we should also stop looking for irqs


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/cortex/gic.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.27 src/sys/arch/arm/cortex/gic.c:1.28
--- src/sys/arch/arm/cortex/gic.c:1.27	Thu Jun 22 08:04:32 2017
+++ src/sys/arch/arm/cortex/gic.c	Thu Jun 22 08:10:29 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: gic.c,v 1.27 2017/06/22 08:04:32 skrll Exp $	*/
+/*	$NetBSD: gic.c,v 1.28 2017/06/22 08:10:29 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 #define _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.27 2017/06/22 08:04:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.28 2017/06/22 08:10:29 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -293,11 +293,15 @@ armgic_irq_handler(void *arg)
 		uint32_t irq = __SHIFTOUT(iar, GICC_IAR_IRQ);
 
 		KERNHIST_LOG(armgichist, "iar %#x (irq %d)", iar, irq, 0, 0);
-		if (irq == GICC_IAR_IRQ_SPURIOUS) {
+		if (irq == GICC_IAR_IRQ_SPURIOUS ||
+		    irq == GICC_IAR_IRQ_SSPURIOUS) {
 			iar = gicc_read(sc, GICC_IAR);
 			irq = __SHIFTOUT(iar, GICC_IAR_IRQ);
 			if (irq == GICC_IAR_IRQ_SPURIOUS)
 				break;
+			if (irq == GICC_IAR_IRQ_SSPURIOUS) {
+				break;
+			}
 		}
 
 		//const uint32_t cpuid = __SHIFTOUT(iar, GICC_IAR_CPUID_MASK);