[src/netbsd-7]: src/sys/arch/arm/omap Pull up following revision(s) (requeste...

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

details:   https://anonhg.NetBSD.org/src/rev/f847c6802eb6
branches:  netbsd-7
changeset: 800203:f847c6802eb6
user:      snj <snj%NetBSD.org@localhost>
date:      Fri May 12 05:17:40 2017 +0000

description:
Pull up following revision(s) (requested by sevan in ticket #1387):
        sys/arch/arm/omap/omap_edma.c: revision 1.4 via patch
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 7acb6cf74784 -r f847c6802eb6 sys/arch/arm/omap/omap_edma.c
--- a/sys/arch/arm/omap/omap_edma.c     Fri May 12 05:12:58 2017 +0000
+++ b/sys/arch/arm/omap/omap_edma.c     Fri May 12 05:17:40 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: omap_edma.c,v 1.1.2.2 2015/04/19 04:37:17 msaitoh Exp $ */
+/* $NetBSD: omap_edma.c,v 1.1.2.3 2017/05/12 05:17:40 snj 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.1.2.2 2015/04/19 04:37:17 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: omap_edma.c,v 1.1.2.3 2017/05/12 05:17:40 snj Exp $");
 
 #include "opt_omap.h"
 
@@ -141,7 +141,7 @@
 
        sc->sc_dev = self;
        sc->sc_iot = obio->obio_iot;
-       mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_SCHED);
+       mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
        if (bus_space_map(obio->obio_iot, obio->obio_addr, obio->obio_size,
            0, &sc->sc_ioh) != 0) {
                aprint_error(": couldn't map address spcae\n");
@@ -164,13 +164,13 @@
        edma_init(sc);
 
        sc->sc_ih = intr_establish(obio->obio_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(obio->obio_intrbase + 1,
-           IPL_SCHED, IST_LEVEL, edma_mperr_intr, sc);
+           IPL_VM, IST_LEVEL, edma_mperr_intr, sc);
        sc->sc_errint_ih = intr_establish(obio->obio_intrbase + 2,
-           IPL_SCHED, IST_LEVEL, edma_errint_intr, sc);
+           IPL_VM, IST_LEVEL, edma_errint_intr, sc);
 }
 
 /*