 @@ -1,14 +1,14 @@
-/*	$NetBSD: exynos_combiner.c,v 1.6 2016/01/05 21:53:48 marty Exp $ */
+/*	$NetBSD: exynos_combiner.c,v 1.7 2017/06/11 16:19:27 jmcneill Exp $ */
 /*-
 * Copyright (c) 2015 The NetBSD Foundation, Inc.
 * All rights reserved.
+*
 * This code is derived from software contributed to The NetBSD Foundation
 * by Marty Fouts
+*
 * 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.
 @@ -24,27 +24,27 @@
 * 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 "opt_exynos.h"
 #include "opt_arm_debug.h"
 #include "gpio.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.6 2016/01/05 21:53:48 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.7 2017/06/11 16:19:27 jmcneill Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/intr.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <arm/cortex/gic_intr.h>
 #include <arm/samsung/exynos_reg.h>
 #include <arm/samsung/exynos_intr.h>
 @@ -56,33 +56,35 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_combi
 #define COMBINER_IMSR_OFFSET   0x0C
 #define COMBINER_GROUP_SIZE    0x10
 #define COMBINER_IRQS_PER_BLOCK   8
 #define COMBINER_BLOCKS_PER_GROUP 4
 #define COMBINER_N_BLOCKS        32
 struct exynos_combiner_softc;
 struct exynos_combiner_irq_entry {
 	int				irq_no;
 	int (*irq_handler)(void *);
 	void *				irq_arg;
 	struct exynos_combiner_irq_entry *irq_next;
 	bool				irq_mpsafe;
 };
 struct exynos_combiner_irq_block {
 	int irq_block_no;
 	struct exynos_combiner_softc	*irq_sc;
 	struct exynos_combiner_irq_entry *irq_entries;
 	struct exynos_combiner_irq_block *irq_block_next;
 	void *irq_ih;
 };
 struct exynos_combiner_softc {
 	device_t		sc_dev;
 	bus_space_tag_t		sc_bst;
 	bus_space_handle_t	sc_bsh;
 	int			sc_phandle;
 	struct exynos_combiner_irq_block *irq_blocks;
 };
 static int exynos_combiner_match(device_t, cfdata_t, void *);
 static void exynos_combiner_attach(device_t, device_t, void *);
 @@ -163,116 +165,124 @@ exynos_combiner_new_block(struct exynos_
 static struct exynos_combiner_irq_block *
 exynos_combiner_get_block(struct exynos_combiner_softc *sc, int block)
+{
 	for (struct exynos_combiner_irq_block *b = sc->irq_blocks;
 	     b; b = b->irq_block_next) {
 		if (b->irq_block_no == block)
 			return b;
+	}
 	return NULL;
+}
 static struct exynos_combiner_irq_entry *
 exynos_combiner_new_irq(struct exynos_combiner_irq_block *block,
-			int irq, int (*func)(void *), void *arg)
+			int irq, bool mpsafe, int (*func)(void *), void *arg)
+{
 	struct exynos_combiner_irq_entry * n = kmem_zalloc(sizeof(*n),
 							   KM_SLEEP);
 	n->irq_no = irq;
 	n->irq_handler = func;
 	n->irq_next = block->irq_entries;
 	n->irq_arg = arg;
 	n->irq_mpsafe = mpsafe;
 	block->irq_entries = n;
 	return n;
+}
 static struct exynos_combiner_irq_entry *
 exynos_combiner_get_irq(struct exynos_combiner_irq_block *b, int irq)
+{
 	for (struct exynos_combiner_irq_entry *p = b->irq_entries; p;
 	     p = p->irq_next) {
 		if (p->irq_no == irq)
 			return p;
+	}
 	return NULL;
+}
-static int exynos_combiner_irq(void *cookie)
+static int
 exynos_combiner_irq(void *cookie)
+{
 	struct exynos_combiner_irq_block *blockp = cookie;
 	struct exynos_combiner_softc *sc = blockp->irq_sc;
 	int intr = blockp->irq_block_no;
 	int iblock =
 		intr / COMBINER_BLOCKS_PER_GROUP * COMBINER_GROUP_SIZE
 		+ COMBINER_IESR_OFFSET;
 	int istatus =
 		bus_space_read_4(sc->sc_bst, sc->sc_bsh, iblock);
 	istatus >>= (intr % 4) *8;
 	for (int irq = 0; irq < 8; irq++) {
 		if (istatus & 1 << irq) {
 			struct exynos_combiner_irq_entry *e =
 				exynos_combiner_get_irq(blockp, irq);
-			if (e)
+			if (e) {
 				if (!e->irq_mpsafe)
 					KERNEL_LOCK(1, curlwp);
 				e->irq_handler(e->irq_arg);
-			else
+				if (!e->irq_mpsafe)
 					KERNEL_UNLOCK_ONE(curlwp);
 			} else
 				printf("%s: Unexpected irq %d, %d\n", __func__,
 				       intr, irq);
+		}
+	}
 	return 0;
+}
 static void *
 exynos_combiner_establish(device_t dev, u_int *specifier,
 			  int ipl, int flags,
 			  int (*func)(void *), void *arg)
+{
 	struct exynos_combiner_softc * const sc = device_private(dev);
 	struct exynos_combiner_irq_block *blockp;
 	struct exynos_combiner_irq_entry *entryp;
 	const bool mpsafe = (flags & FDT_INTR_MPSAFE) != 0;
 	const u_int intr = be32toh(specifier[0]);
 	const u_int irq = be32toh(specifier[1]);
 	int iblock =
 		intr / COMBINER_BLOCKS_PER_GROUP * COMBINER_GROUP_SIZE
 		+ COMBINER_IESR_OFFSET;
-	blockp =  exynos_combiner_get_block(sc, intr);
+	blockp = exynos_combiner_get_block(sc, intr);
 	if (!blockp) {
 		blockp = exynos_combiner_new_block(sc, intr);
 		KASSERT(blockp);
-		intr_establish(intr, ipl, IST_LEVEL, exynos_combiner_irq,
+		blockp->irq_ih = fdtbus_intr_establish(sc->sc_phandle, intr,
-			       blockp);
+		    IPL_VM /* XXX */, FDT_INTR_MPSAFE, exynos_combiner_irq,
 		    blockp);
+	}
 	entryp = exynos_combiner_get_irq(blockp, irq);
 	if (entryp)
 		return NULL;
-	entryp = exynos_combiner_new_irq(blockp, irq, func, arg);
+	entryp = exynos_combiner_new_irq(blockp, irq, mpsafe, func, arg);
 	KASSERT(entryp);
 	int istatus =
 		bus_space_read_4(sc->sc_bst, sc->sc_bsh, iblock);
 	istatus |= 1 << (irq + ((intr % 4) * 8));
 	bus_space_write_4(sc->sc_bst, sc->sc_bsh, iblock, istatus);
 	return (void *)istatus;
+}
 static void
 exynos_combiner_disestablish(device_t dev, void *ih)
+{
 	/* MJF: Find the ih and disable the handler. */
-	intr_disestablish(ih);
+	panic("exynos_combiner_disestablish not implemented");
+}
 static bool
 exynos_combiner_intrstr(device_t dev, u_int *specifier, char *buf,
 			size_t buflen)
+{
 	/* 1st cell is the interrupt block */
 	/* 2nd cell is the interrupt number */
 	const u_int intr = be32toh(specifier[0]);
 	const u_int irq = be32toh(specifier[1]);