[src/netbsd-8]: src/sys/dev/isa Pull up following revision(s) (requested by y...

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

details:   https://anonhg.NetBSD.org/src/rev/211c78e78f0d
branches:  netbsd-8
changeset: 434954:211c78e78f0d
user:      martin <martin%NetBSD.org@localhost>
date:      Sat May 05 15:08:14 2018 +0000

description:
Pull up following revision(s) (requested by yamaguchi in ticket #789):

        sys/dev/isa/wbsio.c: revision 1.24

Use spin mutex to fix a panic

The GPIO part of wbsio(4) has a lock to keep the register access
order. In addition to the lock, gpio(4) has a look to prevent
multiple control through gpio_pin_ctl(). Those locks hold at
once when gpio_pin_ctl() is called, and the lock of gpio(4) hold
before that of wbsio(4).

Therefore, the wbsio(4) has to use spin lock if gpio(4) uses
spin lock.

diffstat:

 sys/dev/isa/wbsio.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 59eb2b6a720b -r 211c78e78f0d sys/dev/isa/wbsio.c
--- a/sys/dev/isa/wbsio.c       Sat May 05 15:05:39 2018 +0000
+++ b/sys/dev/isa/wbsio.c       Sat May 05 15:08:14 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: wbsio.c,v 1.10.10.3 2018/04/16 14:28:23 martin Exp $   */
+/*     $NetBSD: wbsio.c,v 1.10.10.4 2018/05/05 15:08:14 martin Exp $   */
 /*     $OpenBSD: wbsio.c,v 1.10 2015/03/14 03:38:47 jsg Exp $  */
 /*
  * Copyright (c) 2008 Mark Kettenis <kettenis%openbsd.org@localhost>
@@ -546,7 +546,7 @@
        aprint_normal_dev(sc->sc_dev, "GPIO: port 0x%x-0x%x\n",
            iobase, iobase + WBSIO_GPIO_IOSIZE);
 
-       mutex_init(&sc->sc_gpio_lock, MUTEX_DEFAULT, IPL_NONE);
+       mutex_init(&sc->sc_gpio_lock, MUTEX_DEFAULT, IPL_VM);
 
        return 0;
 }