Module Name: src
Committed By: snj
Date: Sat Mar 7 05:04:49 UTC 2015
Modified Files:
src/sys/arch/arm/cortex [netbsd-7]: gic.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #567):
sys/arch/arm/cortex/gic.c: revision 1.13, 1.14
in armgic_establish_irq, make sure to write the new value to GICD_ICFGRn
when setting irq type (IST_LEVEL/IST_EDGE)
--
sc_gic_lines is the total number of valid lines but pic_sources[] is
sparse; when initializing mpsafe targets make sure to go all the way to
the end (sc_pic.pic_maxsources) instead
To generate a diff of this commit:
cvs rdiff -u -r1.10.2.1 -r1.10.2.2 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.10.2.1 src/sys/arch/arm/cortex/gic.c:1.10.2.2
--- src/sys/arch/arm/cortex/gic.c:1.10.2.1 Sun Nov 9 16:05:25 2014
+++ src/sys/arch/arm/cortex/gic.c Sat Mar 7 05:04:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.10.2.1 2014/11/09 16:05:25 martin Exp $ */
+/* $NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj 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.10.2.1 2014/11/09 16:05:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.10.2.2 2015/03/07 05:04:49 snj 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);
@@ -441,7 +441,7 @@ armgic_cpu_init_targets(struct armgic_so
/*
* Update the mpsafe targets
*/
- for (size_t irq = 32; irq < sc->sc_gic_lines; irq++) {
+ for (size_t irq = 32; irq < sc->sc_pic.pic_maxsources; irq++) {
struct intrsource * const is = sc->sc_pic.pic_sources[irq];
const bus_size_t targets_reg = GICD_ITARGETSRn(irq / 4);
if (is != NULL && is->is_mpsafe) {
