Module Name: src
Committed By: jmcneill
Date: Wed Oct 11 00:17:03 UTC 2017
Modified Files:
src/sys/arch/arm/sunxi: sunxi_intc.c
Log Message:
Remove a bogus KASSERT and clear IRQ pending status as handle them
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_intc.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/sunxi/sunxi_intc.c
diff -u src/sys/arch/arm/sunxi/sunxi_intc.c:1.1 src/sys/arch/arm/sunxi/sunxi_intc.c:1.2
--- src/sys/arch/arm/sunxi/sunxi_intc.c:1.1 Fri Aug 25 00:07:03 2017
+++ src/sys/arch/arm/sunxi/sunxi_intc.c Wed Oct 11 00:17:03 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_intc.c,v 1.1 2017/08/25 00:07:03 jmcneill Exp $ */
+/* $NetBSD: sunxi_intc.c,v 1.2 2017/10/11 00:17:03 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.1 2017/08/25 00:07:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_intc.c,v 1.2 2017/10/11 00:17:03 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -177,12 +177,13 @@ sunxi_intc_find_pending_irqs(struct sunx
uint32_t pend;
pend = INTC_READ(sc, INTC_IRQ_PEND_REG(group));
-
- KASSERT((sc->sc_enabled_irqs[group] & pend) == pend);
+ pend &= sc->sc_enabled_irqs[group];
if (pend == 0)
return 0;
+ INTC_WRITE(sc, INTC_IRQ_PEND_REG(group), pend);
+
return pic_mark_pending_sources(&sc->sc_pic, group * 32, pend);
}
@@ -246,6 +247,8 @@ sunxi_intc_attach(device_t parent, devic
for (i = 0; i < INTC_MAX_GROUPS; i++) {
INTC_WRITE(sc, INTC_EN_REG(i), 0);
INTC_WRITE(sc, INTC_MASK_REG(i), 0);
+ INTC_WRITE(sc, INTC_IRQ_PEND_REG(i),
+ INTC_READ(sc, INTC_IRQ_PEND_REG(i)));
}
/* Disable user mode access to intc registers */
INTC_WRITE(sc, INTC_PROTECT_REG, INTC_PROTECT_EN);
