Module Name: src
Committed By: jmcneill
Date: Tue Mar 3 21:53:12 UTC 2015
Modified Files:
src/sys/arch/arm/cortex: gic.c
Log Message:
in armgic_establish_irq, make sure to write the new value to GICD_ICFGRn when
setting irq type (IST_LEVEL/IST_EDGE)
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 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.13 src/sys/arch/arm/cortex/gic.c:1.14
--- src/sys/arch/arm/cortex/gic.c:1.13 Mon Mar 2 11:37:25 2015
+++ src/sys/arch/arm/cortex/gic.c Tue Mar 3 21:53:12 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.13 2015/03/02 11:37:25 jmcneill Exp $ */
+/* $NetBSD: gic.c,v 1.14 2015/03/03 21:53:12 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.13 2015/03/02 11:37:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.14 2015/03/03 21:53:12 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -371,7 +371,7 @@ armgic_establish_irq(struct pic_softc *p
new_cfg |= 2 << twopair_shift;
}
if (new_cfg != cfg) {
- gicd_write(sc, cfg_reg, cfg);
+ gicd_write(sc, cfg_reg, new_cfg);
#if 0
printf("%s: irq %u: cfg changed from %#x to %#x\n",
pic->pic_name, is->is_irq, cfg, new_cfg);
