ath9k: remove unnecessary power save flags.
PATCH v2 1/2 ath9k: remove unnecessary power save flags.
drv_config callback is called only after the ack for the nullframe is received and so driver need not do anything special for this.
So remove NULLFUNC_COMPLETED, PS_ENABLED flags and bf_isnullfunc flags from ath9k as mac80211 already handles them properly.
Signed-off-by Senthil Balasubramanian <[email protected]>
--- drivers/net/wireless/ath/ath9k/ath9k.h | 4 ---- drivers/net/wireless/ath/ath9k/main.c | 18 ++++-------------- drivers/net/wireless/ath/ath9k/xmit.c | 30 ------------------------------ 3 files changed, 4 insertions(+), 48 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -4
@@ -241,7 +241,6 @@ struct ath_buf {dma_addr_t bf_daddr;/* physical addr of desc */ dma_addr_t bf_buf_addr;/* physical addr of data buffer */ bool bf_stale; -bool bf_isnullfunc;bool bf_tx_aborted;u16 bf_flags;struct ath_buf_state bf_state;
@@ -349,7 +348,6 @@ int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid, u16 *ssn);void ath_tx_aggr_stop (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid);void ath_tx_aggr_resume (struct ath_softc *sc,struct ieee80211_sta *sta,u16 tid); -void ath9k_enable_ps (struct ath_softc *sc);/********/ /* VIFs */
@@ -573,8 +571,6 @@ struct ath_ant_comb {#define PS_WAIT_FOR_PSPOLL_DATA BIT(2)#define PS_WAIT_FOR_TX_ACK BIT(3)#define PS_BEACON_SYNC BIT(4) -#define PS_NULLFUNC_COMPLETED BIT(5) -#define PS_ENABLED BIT(6)struct ath_wiphy ;struct ath_rate_table ;
drivers/net/wireless/ath/ath9k/main.c +4 -14
@@ -1491,7 +1491,7 @@ static void ath9k_remove_interface(struct ieee80211_hw *hw,mutex_unlock (&sc->mutex); } -void ath9k_enable_ps (struct ath_softc *sc) +static void ath9k_enable_ps (struct ath_softc *sc) {struct ath_hw *ah = sc->sc_ah;
@@ -1558,20 +1558,10 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)if (changed &IEEE80211_CONF_CHANGE_PS ) {unsigned long flags;spin_lock_irqsave (&sc->sc_pm_lock, flags); -if (conf->flags &IEEE80211_CONF_PS ) { - sc->ps_flags |=PS_ENABLED ; -/* -* At this point we know hardware has received an ACK -* of a previously sent null data frame. -*/ -if ((sc->ps_flags &PS_NULLFUNC_COMPLETED )) { - sc->ps_flags &= ~PS_NULLFUNC_COMPLETED ; -ath9k_enable_ps (sc); - } - }else { +if (conf->flags &IEEE80211_CONF_PS ) +ath9k_enable_ps (sc); +else { sc->ps_enabled = false; - sc->ps_flags &= ~(PS_ENABLED | -PS_NULLFUNC_COMPLETED );ath9k_hw_setpower (sc->sc_ah,ATH9K_PM_AWAKE );if (!(ah->caps.hw_caps &ATH9K_HW_CAP_AUTOSLEEP )) {
drivers/net/wireless/ath/ath9k/xmit.c +0 -30
@@ -1648,13 +1648,6 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, bf->bf_buf_addr = bf->bf_dmacontext; -/* tag if this is a nullfunc frame to enable PS when AP acks it */ -if (ieee80211_is_nullfunc (fc) &&ieee80211_has_pm (fc)) { - bf->bf_isnullfunc = true; - sc->ps_flags &= ~PS_NULLFUNC_COMPLETED ; - }else - bf->bf_isnullfunc = false; - bf->bf_tx_aborted = false;return 0 ;
@@ -2082,18 +2075,6 @@ static void ath_tx_processq(struct ath_softc *sc, struct ath_txq *txq) }/* -* We now know the nullfunc frame has been ACKed so we -* can disable RX. -*/ -if (bf->bf_isnullfunc && - (ts.ts_status &ATH9K_TX_ACKED )) { -if ((sc->ps_flags &PS_ENABLED )) -ath9k_enable_ps (sc); -else - sc->ps_flags |=PS_NULLFUNC_COMPLETED ; - } - -/* * Remove ath_buf's of the same transmit unit from txq, * however leave the last descriptor back as the holding * descriptor for hw.
@@ -2236,17 +2217,6 @@ void ath_tx_edma_tasklet(struct ath_softc *sc) txok = !(txs.ts_status &ATH9K_TXERR_MASK ); -/* -* Make sure null func frame is acked before configuring -* hw into ps mode. -*/ -if (bf->bf_isnullfunc && txok) { -if ((sc->ps_flags &PS_ENABLED )) -ath9k_enable_ps (sc); -else - sc->ps_flags |=PS_NULLFUNC_COMPLETED ; - } -if (!bf_isampdu (bf)) {if (txs.ts_status &ATH9K_TXERR_XRETRY ) bf->bf_state.bf_type |=BUF_XRETRY ;
Signature · 1 line
1.7.2.1
PATCH 2/2 ath9k: Introduce a wrapper for power save disable.
Signed-off-by Senthil Balasubramanian <[email protected]>
--- drivers/net/wireless/ath/ath9k/main.c | 40 ++++++++++++++++++-------------- 1 files changed, 22 insertions(+), 18 deletions(-)
drivers/net/wireless/ath/ath9k/main.c +22 -18
@@ -1505,13 +1505,32 @@ static void ath9k_enable_ps(struct ath_softc *sc) } } +static void ath9k_disable_ps (struct ath_softc *sc) +{ +struct ath_hw *ah = sc->sc_ah; + + sc->ps_enabled = false; +ath9k_hw_setpower (ah,ATH9K_PM_AWAKE ); +if (!(ah->caps.hw_caps &ATH9K_HW_CAP_AUTOSLEEP )) { +ath9k_hw_setrxabort (ah,0 ); + sc->ps_flags &= ~(PS_WAIT_FOR_BEACON | +PS_WAIT_FOR_CAB | +PS_WAIT_FOR_PSPOLL_DATA | +PS_WAIT_FOR_TX_ACK ); +if (ah->imask &ATH9K_INT_TIM_TIMER ) { + ah->imask &= ~ATH9K_INT_TIM_TIMER ; +ath9k_hw_set_interrupts (ah, ah->imask); + } + } + +} +static int ath9k_config (struct ieee80211_hw *hw,u32 changed) {struct ath_wiphy *aphy = hw->priv;struct ath_softc *sc = aphy->sc;struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ieee80211_conf *conf = &hw->conf; -struct ath_hw *ah = sc->sc_ah;bool disable_radio;mutex_lock (&sc->mutex);
@@ -1560,23 +1579,8 @@ static int ath9k_config(struct ieee80211_hw *hw, u32 changed)spin_lock_irqsave (&sc->sc_pm_lock, flags);if (conf->flags &IEEE80211_CONF_PS )ath9k_enable_ps (sc); -else { - sc->ps_enabled = false; -ath9k_hw_setpower (sc->sc_ah,ATH9K_PM_AWAKE ); -if (!(ah->caps.hw_caps & -ATH9K_HW_CAP_AUTOSLEEP )) { -ath9k_hw_setrxabort (sc->sc_ah,0 ); - sc->ps_flags &= ~(PS_WAIT_FOR_BEACON | -PS_WAIT_FOR_CAB | -PS_WAIT_FOR_PSPOLL_DATA | -PS_WAIT_FOR_TX_ACK ); -if (ah->imask &ATH9K_INT_TIM_TIMER ) { - ah->imask &= ~ATH9K_INT_TIM_TIMER ; -ath9k_hw_set_interrupts (sc->sc_ah, - ah->imask); - } - } - } +else +ath9k_disable_ps (sc);spin_unlock_irqrestore (&sc->sc_pm_lock, flags); }
Signature · 1 line
1.7.2.1