ath9k: add some more minor hw reset related fixes

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28129 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 79 insertions, 37 deletions

diff --git a/package/mac80211/patches/581-ath9k_use_reset_work.patch b/package/mac80211/patches/581-ath9k_use_reset_work.patch
index db8d85aee..309da0d83 100644
--- a/package/mac80211/patches/581-ath9k_use_reset_work.patch
+++ b/package/mac80211/patches/581-ath9k_use_reset_work.patch
@@ -8,7 +8,15 @@
  void ath_hw_check(struct work_struct *work);
  void ath_hw_pll_work(struct work_struct *work);
  void ath_paprd_calibrate(struct work_struct *work);
-@@ -609,6 +610,7 @@ struct ath_softc {
+@@ -559,6 +560,7 @@ struct ath_ant_comb {
+ #define SC_OP_RXFLUSH                BIT(7)
+ #define SC_OP_LED_ASSOCIATED         BIT(8)
+ #define SC_OP_LED_ON                 BIT(9)
++#define SC_OP_HW_RESET               BIT(10)
+ #define SC_OP_TSF_RESET              BIT(11)
+ #define SC_OP_BT_PRIORITY_DETECTED   BIT(12)
+ #define SC_OP_BT_SCAN		     BIT(13)
+@@ -609,6 +611,7 @@ struct ath_softc {
  	struct mutex mutex;
  	struct work_struct paprd_work;
  	struct work_struct hw_check_work;
@@ -16,7 +24,7 @@
  	struct completion paprd_complete;
  
  	unsigned int hw_busy_count;
-@@ -655,7 +657,6 @@ struct ath_softc {
+@@ -655,7 +658,6 @@ struct ath_softc {
  };
  
  void ath9k_tasklet(unsigned long data);
@@ -24,6 +32,19 @@
  int ath_cabq_update(struct ath_softc *);
  
  static inline void ath_read_cachesize(struct ath_common *common, int *csz)
+--- a/drivers/net/wireless/ath/ath9k/beacon.c
++++ b/drivers/net/wireless/ath/ath9k/beacon.c
+@@ -386,9 +386,7 @@ void ath_beacon_tasklet(unsigned long da
+ 			ath_dbg(common, ATH_DBG_BSTUCK,
+ 				"beacon is officially stuck\n");
+ 			sc->sc_flags |= SC_OP_TSF_RESET;
+-			spin_lock(&sc->sc_pcu_lock);
+-			ath_reset(sc, true);
+-			spin_unlock(&sc->sc_pcu_lock);
++			ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
+ 		}
+ 
+ 		return;
 --- a/drivers/net/wireless/ath/ath9k/init.c
 +++ b/drivers/net/wireless/ath/ath9k/init.c
 @@ -776,6 +776,7 @@ int ath9k_init_device(u16 devid, struct 
@@ -122,7 +143,7 @@
  		return;
  	}
  
-@@ -968,7 +898,7 @@ void ath_radio_disable(struct ath_softc 
+@@ -968,13 +898,14 @@ void ath_radio_disable(struct ath_softc 
  	ath9k_ps_restore(sc);
  }
  
@@ -131,7 +152,14 @@
  {
  	struct ath_hw *ah = sc->sc_ah;
  	struct ath_common *common = ath9k_hw_common(ah);
-@@ -1035,6 +965,84 @@ int ath_reset(struct ath_softc *sc, bool
+ 	struct ieee80211_hw *hw = sc->hw;
+ 	int r;
+ 
++	sc->sc_flags &= ~SC_OP_HW_RESET;
+ 	sc->hw_busy_count = 0;
+ 
+ 	/* Stop ANI */
+@@ -1035,6 +966,84 @@ int ath_reset(struct ath_softc *sc, bool
  	return r;
  }
  
@@ -218,16 +246,30 @@
  /**********************/
 --- a/drivers/net/wireless/ath/ath9k/xmit.c
 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
-@@ -601,7 +601,7 @@ static void ath_tx_complete_aggr(struct 
+@@ -600,8 +600,10 @@ static void ath_tx_complete_aggr(struct 
+ 
  	rcu_read_unlock();
  
- 	if (needreset)
+-	if (needreset)
 -		ath_reset(sc, false);
++	if (needreset) {
++		sc->sc_flags |= SC_OP_HW_RESET;
 +		ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
++	}
  }
  
  static bool ath_lookup_legacy(struct ath_buf *bf)
-@@ -2268,9 +2268,7 @@ static void ath_tx_complete_poll_work(st
+@@ -2181,6 +2183,9 @@ static void ath_tx_processq(struct ath_s
+ 
+ 	spin_lock_bh(&txq->axq_lock);
+ 	for (;;) {
++		if (sc->sc_flags & SC_OP_HW_RESET)
++			break;
++
+ 		if (list_empty(&txq->axq_q)) {
+ 			txq->axq_link = NULL;
+ 			if (sc->sc_flags & SC_OP_TXAGGR)
+@@ -2268,9 +2273,7 @@ static void ath_tx_complete_poll_work(st
  	if (needreset) {
  		ath_dbg(ath9k_hw_common(sc->sc_ah), ATH_DBG_RESET,
  			"tx hung, resetting the chip\n");
@@ -238,16 +280,13 @@
  	}
  
  	ieee80211_queue_delayed_work(sc->hw, &sc->tx_complete_work,
---- a/drivers/net/wireless/ath/ath9k/beacon.c
-+++ b/drivers/net/wireless/ath/ath9k/beacon.c
-@@ -386,9 +386,7 @@ void ath_beacon_tasklet(unsigned long da
- 			ath_dbg(common, ATH_DBG_BSTUCK,
- 				"beacon is officially stuck\n");
- 			sc->sc_flags |= SC_OP_TSF_RESET;
--			spin_lock(&sc->sc_pcu_lock);
--			ath_reset(sc, true);
--			spin_unlock(&sc->sc_pcu_lock);
-+			ieee80211_queue_work(sc->hw, &sc->hw_reset_work);
- 		}
+@@ -2303,6 +2306,9 @@ void ath_tx_edma_tasklet(struct ath_soft
+ 	int status;
  
- 		return;
+ 	for (;;) {
++		if (sc->sc_flags & SC_OP_HW_RESET)
++			break;
++
+ 		status = ath9k_hw_txprocdesc(ah, NULL, (void *)&ts);
+ 		if (status == -EINPROGRESS)
+ 			break;
diff --git a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
index 5484829b1..8d22d8f79 100644
--- a/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
+++ b/package/mac80211/patches/582-ath9k_merge_reset_functions.patch
@@ -117,7 +117,7 @@
  	}
  
  	ath9k_cmn_update_txpow(ah, sc->curtxpow,
-@@ -296,21 +270,93 @@ static int ath_set_channel(struct ath_so
+@@ -296,21 +270,95 @@ static int ath_set_channel(struct ath_so
  	ath9k_hw_set_interrupts(ah, ah->imask);
  	ath9k_hw_enable_interrupts(ah);
  
@@ -152,6 +152,8 @@
 +	__ath_cancel_work(sc);
 +
 +	spin_lock_bh(&sc->sc_pcu_lock);
++
++	sc->sc_flags &= ~SC_OP_HW_RESET;
  
 +	if (!(sc->sc_flags & SC_OP_OFFCHANNEL)) {
 +		fastcc = false;
@@ -188,7 +190,7 @@
 +
 +out:
  	spin_unlock_bh(&sc->sc_pcu_lock);
-+	return 0;
++	return r;
 +}
 +
 +
@@ -214,7 +216,7 @@
  	return r;
  }
  
-@@ -823,28 +869,13 @@ static void ath_radio_enable(struct ath_
+@@ -823,28 +871,13 @@ static void ath_radio_enable(struct ath_
  			channel->center_freq, r);
  	}
  
@@ -244,7 +246,7 @@
  	spin_unlock_bh(&sc->sc_pcu_lock);
  
  	ath9k_ps_restore(sc);
-@@ -857,11 +888,10 @@ void ath_radio_disable(struct ath_softc 
+@@ -857,11 +890,10 @@ void ath_radio_disable(struct ath_softc 
  	int r;
  
  	ath9k_ps_wakeup(sc);
@@ -258,7 +260,7 @@
  
  	/*
  	 * Keep the LED on when the radio is disabled
-@@ -872,13 +902,7 @@ void ath_radio_disable(struct ath_softc 
+@@ -872,13 +904,7 @@ void ath_radio_disable(struct ath_softc 
  		ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
  	}
  
@@ -273,7 +275,7 @@
  
  	if (!ah->curchan)
  		ah->curchan = ath9k_cmn_get_curchannel(hw, ah);
-@@ -900,48 +924,11 @@ void ath_radio_disable(struct ath_softc 
+@@ -900,49 +926,11 @@ void ath_radio_disable(struct ath_softc 
  
  static int ath_reset(struct ath_softc *sc, bool retry_tx)
  {
@@ -282,6 +284,7 @@
 -	struct ieee80211_hw *hw = sc->hw;
  	int r;
  
+-	sc->sc_flags &= ~SC_OP_HW_RESET;
 -	sc->hw_busy_count = 0;
 -
 -	/* Stop ANI */
@@ -323,7 +326,7 @@
  
  	if (retry_tx) {
  		int i;
-@@ -954,12 +941,6 @@ static int ath_reset(struct ath_softc *s
+@@ -955,12 +943,6 @@ static int ath_reset(struct ath_softc *s
  		}
  	}
  
@@ -336,7 +339,7 @@
  	ath9k_ps_restore(sc);
  
  	return r;
-@@ -969,9 +950,7 @@ void ath_reset_work(struct work_struct *
+@@ -970,9 +952,7 @@ void ath_reset_work(struct work_struct *
  {
  	struct ath_softc *sc = container_of(work, struct ath_softc, hw_check_work);
  
@@ -346,7 +349,7 @@
  }
  
  void ath_hw_check(struct work_struct *work)
-@@ -992,11 +971,8 @@ void ath_hw_check(struct work_struct *wo
+@@ -993,11 +973,8 @@ void ath_hw_check(struct work_struct *wo
  	ath_dbg(common, ATH_DBG_RESET, "Possible baseband hang, "
  		"busy=%d (try %d)\n", busy, sc->hw_busy_count + 1);
  	if (busy >= 99) {
@@ -360,7 +363,7 @@
  
  	} else if (busy >= 0)
  		sc->hw_busy_count = 0;
-@@ -1016,9 +992,7 @@ static void ath_hw_pll_rx_hang_check(str
+@@ -1017,9 +994,7 @@ static void ath_hw_pll_rx_hang_check(str
  			/* Rx is hung for more than 500ms. Reset it */
  			ath_dbg(common, ATH_DBG_RESET,
  				"Possible RX hang, resetting");
@@ -371,7 +374,7 @@
  			count = 0;
  		}
  	} else
-@@ -1089,28 +1063,6 @@ static int ath9k_start(struct ieee80211_
+@@ -1090,28 +1065,6 @@ static int ath9k_start(struct ieee80211_
  		goto mutex_unlock;
  	}
  
@@ -400,7 +403,7 @@
  	/* Setup our intr mask. */
  	ah->imask = ATH9K_INT_TX | ATH9K_INT_RXEOL |
  		    ATH9K_INT_RXORN | ATH9K_INT_FATAL |
-@@ -1133,12 +1085,14 @@ static int ath9k_start(struct ieee80211_
+@@ -1134,12 +1087,14 @@ static int ath9k_start(struct ieee80211_
  
  	/* Disable BMISS interrupt when we're not associated */
  	ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
@@ -419,7 +422,7 @@
  
  	if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
  	    !ah->btcoex_hw.enabled) {
-@@ -1231,10 +1185,7 @@ static void ath9k_stop(struct ieee80211_
+@@ -1232,10 +1187,7 @@ static void ath9k_stop(struct ieee80211_
  
  	mutex_lock(&sc->mutex);
  
@@ -431,7 +434,7 @@
  
  	if (sc->sc_flags & SC_OP_INVALID) {
  		ath_dbg(common, ATH_DBG_ANY, "Device not present\n");
-@@ -2351,9 +2302,11 @@ static void ath9k_flush(struct ieee80211
+@@ -2352,9 +2304,11 @@ static void ath9k_flush(struct ieee80211
  	ath9k_ps_wakeup(sc);
  	spin_lock_bh(&sc->sc_pcu_lock);
  	drain_txq = ath_drain_all_txq(sc, false);
diff --git a/package/mac80211/patches/583-ath9k_antenna_control.patch b/package/mac80211/patches/583-ath9k_antenna_control.patch
index d69684d12..08f1b8f2e 100644
--- a/package/mac80211/patches/583-ath9k_antenna_control.patch
+++ b/package/mac80211/patches/583-ath9k_antenna_control.patch
@@ -57,7 +57,7 @@
  }
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -654,6 +654,7 @@ struct ath_softc {
+@@ -655,6 +655,7 @@ struct ath_softc {
  	struct ath_descdma txsdma;
  
  	struct ath_ant_comb ant_comb;
@@ -65,7 +65,7 @@
  };
  
  void ath9k_tasklet(unsigned long data);
-@@ -674,6 +675,7 @@ int ath9k_init_device(u16 devid, struct 
+@@ -675,6 +676,7 @@ int ath9k_init_device(u16 devid, struct 
  		    const struct ath_bus_ops *bus_ops);
  void ath9k_deinit_device(struct ath_softc *sc);
  void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw);
@@ -98,7 +98,7 @@
  	ieee80211_wake_queues(sc->hw);
  
  	return true;
-@@ -2383,6 +2399,59 @@ static int ath9k_get_stats(struct ieee80
+@@ -2385,6 +2401,59 @@ static int ath9k_get_stats(struct ieee80
  	return 0;
  }
  
@@ -158,7 +158,7 @@
  struct ieee80211_ops ath9k_ops = {
  	.tx 		    = ath9k_tx,
  	.start 		    = ath9k_start,
-@@ -2409,4 +2478,6 @@ struct ieee80211_ops ath9k_ops = {
+@@ -2411,4 +2480,6 @@ struct ieee80211_ops ath9k_ops = {
  	.tx_frames_pending  = ath9k_tx_frames_pending,
  	.tx_last_beacon     = ath9k_tx_last_beacon,
  	.get_stats	    = ath9k_get_stats,