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

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

details:   https://anonhg.NetBSD.org/src/rev/b2b7e53c0ddf
branches:  netbsd-8
changeset: 453770:b2b7e53c0ddf
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Aug 12 17:19:02 2019 +0000

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

        sys/dev/usb/ohci.c: revision 1.289
        sys/dev/usb/ohci.c: revision 1.290

adjust KASSERT() for sc_lock to handle polling case.
should fix usb kdb in ddb.  reported by martin.

 -

relax an assert to be mutex_owned || polling.

half of the patch i sent for netbsd-8 in PR#54331.
the other half is already applied.

diffstat:

 sys/dev/usb/ohci.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r a07c93699b2b -r b2b7e53c0ddf sys/dev/usb/ohci.c
--- a/sys/dev/usb/ohci.c        Sun Aug 11 10:05:06 2019 +0000
+++ b/sys/dev/usb/ohci.c        Mon Aug 12 17:19:02 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ohci.c,v 1.273.6.4 2018/09/27 14:52:26 martin Exp $    */
+/*     $NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $    */
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.4 2018/09/27 14:52:26 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.273.6.5 2019/08/12 17:19:02 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -587,7 +587,7 @@
        OHCIHIST_FUNC(); OHCIHIST_CALLED();
        DPRINTF("start len=%jd", alen, 0, 0, 0);
 
-       KASSERT(mutex_owned(&sc->sc_lock));
+       KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 
        DPRINTFN(8, "addr=%jd endpt=%jd len=%jd speed=%jd",
            xfer->ux_pipe->up_dev->ud_addr,
@@ -1675,7 +1675,7 @@
        int isread =
            (UE_GET_DIR(xfer->ux_pipe->up_endpoint->ue_edesc->bEndpointAddress) == UE_DIR_IN);
 
-       KASSERT(mutex_owned(&sc->sc_lock));
+       KASSERT(sc->sc_bus.ub_usepolling || mutex_owned(&sc->sc_lock));
 
        OHCIHIST_FUNC(); OHCIHIST_CALLED();
        DPRINTFN(10, "xfer=%#jx, actlen=%jd", (uintptr_t)xfer, xfer->ux_actlen,