Skip to contentSkip to conversation

ath9k: use a timer to put hardware into full sleep

PATCH In review Felix Fietkau 2 participants 5 messages Nov 11, 2013 – Nov 14, 2013 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ath9k: use a timer to put hardware into full sleep

When operating in client mode, the short period of time between scanning and associating is often enough to put the hardware through several FULL-SLEEP <-> AWAKE transitions, each wakeup requiring a reset to fully recover the hardware.
This is completely unnecessary and can easily be avoided by deferring the switch to full sleep.

---
 drivers/net/wireless/ath/ath9k/ath9k.h |  2 ++
 drivers/net/wireless/ath/ath9k/init.c  |  2 ++
 drivers/net/wireless/ath/ath9k/main.c  | 27 ++++++++++++++++++++++-----
 3 files changed, 26 insertions(+), 5 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +2 -0
index 4c3bbe4..48aca2f 100644
@@ -459,6 +459,7 @@ void ath_check_ani(struct ath_softc *sc);
 int ath_update_survey_stats(struct ath_softc *sc);
 void ath_update_survey_nf(struct ath_softc *sc, int channel);
 void ath9k_queue_reset(struct ath_softc *sc, enum ath_reset_type type);
+void ath_ps_full_sleep(unsigned long data);
 
 /**********/
 /* BTCOEX */
@@ -759,6 +760,7 @@ struct ath_softc {
 	struct delayed_work tx_complete_work;
 	struct delayed_work hw_pll_work;
 	struct timer_list rx_poll_timer;
+	struct timer_list sleep_timer;
 
 #ifdef CONFIG_ATH9K_BTCOEX_SUPPORT
 	struct ath_btcoex btcoex;
drivers/net/wireless/ath/ath9k/init.c +2 -0
index d8643eb..0d0820b 100644
@@ -730,6 +730,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 	tasklet_init(&sc->bcon_tasklet, ath9k_beacon_tasklet,
 		     (unsigned long)sc);
 
+	setup_timer(&sc->sleep_timer, ath_ps_full_sleep, (unsigned long)sc);
 	INIT_WORK(&sc->hw_reset_work, ath_reset_work);
 	INIT_WORK(&sc->hw_check_work, ath_hw_check);
 	INIT_WORK(&sc->paprd_work, ath_paprd_calibrate);
@@ -1059,6 +1060,7 @@ static void ath9k_deinit_softc(struct ath_softc *sc)
 		if (ATH_TXQ_SETUP(sc, i))
 			ath_tx_cleanupq(sc, &sc->tx.txq[i]);
 
+	del_timer_sync(&sc->sleep_timer);
 	ath9k_hw_deinit(sc->sc_ah);
 	if (sc->dfs_detector != NULL)
 		sc->dfs_detector->exit(sc->dfs_detector);
drivers/net/wireless/ath/ath9k/main.c +22 -5
index 74f452c..a85738d 100644
@@ -82,6 +82,22 @@ static bool ath9k_setpower(struct ath_softc *sc, enum ath9k_power_mode mode)
 	return ret;
 }
 
+void ath_ps_full_sleep(unsigned long data)
+{
+	struct ath_softc *sc = (struct ath_softc *) data;
+	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+	bool reset;
+
+	spin_lock(&common->cc_lock);
+	ath_hw_cycle_counters_update(common);
+	spin_unlock(&common->cc_lock);
+
+	ath9k_hw_setrxabort(sc->sc_ah, 1);
+	ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
+
+	ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_FULL_SLEEP);
+}
+
 void ath9k_ps_wakeup(struct ath_softc *sc)
 {
 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
@@ -92,6 +108,7 @@ void ath9k_ps_wakeup(struct ath_softc *sc)
 	if (++sc->ps_usecount != 1)
 		goto unlock;
 
+	del_timer_sync(&sc->sleep_timer);
 	power_mode = sc->sc_ah->power_mode;
 	ath9k_hw_setpower(sc->sc_ah, ATH9K_PM_AWAKE);
 
@@ -117,17 +134,17 @@ void ath9k_ps_restore(struct ath_softc *sc)
 	struct ath_common *common = ath9k_hw_common(sc->sc_ah);
 	enum ath9k_power_mode mode;
 	unsigned long flags;
-	bool reset;
 
 	spin_lock_irqsave(&sc->sc_pm_lock, flags);
 	if (--sc->ps_usecount != 0)
 		goto unlock;
 
 	if (sc->ps_idle) {
-		ath9k_hw_setrxabort(sc->sc_ah, 1);
-		ath9k_hw_stopdmarecv(sc->sc_ah, &reset);
-		mode = ATH9K_PM_FULL_SLEEP;
-	} else if (sc->ps_enabled &&
+		mod_timer(&sc->sleep_timer, jiffies + HZ / 10);
+		goto unlock;
+	}
+
+	if (sc->ps_enabled &&
 		   !(sc->ps_flags & (PS_WAIT_FOR_BEACON |
 				     PS_WAIT_FOR_CAB |
 				     PS_WAIT_FOR_PSPOLL_DATA |
Signature · 1 line
1.8.3.4 (Apple Git-47)
#1 lore raw

PATCH 2/3 ath9k: optimize ath_drain_all_txq

If the software has processed all packets, checking the hardware queue is unnecessary.

---
 drivers/net/wireless/ath/ath9k/xmit.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath9k/xmit.c +3 -0
index 09cdbcd..babb513 100644
@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc *sc)
 		if (!ATH_TXQ_SETUP(sc, i))
 			continue;
 
+		if (!sc->tx.txq[i].axq_depth)
+			continue;
+
 		if (ath9k_hw_numtxpending(ah, sc->tx.txq[i].axq_qnum))
 			npend |= BIT(i);
 	}
Signature · 1 line
1.8.3.4 (Apple Git-47)
#2 lore raw

Re: [PATCH 2/3] ath9k: optimize ath_drain_all_txq

Quoted 13 lines · Felix Fietkau

If the software has processed all packets, checking the hardware queue is unnecessary.

---
 drivers/net/wireless/ath/ath9k/xmit.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath9k/xmit.c +0 -0
index 09cdbcd..babb513 100644

drivers/net/wireless/ath/ath9k/xmit.c bool ath_drain_all_txq(struct ath_softc *sc) · line 1791

Quoted 6 lines
drivers/net/wireless/ath/ath9k/xmit.c +3 -0
@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc *sc)
 		if (!ATH_TXQ_SETUP(sc, i))
 			continue;
 
+		if (!sc->tx.txq[i].axq_depth)
+			continue;
+

Shouldn't the TX queue lock be taken here ?

Sujith

#3 lore raw

Re: [PATCH 2/3] ath9k: optimize ath_drain_all_txq

Quoted 17 lines · Sujith Manoharan
Quoted 16 lines · Felix Fietkau

If the software has processed all packets, checking the hardware queue is unnecessary.

---
 drivers/net/wireless/ath/ath9k/xmit.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath9k/xmit.c +0 -0
index 09cdbcd..babb513 100644
@@ -1786,6 +1786,9 @@ bool ath_drain_all_txq(struct ath_softc *sc)
 		if (!ATH_TXQ_SETUP(sc, i))
 			continue;
 
Quoted 5 lines

drivers/net/wireless/ath/ath9k/xmit.c bool ath_drain_all_txq(struct ath_softc *sc) · line 1791

Quoted 3 lines
drivers/net/wireless/ath/ath9k/xmit.c +3 -0
+		if (!sc->tx.txq[i].axq_depth)
+			continue;
+

Shouldn't the TX queue lock be taken here ?

I don't think so. Flushing the queues is only allowed if no frames are expected to be pushed by mac80211, and callsites already take the pcu lock (preventing the completion tasklet from running).

- Felix

#4 lore raw

PATCH 3/3 ath9k: optimize ath9k_flush

In reply to Felix Fietkau

Instead of checking the queues in a loop with hardcoded sleep times inbetween, use a wait queue to trigger queue checks after the tx processing tasklet has run.

---
 drivers/net/wireless/ath/ath9k/ath9k.h |  1 +
 drivers/net/wireless/ath/ath9k/init.c  |  1 +
 drivers/net/wireless/ath/ath9k/main.c  | 46 ++++++++++++++++++----------------
 3 files changed, 27 insertions(+), 21 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +1 -0
index 48aca2f..d0b2283 100644
@@ -724,6 +724,7 @@ struct ath_softc {
 	struct work_struct hw_check_work;
 	struct work_struct hw_reset_work;
 	struct completion paprd_complete;
+	wait_queue_head_t tx_wait;
 
 	unsigned int hw_busy_count;
 	unsigned long sc_flags;
drivers/net/wireless/ath/ath9k/init.c +1 -0
index 0d0820b..1853dd0 100644
@@ -683,6 +683,7 @@ static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
 	common = ath9k_hw_common(ah);
 	sc->dfs_detector = dfs_pattern_detector_init(common, NL80211_DFS_UNSET);
 	sc->tx99_power = MAX_RATE_POWER + 1;
+	init_waitqueue_head(&sc->tx_wait);
 
 	if (!pdata) {
 		ah->ah_flags |= AH_USE_EEPROM;
drivers/net/wireless/ath/ath9k/main.c +25 -21

69 lines not on this page · raw message

Signature · 1 line
1.8.3.4 (Apple Git-47)