ath9k: add more pending locking fixes - fixes tx dma hang issues on reset
authorFelix Fietkau <nbd@openwrt.org>
Wed, 27 Oct 2010 00:43:11 +0000 (00:43 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 27 Oct 2010 00:43:11 +0000 (00:43 +0000)
SVN-Revision: 23649

package/mac80211/patches/530-ath9k_locking_fix.patch
package/mac80211/patches/570-ath9k_reset_aggr_fix.patch

index fef36ec..2930332 100644 (file)
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -309,8 +309,8 @@ struct ath_rx {
+@@ -309,7 +309,6 @@ struct ath_rx {
        u8 rxotherant;
        u32 *rxlink;
        unsigned int rxfilter;
 -      spinlock_t rxflushlock;
        spinlock_t rxbuflock;
-+      spinlock_t pcu_lock;
        struct list_head rxbuf;
        struct ath_descdma rxdma;
-       struct ath_buf *rx_bufptr;
+@@ -600,9 +599,9 @@ struct ath_softc {
+       struct ath_hw *sc_ah;
+       void __iomem *mem;
+       int irq;
+-      spinlock_t sc_resetlock;
+       spinlock_t sc_serial_rw;
+       spinlock_t sc_pm_lock;
++      spinlock_t sc_pcu_lock;
+       struct mutex mutex;
+       struct work_struct paprd_work;
+       struct work_struct hw_check_work;
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -239,6 +239,9 @@ int ath_set_channel(struct ath_softc *sc
+@@ -228,6 +228,8 @@ int ath_set_channel(struct ath_softc *sc
+       ath9k_ps_wakeup(sc);
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       /*
+        * This is only performed if the channel settings have
+        * actually changed.
+@@ -239,6 +241,7 @@ int ath_set_channel(struct ath_softc *sc
         */
        ath9k_hw_disable_interrupts(ah);
        ath_drain_all_txq(sc, false);
-+
-+      spin_lock_bh(&sc->rx.pcu_lock);
 +
        stopped = ath_stoprecv(sc);
  
        /* XXX: do not flush receive queue here. We don't want
-@@ -266,6 +269,7 @@ int ath_set_channel(struct ath_softc *sc
+@@ -257,18 +260,14 @@ int ath_set_channel(struct ath_softc *sc
+                 channel->center_freq, conf_is_ht40(conf),
+                 fastcc);
+-      spin_lock_bh(&sc->sc_resetlock);
+-
+       r = ath9k_hw_reset(ah, hchan, caldata, fastcc);
+       if (r) {
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to reset channel (%u MHz), "
                          "reset status %d\n",
                          channel->center_freq, r);
-               spin_unlock_bh(&sc->sc_resetlock);
-+              spin_unlock_bh(&sc->rx.pcu_lock);
+-              spin_unlock_bh(&sc->sc_resetlock);
                goto ps_restore;
        }
-       spin_unlock_bh(&sc->sc_resetlock);
-@@ -274,9 +278,12 @@ int ath_set_channel(struct ath_softc *sc
+-      spin_unlock_bh(&sc->sc_resetlock);
+       if (ath_startrecv(sc) != 0) {
                ath_print(common, ATH_DBG_FATAL,
-                         "Unable to restart recv logic\n");
-               r = -EIO;
-+              spin_unlock_bh(&sc->rx.pcu_lock);
-               goto ps_restore;
+@@ -287,6 +286,8 @@ int ath_set_channel(struct ath_softc *sc
        }
  
-+      spin_unlock_bh(&sc->rx.pcu_lock);
+  ps_restore:
++      spin_unlock_bh(&sc->sc_pcu_lock);
 +
-       ath_update_txpow(sc);
-       ath9k_hw_set_interrupts(ah, ah->imask);
+       ath9k_ps_restore(sc);
+       return r;
+ }
+@@ -600,6 +601,8 @@ void ath9k_tasklet(unsigned long data)
+               return;
+       }
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       if (!ath9k_hw_check_alive(ah))
+               ieee80211_queue_work(sc->hw, &sc->hw_check_work);
  
-@@ -610,7 +617,7 @@ void ath9k_tasklet(unsigned long data)
+@@ -610,15 +613,12 @@ void ath9k_tasklet(unsigned long data)
                rxmask = (ATH9K_INT_RX | ATH9K_INT_RXEOL | ATH9K_INT_RXORN);
  
        if (status & rxmask) {
 -              spin_lock_bh(&sc->rx.rxflushlock);
-+              spin_lock_bh(&sc->rx.pcu_lock);
+-
                /* Check for high priority Rx first */
                if ((ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) &&
-@@ -618,7 +625,7 @@ void ath9k_tasklet(unsigned long data)
+                   (status & ATH9K_INT_RXHP))
                        ath_rx_tasklet(sc, 0, true);
  
                ath_rx_tasklet(sc, 0, false);
 -              spin_unlock_bh(&sc->rx.rxflushlock);
-+              spin_unlock_bh(&sc->rx.pcu_lock);
        }
  
        if (status & ATH9K_INT_TX) {
-@@ -876,6 +883,7 @@ void ath_radio_enable(struct ath_softc *
+@@ -644,6 +644,8 @@ void ath9k_tasklet(unsigned long data)
+       /* re-enable hardware interrupt */
+       ath9k_hw_enable_interrupts(ah);
++
++      spin_unlock_bh(&sc->sc_pcu_lock);
+       ath9k_ps_restore(sc);
+ }
+@@ -871,12 +873,13 @@ void ath_radio_enable(struct ath_softc *
+       int r;
+       ath9k_ps_wakeup(sc);
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       ath9k_hw_configpcipowersave(ah, 0, 0);
        if (!ah->curchan)
                ah->curchan = ath_get_curchannel(sc, sc->hw);
  
-+      spin_lock_bh(&sc->rx.pcu_lock);
-       spin_lock_bh(&sc->sc_resetlock);
+-      spin_lock_bh(&sc->sc_resetlock);
        r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
        if (r) {
-@@ -890,8 +898,10 @@ void ath_radio_enable(struct ath_softc *
+               ath_print(common, ATH_DBG_FATAL,
+@@ -884,15 +887,14 @@ void ath_radio_enable(struct ath_softc *
+                         "reset status %d\n",
+                         channel->center_freq, r);
+       }
+-      spin_unlock_bh(&sc->sc_resetlock);
+       ath_update_txpow(sc);
        if (ath_startrecv(sc) != 0) {
                ath_print(common, ATH_DBG_FATAL,
                          "Unable to restart recv logic\n");
-+              spin_unlock_bh(&sc->rx.pcu_lock);
++              spin_unlock_bh(&sc->sc_pcu_lock);
                return;
        }
-+      spin_unlock_bh(&sc->rx.pcu_lock);
+-
        if (sc->sc_flags & SC_OP_BEACONS)
                ath_beacon_config(sc, NULL);    /* restart beacons */
-@@ -930,6 +940,9 @@ void ath_radio_disable(struct ath_softc 
+@@ -905,6 +907,8 @@ void ath_radio_enable(struct ath_softc *
+       ath9k_hw_set_gpio(ah, ah->led_pin, 0);
+       ieee80211_wake_queues(hw);
++      spin_unlock_bh(&sc->sc_pcu_lock);
++
+       ath9k_ps_restore(sc);
+ }
+@@ -915,6 +919,8 @@ void ath_radio_disable(struct ath_softc 
+       int r;
+       ath9k_ps_wakeup(sc);
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       ieee80211_stop_queues(hw);
+       /*
+@@ -930,13 +936,13 @@ void ath_radio_disable(struct ath_softc 
        ath9k_hw_disable_interrupts(ah);
  
        ath_drain_all_txq(sc, false);   /* clear pending tx frames */
-+
-+      spin_lock_bh(&sc->rx.pcu_lock);
 +
        ath_stoprecv(sc);               /* turn off frame recv */
        ath_flushrecv(sc);              /* flush recv queue */
  
-@@ -947,6 +960,9 @@ void ath_radio_disable(struct ath_softc 
-       spin_unlock_bh(&sc->sc_resetlock);
+       if (!ah->curchan)
+               ah->curchan = ath_get_curchannel(sc, hw);
+-      spin_lock_bh(&sc->sc_resetlock);
+       r = ath9k_hw_reset(ah, ah->curchan, ah->caldata, false);
+       if (r) {
+               ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_FATAL,
+@@ -944,11 +950,14 @@ void ath_radio_disable(struct ath_softc 
+                         "reset status %d\n",
+                         channel->center_freq, r);
+       }
+-      spin_unlock_bh(&sc->sc_resetlock);
  
        ath9k_hw_phy_disable(ah);
-+
-+      spin_unlock_bh(&sc->rx.pcu_lock);
 +
        ath9k_hw_configpcipowersave(ah, 1, 1);
++
++      spin_unlock_bh(&sc->sc_pcu_lock);
        ath9k_ps_restore(sc);
++
        ath9k_setpower(sc, ATH9K_PM_FULL_SLEEP);
-@@ -966,6 +982,9 @@ int ath_reset(struct ath_softc *sc, bool
+ }
+@@ -962,19 +971,20 @@ int ath_reset(struct ath_softc *sc, bool
+       /* Stop ANI */
+       del_timer_sync(&common->ani.timer);
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       ieee80211_stop_queues(hw);
  
        ath9k_hw_disable_interrupts(ah);
        ath_drain_all_txq(sc, retry_tx);
-+
-+      spin_lock_bh(&sc->rx.pcu_lock);
 +
        ath_stoprecv(sc);
        ath_flushrecv(sc);
  
-@@ -980,6 +999,8 @@ int ath_reset(struct ath_softc *sc, bool
+-      spin_lock_bh(&sc->sc_resetlock);
+       r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
+       if (r)
                ath_print(common, ATH_DBG_FATAL,
-                         "Unable to start recv logic\n");
+                         "Unable to reset hardware; reset status %d\n", r);
+-      spin_unlock_bh(&sc->sc_resetlock);
  
-+      spin_unlock_bh(&sc->rx.pcu_lock);
-+
-       /*
-        * We may be doing a reset in response to a request
-        * that changes the channel so update any state that
-@@ -1142,6 +1163,7 @@ static int ath9k_start(struct ieee80211_
+       if (ath_startrecv(sc) != 0)
+               ath_print(common, ATH_DBG_FATAL,
+@@ -1004,6 +1014,7 @@ int ath_reset(struct ath_softc *sc, bool
+       }
+       ieee80211_wake_queues(hw);
++      spin_unlock_bh(&sc->sc_pcu_lock);
+       /* Start ANI */
+       ath_start_ani(common);
+@@ -1142,17 +1153,16 @@ static int ath9k_start(struct ieee80211_
         * be followed by initialization of the appropriate bits
         * and then setup of the interrupt mask.
         */
-+      spin_lock_bh(&sc->rx.pcu_lock);
-       spin_lock_bh(&sc->sc_resetlock);
+-      spin_lock_bh(&sc->sc_resetlock);
++      spin_lock_bh(&sc->sc_pcu_lock);
        r = ath9k_hw_reset(ah, init_channel, ah->caldata, false);
        if (r) {
-@@ -1150,6 +1172,7 @@ static int ath9k_start(struct ieee80211_
+               ath_print(common, ATH_DBG_FATAL,
+                         "Unable to reset hardware; reset status %d "
                          "(freq %u MHz)\n", r,
                          curchan->center_freq);
-               spin_unlock_bh(&sc->sc_resetlock);
-+              spin_unlock_bh(&sc->rx.pcu_lock);
+-              spin_unlock_bh(&sc->sc_resetlock);
++              spin_unlock_bh(&sc->sc_pcu_lock);
                goto mutex_unlock;
        }
-       spin_unlock_bh(&sc->sc_resetlock);
-@@ -1171,8 +1194,10 @@ static int ath9k_start(struct ieee80211_
+-      spin_unlock_bh(&sc->sc_resetlock);
+       /*
+        * This is needed only to setup initial state
+@@ -1171,8 +1181,10 @@ static int ath9k_start(struct ieee80211_
                ath_print(common, ATH_DBG_FATAL,
                          "Unable to start recv logic\n");
                r = -EIO;
-+              spin_unlock_bh(&sc->rx.pcu_lock);
++              spin_unlock_bh(&sc->sc_pcu_lock);
                goto mutex_unlock;
        }
-+      spin_unlock_bh(&sc->rx.pcu_lock);
++      spin_unlock_bh(&sc->sc_pcu_lock);
  
        /* Setup our intr mask. */
        ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
-@@ -1371,12 +1396,14 @@ static void ath9k_stop(struct ieee80211_
+@@ -1367,6 +1379,8 @@ static void ath9k_stop(struct ieee80211_
+                       ath9k_btcoex_timer_pause(sc);
+       }
++      spin_lock_bh(&sc->sc_pcu_lock);
++
+       /* make sure h/w will not generate any interrupt
         * before setting the invalid flag. */
        ath9k_hw_disable_interrupts(ah);
-+      spin_lock_bh(&sc->rx.pcu_lock);
-       if (!(sc->sc_flags & SC_OP_INVALID)) {
-               ath_drain_all_txq(sc, false);
-               ath_stoprecv(sc);
-               ath9k_hw_phy_disable(ah);
-       } else
-               sc->rx.rxlink = NULL;
-+      spin_unlock_bh(&sc->rx.pcu_lock);
+@@ -1381,6 +1395,9 @@ static void ath9k_stop(struct ieee80211_
        /* disable HAL and put h/w to sleep */
        ath9k_hw_disable(ah);
+       ath9k_hw_configpcipowersave(ah, 1, 1);
++
++      spin_unlock_bh(&sc->sc_pcu_lock);
++
+       ath9k_ps_restore(sc);
+       /* Finally, put the chip in FULL SLEEP mode */
 --- a/drivers/net/wireless/ath/ath9k/recv.c
 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 @@ -297,19 +297,17 @@ static void ath_edma_start_recv(struct a
  }
  
  int ath_rx_init(struct ath_softc *sc, int nbufs)
-@@ -319,8 +317,8 @@ int ath_rx_init(struct ath_softc *sc, in
+@@ -319,7 +317,7 @@ int ath_rx_init(struct ath_softc *sc, in
        struct ath_buf *bf;
        int error = 0;
  
 -      spin_lock_init(&sc->rx.rxflushlock);
++      spin_lock_init(&sc->sc_pcu_lock);
        sc->sc_flags &= ~SC_OP_RXFLUSH;
-+      spin_lock_init(&sc->rx.pcu_lock);
        spin_lock_init(&sc->rx.rxbuflock);
  
-       if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) {
 @@ -506,9 +504,9 @@ int ath_startrecv(struct ath_softc *sc)
        ath9k_hw_rxena(ah);
  
  }
  
  static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
+--- a/drivers/net/wireless/ath/ath9k/init.c
++++ b/drivers/net/wireless/ath/ath9k/init.c
+@@ -588,7 +588,6 @@ static int ath9k_init_softc(u16 devid, s
+       spin_lock_init(&common->cc_lock);
+       spin_lock_init(&sc->wiphy_lock);
+-      spin_lock_init(&sc->sc_resetlock);
+       spin_lock_init(&sc->sc_serial_rw);
+       spin_lock_init(&sc->sc_pm_lock);
+       mutex_init(&sc->mutex);
+--- a/drivers/net/wireless/ath/ath9k/xmit.c
++++ b/drivers/net/wireless/ath/ath9k/xmit.c
+@@ -1142,13 +1142,11 @@ void ath_drain_all_txq(struct ath_softc 
+               ath_print(common, ATH_DBG_FATAL,
+                         "Failed to stop TX DMA. Resetting hardware!\n");
+-              spin_lock_bh(&sc->sc_resetlock);
+               r = ath9k_hw_reset(ah, sc->sc_ah->curchan, ah->caldata, false);
+               if (r)
+                       ath_print(common, ATH_DBG_FATAL,
+                                 "Unable to reset hardware; reset status %d\n",
+                                 r);
+-              spin_unlock_bh(&sc->sc_resetlock);
+       }
+       for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++) {
index d4b52ed..81866d6 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -587,7 +587,7 @@ void ath_hw_check(struct work_struct *wo
+@@ -581,7 +581,7 @@ void ath_hw_check(struct work_struct *wo
  
                msleep(1);
        }
@@ -9,7 +9,7 @@
  
  out:
        ath9k_ps_restore(sc);
-@@ -605,7 +605,7 @@ void ath9k_tasklet(unsigned long data)
+@@ -599,7 +599,7 @@ void ath9k_tasklet(unsigned long data)
        ath9k_ps_wakeup(sc);
  
        if (status & ATH9K_INT_FATAL) {
@@ -20,7 +20,7 @@
        }
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -2163,7 +2163,7 @@ static void ath_tx_complete_poll_work(st
+@@ -2161,7 +2161,7 @@ static void ath_tx_complete_poll_work(st
                ath_print(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
                          "tx hung, resetting the chip\n");
                ath9k_ps_wakeup(sc);