Module Name: src
Committed By: marty
Date: Sun Jan 3 04:10:58 UTC 2016
Modified Files:
src/sys/arch/arm/samsung: exynos_combiner.c files.exynos mct.c
Added Files:
src/sys/arch/arm/samsung: exynos_sysmmu.c
Log Message:
XU4 interrupt combiner / fake sysmmu
Add sysmmu to have something that calls through to the combiner's establish
routine. Debug the combiner with it.
At this point the combiner is mostly done, but the interrupt handler has not
been tested. This may never happen as we may never support any of the
devices that use the combiner for interrupts. (Or maybe mct)
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/samsung/exynos_combiner.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/samsung/exynos_sysmmu.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/samsung/files.exynos
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/samsung/mct.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/samsung/exynos_combiner.c
diff -u src/sys/arch/arm/samsung/exynos_combiner.c:1.4 src/sys/arch/arm/samsung/exynos_combiner.c:1.5
--- src/sys/arch/arm/samsung/exynos_combiner.c:1.4 Wed Dec 30 04:30:27 2015
+++ src/sys/arch/arm/samsung/exynos_combiner.c Sun Jan 3 04:10:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_combiner.c,v 1.4 2015/12/30 04:30:27 marty Exp $ */
+/* $NetBSD: exynos_combiner.c,v 1.5 2016/01/03 04:10:58 marty Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.4 2015/12/30 04:30:27 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_combiner.c,v 1.5 2016/01/03 04:10:58 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -50,18 +50,37 @@ __KERNEL_RCSID(1, "$NetBSD: exynos_combi
#include <dev/fdt/fdtvar.h>
-#define COMBINER_IESR_OFFSET 0x00
-#define COMBINER_IECR_OFFSET 0x04
-#define COMBINER_ISTR_OFFSET 0x08
-#define COMBINER_IMSR_OFFSET 0x0C
-#define COMBINER_BLOCK_SIZE 0x10
+#define COMBINER_IESR_OFFSET 0x00
+#define COMBINER_IECR_OFFSET 0x04
+#define COMBINER_ISTR_OFFSET 0x08
+#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;
+};
+
+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;
+};
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 *);
@@ -93,8 +112,7 @@ exynos_combiner_match(device_t parent, c
static void
exynos_combiner_attach(device_t parent, device_t self, void *aux)
{
- struct exynos_combiner_softc * const sc
- = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ struct exynos_combiner_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
bus_addr_t addr;
bus_size_t size;
@@ -108,6 +126,7 @@ exynos_combiner_attach(device_t parent,
sc->sc_dev = self;
sc->sc_phandle = faa->faa_phandle;
sc->sc_bst = faa->faa_bst;
+ sc->irq_blocks = NULL;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
@@ -129,29 +148,149 @@ exynos_combiner_attach(device_t parent,
}
+static struct exynos_combiner_irq_block *
+exynos_combiner_new_block(struct exynos_combiner_softc *sc, int block_no)
+{
+ struct exynos_combiner_irq_block *n = kmem_zalloc(sizeof(*n),
+ KM_SLEEP);
+ n->irq_block_no = block_no;
+ n->irq_block_next = sc->irq_blocks;
+ sc->irq_blocks = n;
+ return n;
+}
+
+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)
+{
+ 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;
+ 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)
+{
+ 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)
+ e->irq_handler(e->irq_arg);
+ else
+ printf("%s: Unexpected irq %d, %d\n", __func__,
+ intr, irq);
+ }
+ }
+ return 0;
+}
+
static void *
exynos_combiner_establish(device_t dev, int phandle, u_int index, int ipl,
int flags,
int (*func)(void *), void *arg)
{
struct exynos_combiner_softc * const sc = device_private(dev);
- int iflags = (flags & FDT_INTR_MPSAFE) ? IST_MPSAFE : 0;
- int iblock = index >> 3;
- int ioffset = index & 0x07;
- int block_offset =
- iblock * COMBINER_BLOCK_SIZE + COMBINER_IESR_OFFSET;
+ struct exynos_combiner_irq_block *blockp;
+ struct exynos_combiner_irq_entry *entryp;
+ /* MJF: Most combiner clients don't have the #interrupt-cells prop. */
+ u_int *interrupts;
+ int interrupt_cells = 2;
+ int len = OF_getproplen(phandle, "interrupts");
+
+ if (len <= 0) {
+ printf("%s: phandle has no interrupts property.\n", __func__);
+ return NULL;
+ }
+
+ const u_int clen = interrupt_cells * 4;
+ const u_int nintr = len / interrupt_cells;
+
+ if (index >= nintr) {
+ printf("%s: asking for index %d but only %d entries.\n",
+ __func__, index, nintr);
+ return NULL;
+ }
+
+ interrupts = kmem_alloc(len, KM_SLEEP);
+
+ if (OF_getprop(phandle, "interrupts", interrupts, len) != len) {
+ kmem_free(interrupts, len);
+ return NULL;
+ }
+
+ /* 1st cell is the interrupt block */
+ /* 2nd cell is the interrupt number */
+
+ const u_int intr = be32toh(interrupts[index * clen + 0]);
+ const u_int irq = be32toh(interrupts[index * clen + 1]);
+
+ kmem_free(interrupts, len);
+
+ int iblock =
+ intr / COMBINER_BLOCKS_PER_GROUP * COMBINER_GROUP_SIZE
+ + COMBINER_IESR_OFFSET;
+
+ 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);
+ }
+
+ entryp = exynos_combiner_get_irq(blockp, irq);
+ if (entryp)
+ return NULL;
+ entryp = exynos_combiner_new_irq(blockp, irq, func, arg);
+ KASSERT(entryp);
+
int istatus =
- bus_space_read_4(sc->sc_bst, sc->sc_bsh, block_offset);
- printf("Establishing irq %d (0x%x) @ iblock = %d, ioffset = %d\n",
- index, index, iblock, ioffset);
- istatus |= 1 << ioffset;
- bus_space_write_4(sc->sc_bst, sc->sc_bsh, block_offset, istatus);
- return intr_establish(index, ipl, iflags, func, arg);
+ 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);
}
@@ -159,14 +298,8 @@ static bool
exynos_combiner_intrstr(device_t dev, int phandle, u_int index, char *buf,
size_t buflen)
{
- struct exynos_combiner_softc * const sc = device_private(dev);
u_int *interrupts;
- int interrupt_cells, len;
-
- if (of_getprop_uint32(sc->sc_phandle, "#interrupt-cells",
- &interrupt_cells)) {
- return false;
- }
+ int interrupt_cells = 2, len;
len = OF_getproplen(phandle, "interrupts");
if (len <= 0) {
@@ -187,17 +320,15 @@ exynos_combiner_intrstr(device_t dev, in
return false;
}
- /* 1st cell is the interrupt type; */
+ /* 1st cell is the interrupt block */
/* 2nd cell is the interrupt number */
- /* 3rd cell is flags */
- const u_int type = be32toh(interrupts[index * clen + 0]);
- const u_int intr = be32toh(interrupts[index * clen + 1]);
- const u_int irq = type == 0 ? IRQ_SPI(intr) : IRQ_PPI(intr);
+ const u_int intr = be32toh(interrupts[index * clen + 0]);
+ const u_int irq = be32toh(interrupts[index * clen + 1]);
kmem_free(interrupts, len);
- snprintf(buf, buflen, "combiner irq %d", irq);
+ snprintf(buf, buflen, "combiner intr %d irq %d", intr, irq);
return true;
}
Index: src/sys/arch/arm/samsung/files.exynos
diff -u src/sys/arch/arm/samsung/files.exynos:1.20 src/sys/arch/arm/samsung/files.exynos:1.21
--- src/sys/arch/arm/samsung/files.exynos:1.20 Sun Dec 27 02:54:12 2015
+++ src/sys/arch/arm/samsung/files.exynos Sun Jan 3 04:10:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: files.exynos,v 1.20 2015/12/27 02:54:12 marty Exp $
+# $NetBSD: files.exynos,v 1.21 2016/01/03 04:10:58 marty Exp $
#
# Configuration info for Samsung Exynos SoC ARM Peripherals
#
@@ -58,6 +58,11 @@ device chipid : fdtbus
attach chipid at fdt with exynos_chipid
file arch/arm/samsung/exynos_chipid.c exynos_chipid
+# SYSMMU
+device sysmmu : fdtbus
+attach sysmmu at fdt with exynos_sysmmu
+file arch/arm/samsung/exynos_sysmmu.c exynos_sysmmu
+
# real time clock
device exyortc : ftdbus
attach exyortc at fdt with exynos_rtc
Index: src/sys/arch/arm/samsung/mct.c
diff -u src/sys/arch/arm/samsung/mct.c:1.7 src/sys/arch/arm/samsung/mct.c:1.8
--- src/sys/arch/arm/samsung/mct.c:1.7 Mon Dec 21 00:54:35 2015
+++ src/sys/arch/arm/samsung/mct.c Sun Jan 3 04:10:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: mct.c,v 1.7 2015/12/21 00:54:35 marty Exp $ */
+/* $NetBSD: mct.c,v 1.8 2016/01/03 04:10:58 marty Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.7 2015/12/21 00:54:35 marty Exp $");
+__KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.8 2016/01/03 04:10:58 marty Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -54,7 +54,7 @@ __KERNEL_RCSID(1, "$NetBSD: mct.c,v 1.7
static int mct_match(device_t, cfdata_t, void *);
static void mct_attach(device_t, device_t, void *);
-static int clockhandler(void *);
+//static int clockhandler(void *);
CFATTACH_DECL_NEW(exyo_mct, 0, mct_match, mct_attach, NULL, NULL);
@@ -160,7 +160,7 @@ mct_attach(device_t parent, device_t sel
self->dv_private = sc;
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
- /* MJF: Need to get irq from the dtd */
+ /* MJF: Need to get irqs from the dtd */
// sc->sc_irq = exyo->exyo_loc.loc_intr;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
@@ -176,11 +176,11 @@ mct_attach(device_t parent, device_t sel
evcnt_attach_dynamic(&sc->sc_ev_missing_ticks, EVCNT_TYPE_MISC, NULL,
device_xname(self), "missing interrupts");
- sc->sc_global_ih = intr_establish(sc->sc_irq, IPL_CLOCK, IST_EDGE,
- clockhandler, NULL);
- if (sc->sc_global_ih == NULL)
- panic("%s: unable to register timer interrupt", __func__);
- aprint_normal_dev(sc->sc_dev, "interrupting on irq %d\n", sc->sc_irq);
+// sc->sc_global_ih = intr_establish(sc->sc_irq, IPL_CLOCK, IST_EDGE,
+// clockhandler, NULL);
+// if (sc->sc_global_ih == NULL)
+// panic("%s: unable to register timer interrupt", __func__);
+// aprint_normal_dev(sc->sc_dev, "interrupting on irq %d\n", sc->sc_irq);
}
@@ -196,6 +196,7 @@ mct_gettime(struct mct_softc *sc)
}
+#if 0
/* interrupt handler */
static int
clockhandler(void *arg)
@@ -222,7 +223,7 @@ clockhandler(void *arg)
/* handled */
return 1;
}
-
+#endif
void
mct_init_cpu_clock(struct cpu_info *ci)
Added files:
Index: src/sys/arch/arm/samsung/exynos_sysmmu.c
diff -u /dev/null src/sys/arch/arm/samsung/exynos_sysmmu.c:1.1
--- /dev/null Sun Jan 3 04:10:58 2016
+++ src/sys/arch/arm/samsung/exynos_sysmmu.c Sun Jan 3 04:10:58 2016
@@ -0,0 +1,130 @@
+/* $NetBSD: exynos_sysmmu.c,v 1.1 2016/01/03 04:10:58 marty 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.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+* ``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 "opt_exynos.h"
+#include "opt_arm_debug.h"
+#include "gpio.h"
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(1, "$NetBSD: exynos_sysmmu.c,v 1.1 2016/01/03 04:10:58 marty 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 <sys/gpio.h>
+
+#include <dev/gpio/gpiovar.h>
+
+#include <arm/samsung/exynos_reg.h>
+#include <arm/samsung/exynos_intr.h>
+
+#include <dev/fdt/fdtvar.h>
+
+struct exynos_sysmmu_softc {
+ device_t sc_dev;
+ bus_space_tag_t sc_bst;
+ bus_space_handle_t sc_bsh;
+ void * sc_ih;
+
+};
+
+static int exynos_sysmmu_match(device_t, cfdata_t, void *);
+static void exynos_sysmmu_attach(device_t, device_t, void *);
+
+static int exynos_sysmmu_intr(void *);
+
+CFATTACH_DECL_NEW(exynos_sysmmu, sizeof(struct exynos_sysmmu_softc),
+ exynos_sysmmu_match, exynos_sysmmu_attach, NULL, NULL);
+
+static int
+exynos_sysmmu_match(device_t parent, cfdata_t cf, void *aux)
+{
+ const char * const compatible[] = { "samsung,exynos-sysmmu",
+ NULL };
+ struct fdt_attach_args * const faa = aux;
+ return of_match_compatible(faa->faa_phandle, compatible);
+}
+
+static void
+exynos_sysmmu_attach(device_t parent, device_t self, void *aux)
+{
+ struct exynos_sysmmu_softc * const sc
+ = kmem_zalloc(sizeof(*sc), KM_SLEEP);
+ struct fdt_attach_args * const faa = aux;
+
+ char intrstr[128];
+ bus_addr_t addr;
+ bus_size_t size;
+ int error;
+
+ if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
+ aprint_error(": couldn't get registers\n");
+ return;
+ }
+
+ sc->sc_dev = self;
+ sc->sc_bst = faa->faa_bst;
+ error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
+ if (error) {
+ aprint_error(": couldn't map %#llx: %d",
+ (uint64_t)addr, error);
+ return;
+ }
+
+ if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
+ aprint_error_dev(self, "failed to decode interrupt\n");
+ return;
+ }
+
+ sc->sc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_VM,
+ FDT_INTR_MPSAFE, exynos_sysmmu_intr, sc);
+ if (sc->sc_ih == NULL) {
+ aprint_error_dev(self, "couldn't establish interrupt on %s\n",
+ intrstr);
+ return;
+ }
+ aprint_normal_dev(self, "interrupting on %s\n", intrstr);
+
+ aprint_normal(" @ 0x%08x: SYSMMU - NOT IMPLEMENTED", (uint)addr);
+ aprint_naive("\n");
+ aprint_normal("\n");
+
+}
+
+static int
+exynos_sysmmu_intr(void *priv)
+{
+ printf("%s: Unexpected interrupt\n", __func__);
+ return 0;
+}
