[src/trunk]: src/sys/arch/arm/cortex in armgic_establish_irq, make sure to wr...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/78cf58f91b45
branches:  trunk
changeset: 806640:78cf58f91b45
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Tue Mar 03 21:53:12 2015 +0000

description:
in armgic_establish_irq, make sure to write the new value to GICD_ICFGRn when setting irq type (IST_LEVEL/IST_EDGE)

diffstat:

 sys/arch/arm/cortex/gic.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r a63ef926029f -r 78cf58f91b45 sys/arch/arm/cortex/gic.c
--- a/sys/arch/arm/cortex/gic.c Tue Mar 03 20:36:31 2015 +0000
+++ b/sys/arch/arm/cortex/gic.c Tue Mar 03 21:53:12 2015 +0000
@@ -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 @@
                        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);