 @@ -1,14 +1,14 @@
-/*	$NetBSD: bcm2835_intr.c,v 1.3 2013/01/08 12:15:42 skrll Exp $	*/
+/*	$NetBSD: bcm2835_intr.c,v 1.4 2014/09/07 15:28:05 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Nick Hudson
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -20,27 +20,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.3 2013/01/08 12:15:42 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_intr.c,v 1.4 2014/09/07 15:28:05 skrll Exp $");
 #define _INTR_PRIVATE
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <machine/intr.h>
 #include <sys/bus.h>
 #include <arm/pic/picvar.h>
 #include <arm/broadcom/bcm_amba.h>
 @@ -85,30 +85,30 @@ struct bcm2835icu_softc *bcmicu_sc;
 #define write_bcm2835reg(o, v)	\
 	bus_space_write_4(bcmicu_sc->sc_iot, bcmicu_sc->sc_ioh, (o), (v))
 #define bcm2835_barrier() \
 	bus_space_barrier(bcmicu_sc->sc_iot, bcmicu_sc->sc_ioh, 0, \
 	    BCM2835_ARMICU_SIZE, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE)
 static const char * const bcm2835_sources[BCM2835_NIRQ] = {
 	"(unused  0)",	"(unused  1)",	"(unused  2)",	"timer3",
 	"(unused  4)",	"(unused  5)",	"(unused  6)",	"jpeg",
 	"(unused  8)",	"usb",		"(unused 10)",	"(unused 11)",
 	"(unused 12)",	"(unused 13)",	"(unused 14)",	"(unused 15)",
-	"(unused 16)",	"(unused 17)",	"dma2",		"dma3",
+	"dma0",		"dma1",		"dma2",		"dma3",
-	"(unused 20)",	"(unused 21)",	"(unused 22)",	"(unused 23)",
+	"dma4",		"dma5",		"dma6",		"dma7",
-	"(unused 24)",	"(unused 25)",	"(unused 26)",	"(unused 27)",
+	"dma8",		"dma9",		"dma10",	"dma11",
-	"(unused 28)",	"aux",		"(unused 30)",	"(unused 31)",
+	"dma12",	"aux",		"(unused 30)",	"(unused 31)",
 	"(unused 32)",	"(unused 33)",	"(unused 34)",	"(unused 35)",
 	"(unused 36)",	"(unused 37)",	"(unused 38)",	"(unused 39)",
 	"(unused 40)",	"(unused 41)",	"(unused 42)",	"i2c spl slv",
 	"(unused 44)",	"pwa0",		"pwa1",		"(unused 47)",
 	"smi",		"gpio[0]",	"gpio[1]",	"gpio[2]",
 	"gpio[3]",	"i2c",		"spi",		"pcm",
 	"sdio",		"uart",		"(unused 58)",	"(unused 59)",
 	"(unused 60)",	"(unused 61)",	"emmc",		"(unused 63)",
 	"Timer",	"Mailbox",	"Doorbell0",	"Doorbell1",
 	"GPU0 Halted",	"GPU1 Halted",	"Illegal #1",	"Illegal #0"
 };
 #define	BCM2835_INTBIT_PENDING1		__BIT(8)
 @@ -162,27 +162,26 @@ bcm2835_irq_handler(void *frame)
 	ci->ci_data.cpu_nintr++;
 	bcm2835_barrier();
 	ipl_mask = bcm2835_pic_find_pending_irqs(&bcm2835_pic);
 	/*
 	 * Record the pending_ipls and deliver them if we can.
 	 */
 	if ((ipl_mask & ~oldipl_mask) > oldipl_mask)
 		pic_do_pending_ints(I32_bit, oldipl, frame);
+}
 static void
 bcm2835_pic_unblock_irqs(struct pic_softc *pic, size_t irqbase,
     uint32_t irq_mask)
+{
 	write_bcm2835reg(BCM2835_INTC_ENABLEBASE + (irqbase >> 3), irq_mask);
 	bcm2835_barrier();
+}
 static void
 bcm2835_pic_block_irqs(struct pic_softc *pic, size_t irqbase,
     uint32_t irq_mask)
+{