svn commit: r354510 - head/sys/dev/iwm

[Mark Johnston]

Author: markj
Date: Thu Nov  7 23:37:30 2019
New Revision: 354510
URL: https://svnweb.freebsd.org/changeset/base/354510

Log:
  iwm: Sync with iwm_run_init_mvm_ucode() with iwlwifi.
  
  Do not configure bluetooth on newer chips, it causes firmware panics.
  
  MFC after:	2 weeks
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c	Thu Nov  7 23:37:17 2019	(r354509)
+++ head/sys/dev/iwm/if_iwm.c	Thu Nov  7 23:37:30 2019	(r354510)
@@ -3002,6 +3002,15 @@ iwm_run_init_mvm_ucode(struct iwm_softc *sc, int justn
 		goto error;
 	}
 
+	if (sc->cfg->device_family < IWM_DEVICE_FAMILY_8000) {
+		ret = iwm_send_bt_init_conf(sc);
+		if (ret) {
+			device_printf(sc->sc_dev,
+			    "failed to send bt coex configuration: %d\n", ret);
+			goto error;
+		}
+	}
+
 	if (justnvm) {
 		/* Read nvm */
 		ret = iwm_nvm_init(sc);
@@ -3010,13 +3019,6 @@ iwm_run_init_mvm_ucode(struct iwm_softc *sc, int justn
 			goto error;
 		}
 		IEEE80211_ADDR_COPY(sc->sc_ic.ic_macaddr, sc->nvm_data->hw_addr);
-		goto error;
-	}
-
-	ret = iwm_send_bt_init_conf(sc);
-	if (ret) {
-		device_printf(sc->sc_dev,
-		    "failed to send bt coex configuration: %d\n", ret);
 		goto error;
 	}