Make the iwx(4) mac context task send its command only if we are still in

RUN state when the task gets to run. Fixes fatal firmware errors where
mac context updates were erroneously sent in states other than RUN state.

Additionally, avoid scheduling a mac context task if a pending newstate
task is going to move us out of RUN state anyway.

Issue debugged by zxystd in OpenIntelWireless itlwm; patch by me.

diff --git a/sys/dev/pci/if_iwx.c b/sys/dev/pci/if_iwx.c
index 8761374..6d8c82c 100644 (file)
--- a/sys/dev/pci/if_iwx.c
+++ b/sys/dev/pci/if_iwx.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_iwx.c,v 1.60 2021/06/30 09:46:46 stsp Exp $        */
+/*     $OpenBSD: if_iwx.c,v 1.61 2021/06/30 09:47:20 stsp Exp $        */
 
 /*
  * Copyright (c) 2014, 2016 genua gmbh <info@genua.de>
@@ -2947,7 +2947,8 @@ iwx_mac_ctxt_task(void *arg)
        struct iwx_node *in = (void *)ic->ic_bss;
        int err, s = splnet();
 
-       if (sc->sc_flags & IWX_FLAG_SHUTDOWN) {
+       if ((sc->sc_flags & IWX_FLAG_SHUTDOWN) ||
+           ic->ic_state != IEEE80211_S_RUN) {
                refcnt_rele_wake(&sc->task_refs);
                splx(s);
                return;
@@ -2966,7 +2967,8 @@ iwx_updateprot(struct ieee80211com *ic)
 {
        struct iwx_softc *sc = ic->ic_softc;
 
-       if (ic->ic_state == IEEE80211_S_RUN)
+       if (ic->ic_state == IEEE80211_S_RUN &&
+           !task_pending(&sc->newstate_task))
                iwx_add_task(sc, systq, &sc->mac_ctxt_task);
 }
 
@@ -2975,7 +2977,8 @@ iwx_updateslot(struct ieee80211com *ic)
 {
        struct iwx_softc *sc = ic->ic_softc;
 
-       if (ic->ic_state == IEEE80211_S_RUN)
+       if (ic->ic_state == IEEE80211_S_RUN &&
+           !task_pending(&sc->newstate_task))
                iwx_add_task(sc, systq, &sc->mac_ctxt_task);
 }
 
@@ -2984,7 +2987,8 @@ iwx_updateedca(struct ieee80211com *ic)
 {
        struct iwx_softc *sc = ic->ic_softc;
 
-       if (ic->ic_state == IEEE80211_S_RUN)
+       if (ic->ic_state == IEEE80211_S_RUN &&
+           !task_pending(&sc->newstate_task))
                iwx_add_task(sc, systq, &sc->mac_ctxt_task);
 }