[src/trunk]: src/sys/arch/arm/omap PR/51380: Mutex error: mutex_vector_enter:...

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

details:   https://anonhg.NetBSD.org/src/rev/b994c6a67a3d
branches:  trunk
changeset: 822337:b994c6a67a3d
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Mar 14 15:11:41 2017 +0000

description:
PR/51380: Mutex error: mutex_vector_enter: locking against myself

Change the interrupt handler IPL level to IPL_VM (aka IPL_BIO aka
IPL_SDMMC) so that the sdhc_host_lock prevents edma_intr from running

diffstat:

 sys/arch/arm/omap/omap_edma.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (44 lines):

diff -r 993338ec458e -r b994c6a67a3d sys/arch/arm/omap/omap_edma.c
--- a/sys/arch/arm/omap/omap_edma.c     Tue Mar 14 14:05:52 2017 +0000
+++ b/sys/arch/arm/omap/omap_edma.c     Tue Mar 14 15:11:41 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_edma.c,v 1.3 2016/07/09 15:04:06 kiyohara Exp $ */
+/* $NetBSD: omap_edma.c,v 1.4 2017/03/14 15:11:41 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: omap_edma.c,v 1.3 2016/07/09 15:04:06 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_edma.c,v 1.4 2017/03/14 15:11:41 skrll Exp $");
 
 #include "opt_omap.h"
 
@@ -143,7 +143,7 @@
 
        sc->sc_dev = self;
        sc->sc_iot = &omap_bs_tag;
-       mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
+       mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
        if (bus_space_map(sc->sc_iot, mb->mb_iobase, mb->mb_iosize,
            0, &sc->sc_ioh) != 0) {
                aprint_error(": couldn't map address spcae\n");
@@ -166,13 +166,13 @@
        edma_init(sc);
 
        sc->sc_ih = intr_establish(mb->mb_intrbase + 0,
-           IPL_SCHED, IST_LEVEL, edma_intr, sc);
+           IPL_VM, IST_LEVEL | IST_MPSAFE, edma_intr, sc);
        KASSERT(sc->sc_ih != NULL);
 
        sc->sc_mperr_ih = intr_establish(mb->mb_intrbase + 1,
-           IPL_SCHED, IST_LEVEL, edma_mperr_intr, sc);
+           IPL_VM, IST_LEVEL, edma_mperr_intr, sc);
        sc->sc_errint_ih = intr_establish(mb->mb_intrbase + 2,
-           IPL_SCHED, IST_LEVEL, edma_errint_intr, sc);
+           IPL_VM, IST_LEVEL, edma_errint_intr, sc);
 }
 
 /*