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

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

details:   https://anonhg.NetBSD.org/src/rev/b1e0ef4a5968
branches:  netbsd-9
changeset: 466159:b1e0ef4a5968
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Dec 14 12:26:05 2019 +0000

description:
Pull up following revision(s) (requested by mlelstv in ticket #551):

        sys/dev/usb/if_urtwn.c: revision 1.76
        sys/dev/usb/if_urtwn.c: revision 1.77

Reset MCU ready status before resetting the MCU.

Fixes PR kern/54728

Don't deregister twice with pmf.

diffstat:

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

diffs (36 lines):

diff -r 082a2d701e57 -r b1e0ef4a5968 sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Sat Dec 14 12:24:23 2019 +0000
+++ b/sys/dev/usb/if_urtwn.c    Sat Dec 14 12:26:05 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_urtwn.c,v 1.71.2.1 2019/09/01 13:00:36 martin Exp $ */
+/*     $NetBSD: if_urtwn.c,v 1.71.2.2 2019/12/14 12:26:05 martin Exp $ */
 /*     $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $       */
 
 /*-
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.1 2019/09/01 13:00:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.71.2.2 2019/12/14 12:26:05 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -550,8 +550,6 @@
        callout_halt(&sc->sc_scan_to, NULL);
        callout_halt(&sc->sc_calib_to, NULL);
 
-       pmf_device_deregister(self);
-
        if (ISSET(sc->sc_flags, URTWN_FLAG_ATTACHED)) {
                urtwn_stop(ifp, 0);
                usb_rem_task_wait(sc->sc_udev, &sc->sc_task, USB_TASKQ_DRIVER,
@@ -3463,6 +3461,8 @@
        }
 
        if (urtwn_read_1(sc, R92C_MCUFWDL) & R92C_MCUFWDL_RAM_DL_SEL) {
+               /* Reset MCU ready status */
+               urtwn_write_1(sc, R92C_MCUFWDL, 0);
                if (ISSET(sc->chip, URTWN_CHIP_88E) ||
                    ISSET(sc->chip, URTWN_CHIP_92EU))
                        urtwn_r88e_fw_reset(sc);