[src/netbsd-8]: src/sys/dev/scsipi Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/b953677de21b
branches:  netbsd-8
changeset: 851982:b953677de21b
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Sep 07 12:21:13 2018 +0000

description:
Pull up following revision(s) (requested by mrg in ticket #1010):

        sys/dev/scsipi/scsipi_base.c: revision 1.178

Async event can be called before the adapter is running (pmax tc asc)

diffstat:

 sys/dev/scsipi/scsipi_base.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 952a922b976d -r b953677de21b sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Thu Sep 06 08:11:54 2018 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Fri Sep 07 12:21:13 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.175.8.1 2017/06/21 18:18:55 snj Exp $        */
+/*     $NetBSD: scsipi_base.c,v 1.175.8.2 2018/09/07 12:21:13 martin Exp $     */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.175.8.1 2017/06/21 18:18:55 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.175.8.2 2018/09/07 12:21:13 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_scsi.h"
@@ -2238,8 +2238,10 @@
 scsipi_async_event(struct scsipi_channel *chan, scsipi_async_event_t event,
     void *arg)
 {
+       bool lock = chan_running(chan) > 0;
 
-       mutex_enter(chan_mtx(chan));
+       if (lock)
+               mutex_enter(chan_mtx(chan));
        switch (event) {
        case ASYNC_EVENT_MAX_OPENINGS:
                scsipi_async_event_max_openings(chan,
@@ -2256,7 +2258,8 @@
                scsipi_async_event_channel_reset(chan);
                break;
        }
-       mutex_exit(chan_mtx(chan));
+       if (lock)
+               mutex_exit(chan_mtx(chan));
 }
 
 /*