Module Name: src
Committed By: mlelstv
Date: Sun Dec 1 21:01:19 UTC 2019
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
Reset MCU ready status before resetting the MCU.
Fixes PR kern/54728
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.75 src/sys/dev/usb/if_urtwn.c:1.76
--- src/sys/dev/usb/if_urtwn.c:1.75 Tue Nov 26 10:34:16 2019
+++ src/sys/dev/usb/if_urtwn.c Sun Dec 1 21:01:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.75 2019/11/26 10:34:16 gson Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.76 2019/12/01 21:01:19 mlelstv 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.75 2019/11/26 10:34:16 gson Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.76 2019/12/01 21:01:19 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3467,6 +3467,8 @@ urtwn_load_firmware(struct urtwn_softc *
}
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);
