ath9k: rename symbols in enum ath9k_internal_frame_type to avoid confusion
PATCH 1/3 ath9k: rename symbols in enum ath9k_internal_frame_type to avoid confusion
Symbols starting with "ATH9K_INT" are also used for interrupt mask.
--- drivers/net/wireless/ath/ath9k/rc.h | 6 +++--- drivers/net/wireless/ath/ath9k/virtual.c | 2 +- drivers/net/wireless/ath/ath9k/xmit.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/ath/ath9k/rc.h +3 -3
@@ -176,9 +176,9 @@ struct ath_rate_priv {#define ATH_TX_INFO_UNDERRUN (1 << 4)enum ath9k_internal_frame_type { -ATH9K_NOT_INTERNAL , -ATH9K_INT_PAUSE , -ATH9K_INT_UNPAUSE +ATH9K_IFT_NOT_INTERNAL , +ATH9K_IFT_PAUSE , +ATH9K_IFT_UNPAUSE };int ath_rate_control_register (void );
drivers/net/wireless/ath/ath9k/virtual.c +1 -1
@@ -218,7 +218,7 @@ static int ath9k_send_nullfunc(struct ath_wiphy *aphy,memset (&txctl,0 ,sizeof (struct ath_tx_control )); txctl.txq = &sc->tx.txq[sc->tx.hwq_map[ATH9K_WME_AC_VO ]]; - txctl.frame_type = ps ?ATH9K_INT_PAUSE :ATH9K_INT_UNPAUSE ; + txctl.frame_type = ps ?ATH9K_IFT_PAUSE :ATH9K_IFT_UNPAUSE ;if (ath_tx_start (aphy->hw, skb, &txctl) !=0 ) goto exit;
drivers/net/wireless/ath/ath9k/xmit.c +3 -3
@@ -1574,12 +1574,12 @@ static int ath_tx_setup_buffer(struct ieee80211_hw *hw, struct ath_buf *bf, tx_info->pad[0 ] =0 ;switch (txctl->frame_type) { -case ATH9K_NOT_INTERNAL : +case ATH9K_IFT_NOT_INTERNAL :break ; -case ATH9K_INT_PAUSE : +case ATH9K_IFT_PAUSE : tx_info->pad[0 ] |=ATH_TX_INFO_FRAME_TYPE_PAUSE ;/* fall through */ -case ATH9K_INT_UNPAUSE : +case ATH9K_IFT_UNPAUSE : tx_info->pad[0 ] |=ATH_TX_INFO_FRAME_TYPE_INTERNAL ;break ; }
PATCH 2/3 ath9k: move imask from sc to ah
Add ah variable in the functions that didn't have it and used sc->imask. Replace sc->sc_ah with ah in those functions.
--- drivers/net/wireless/ath/ath9k/ath9k.h | 1 - drivers/net/wireless/ath/ath9k/beacon.c | 35 ++++++++++-------- drivers/net/wireless/ath/ath9k/gpio.c | 15 +++----- drivers/net/wireless/ath/ath9k/hw.h | 1 + drivers/net/wireless/ath/ath9k/main.c | 60 ++++++++++++++++--------------- 5 files changed, 56 insertions(+), 56 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -1
@@ -480,7 +480,6 @@ struct ath_softc {bool ps_enabled;bool ps_idle;unsigned long ps_usecount; -enum ath9k_int imask;struct ath_config config;struct ath_rx rx;
drivers/net/wireless/ath/ath9k/beacon.c +19 -16
@@ -524,6 +524,7 @@ static void ath9k_beacon_init(struct ath_softc *sc,static void ath_beacon_config_ap (struct ath_softc *sc,struct ath_beacon_config *conf) { +struct ath_hw *ah = sc->sc_ah;u32 nexttbtt, intval;/* NB: the beacon interval is kept internally in TU's */
@@ -539,15 +540,15 @@ static void ath_beacon_config_ap(struct ath_softc *sc,* prepare beacon frames. */ intval |=ATH9K_BEACON_ENA ; - sc->imask |=ATH9K_INT_SWBA ; + ah->imask |=ATH9K_INT_SWBA ;ath_beaconq_config (sc);/* Set the computed AP beacon timers */ -ath9k_hw_set_interrupts (sc->sc_ah,0 ); +ath9k_hw_set_interrupts (ah,0 );ath9k_beacon_init (sc, nexttbtt, intval); sc->beacon.bmisscnt =0 ; -ath9k_hw_set_interrupts (sc->sc_ah, sc->imask); +ath9k_hw_set_interrupts (ah, ah->imask);/* Clear the reset TSF flag, so that subsequent beacon updation will not reset the HW TSF. */
@@ -566,7 +567,8 @@ static void ath_beacon_config_ap(struct ath_softc *sc,static void ath_beacon_config_sta (struct ath_softc *sc,struct ath_beacon_config *conf) { -struct ath_common *common =ath9k_hw_common (sc->sc_ah); +struct ath_hw *ah = sc->sc_ah; +struct ath_common *common =ath9k_hw_common (ah);struct ath9k_beacon_state bs;int dtimperiod, dtimcount, sleepduration;int cfpperiod, cfpcount;
@@ -605,7 +607,7 @@ static void ath_beacon_config_sta(struct ath_softc *sc,* Pull nexttbtt forward to reflect the current * TSF and calculate dtim+cfp state for the result. */ - tsf =ath9k_hw_gettsf64 (sc->sc_ah); + tsf =ath9k_hw_gettsf64 (ah); tsftu =TSF_TO_TU (tsf>>32 , tsf) +FUDGE ; num_beacons = tsftu / intval +1 ;
@@ -678,17 +680,18 @@ static void ath_beacon_config_sta(struct ath_softc *sc,/* Set the computed STA beacon timers */ -ath9k_hw_set_interrupts (sc->sc_ah,0 ); -ath9k_hw_set_sta_beacon_timers (sc->sc_ah, &bs); - sc->imask |=ATH9K_INT_BMISS ; -ath9k_hw_set_interrupts (sc->sc_ah, sc->imask); +ath9k_hw_set_interrupts (ah,0 ); +ath9k_hw_set_sta_beacon_timers (ah, &bs); + ah->imask |=ATH9K_INT_BMISS ; +ath9k_hw_set_interrupts (ah, ah->imask); }static void ath_beacon_config_adhoc (struct ath_softc *sc,struct ath_beacon_config *conf,struct ieee80211_vif *vif) { -struct ath_common *common =ath9k_hw_common (sc->sc_ah); +struct ath_hw *ah = sc->sc_ah; +struct ath_common *common =ath9k_hw_common (ah);u64 tsf;u32 tsftu, intval, nexttbtt;
@@ -703,7 +706,7 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,else if (intval) nexttbtt =roundup (nexttbtt, intval); - tsf =ath9k_hw_gettsf64 (sc->sc_ah); + tsf =ath9k_hw_gettsf64 (ah); tsftu =TSF_TO_TU ((u32)(tsf>>32 ), (u32 )tsf) +FUDGE ; do { nexttbtt += intval;
@@ -719,20 +722,20 @@ static void ath_beacon_config_adhoc(struct ath_softc *sc,* self-linked tx descriptor and let the hardware deal with things. */ intval |=ATH9K_BEACON_ENA ; -if (!(sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_VEOL )) - sc->imask |=ATH9K_INT_SWBA ; +if (!(ah->caps.hw_caps &ATH9K_HW_CAP_VEOL )) + ah->imask |=ATH9K_INT_SWBA ;ath_beaconq_config (sc);/* Set the computed ADHOC beacon timers */ -ath9k_hw_set_interrupts (sc->sc_ah,0 ); +ath9k_hw_set_interrupts (ah,0 );ath9k_beacon_init (sc, nexttbtt, intval); sc->beacon.bmisscnt =0 ; -ath9k_hw_set_interrupts (sc->sc_ah, sc->imask); +ath9k_hw_set_interrupts (ah, ah->imask);/* FIXME: Handle properly when vif is NULL */ -if (vif && sc->sc_ah->caps.hw_caps &ATH9K_HW_CAP_VEOL ) +if (vif && ah->caps.hw_caps &ATH9K_HW_CAP_VEOL )ath_beacon_start_adhoc (sc, vif); }
drivers/net/wireless/ath/ath9k/gpio.c +5 -10
@@ -283,22 +283,17 @@ static void ath9k_gen_timer_start(struct ath_hw *ah,u32 timer_next, u32 timer_period) { -struct ath_common *common =ath9k_hw_common (ah); -struct ath_softc *sc = (struct ath_softc *) common->priv; -ath9k_hw_gen_timer_start (ah ,timer ,timer_next ,timer_period ); -if ((sc->imask &ATH9K_INT_GENTIMER ) ==0 ) { +if ((ah->imask &ATH9K_INT_GENTIMER ) ==0 ) {ath9k_hw_set_interrupts (ah,0 ); - sc->imask |=ATH9K_INT_GENTIMER ; -ath9k_hw_set_interrupts (ah, sc->imask); + ah->imask |=ATH9K_INT_GENTIMER ; +ath9k_hw_set_interrupts (ah, ah->imask); } }static void ath9k_gen_timer_stop (struct ath_hw *ah,struct ath_gen_timer *timer) { -struct ath_common *common =ath9k_hw_common (ah); -struct ath_softc *sc = (struct ath_softc *) common->priv;struct ath_gen_timer_table *timer_table = &ah->hw_gen_timers;ath9k_hw_gen_timer_stop (ah, timer);
@@ -306,8 +301,8 @@ static void ath9k_gen_timer_stop(struct ath_hw *ah, struct ath_gen_timer *timer)/* if no timer is enabled, turn off interrupt mask */ if (timer_table->timer_mask.val ==0 ) {ath9k_hw_set_interrupts (ah,0 ); - sc->imask &= ~ATH9K_INT_GENTIMER ; -ath9k_hw_set_interrupts (ah, sc->imask); + ah->imask &= ~ATH9K_INT_GENTIMER ; +ath9k_hw_set_interrupts (ah, ah->imask); } }
drivers/net/wireless/ath/ath9k/hw.h +1 -0
@@ -478,6 +478,7 @@ struct ath_hw {struct ath9k_tx_queue_info txq[ATH9K_NUM_TX_QUEUES ];int16_t curchan_rad_index; +enum ath9k_int imask;u32 mask_reg;u32 imrs2_reg;u32 txok_interrupt_mask;
drivers/net/wireless/ath/ath9k/main.c +31 -29
172 lines not on this page · raw message
PATCH 3/3 ath9k: remove ah->mask_reg, it's never used properly
In reply to Pavel Roskinah->mask_reg was used to hold different data throughout the driver. ath9k_hw_init_interrupt_masks() used it to save the value written to AR_IMR. ath9k_hw_set_interrupts() used it to hold the interrupt mask as defined in enum ath9k_int. Those masks differ in many bits.
Use ah->imask instead of ah->mask_reg in ath9k_hw_set_interrupts() and ath9k_hw_updatetxtriglevel(). That's what the code was meant to do. ah->imask is initialized in ath9k_start(), so we don't need to initialize it from ah->mask_reg.
Once it's done, ah->mask_reg becomes write-only, so it's replaced with a local variable in ath9k_hw_init_interrupt_masks().
--- drivers/net/wireless/ath/ath9k/hw.c | 15 +++++++-------- drivers/net/wireless/ath/ath9k/hw.h | 1 - drivers/net/wireless/ath/ath9k/mac.c | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-)
drivers/net/wireless/ath/ath9k/hw.c +7 -8
@@ -1120,23 +1120,23 @@ static void ath9k_hw_init_chain_masks(struct ath_hw *ah)static void ath9k_hw_init_interrupt_masks (struct ath_hw *ah,enum nl80211_iftype opmode) { - ah->mask_reg =AR_IMR_TXERR | +u32 imr_reg =AR_IMR_TXERR |AR_IMR_TXURN |AR_IMR_RXERR |AR_IMR_RXORN |AR_IMR_BCNMISC ;if (ah->config.rx_intr_mitigation) - ah->mask_reg |=AR_IMR_RXINTM |AR_IMR_RXMINTR ; + imr_reg |=AR_IMR_RXINTM |AR_IMR_RXMINTR ;else - ah->mask_reg |=AR_IMR_RXOK ; + imr_reg |=AR_IMR_RXOK ; - ah->mask_reg |=AR_IMR_TXOK ; + imr_reg |=AR_IMR_TXOK ;if (opmode ==NL80211_IFTYPE_AP ) - ah->mask_reg |=AR_IMR_MIB ; + imr_reg |=AR_IMR_MIB ; -REG_WRITE (ah,AR_IMR , ah->mask_reg); +REG_WRITE (ah,AR_IMR , imr_reg); ah->imrs2_reg |=AR_IMR_S2_GTT ;REG_WRITE (ah,AR_IMR_S2 , ah->imrs2_reg);
@@ -2839,7 +2839,7 @@ EXPORT_SYMBOL(ath9k_hw_getisr);enum ath9k_int ath9k_hw_set_interrupts (struct ath_hw *ah,enum ath9k_int ints) { -u32 omask = ah->mask_reg; +enum ath9k_int omask = ah->imask;u32 mask, mask2;struct ath9k_hw_capabilities *pCap = &ah->caps;struct ath_common *common =ath9k_hw_common (ah);
@@ -2911,7 +2911,6 @@ enum ath9k_int ath9k_hw_set_interrupts(struct ath_hw *ah, enum ath9k_int ints) AR_IMR_S2_TSFOOR | AR_IMR_S2_GTT | AR_IMR_S2_CST); ah->imrs2_reg |= mask2;REG_WRITE (ah,AR_IMR_S2 , ah->imrs2_reg); - ah->mask_reg = ints;if (!(pCap->hw_caps &ATH9K_HW_CAP_AUTOSLEEP )) {if (ints &ATH9K_INT_TIM_TIMER )
drivers/net/wireless/ath/ath9k/hw.h +0 -1
@@ -479,7 +479,6 @@ struct ath_hw {int16_t curchan_rad_index;enum ath9k_int imask; -u32 mask_reg;u32 imrs2_reg;u32 txok_interrupt_mask;u32 txerr_interrupt_mask;
drivers/net/wireless/ath/ath9k/mac.c +1 -1
@@ -105,7 +105,7 @@ bool ath9k_hw_updatetxtriglevel(struct ath_hw *ah, bool bIncTrigLevel)if (ah->tx_trig_level >= ah->config.max_txtrig_level)return false; - omask =ath9k_hw_set_interrupts (ah, ah->mask_reg & ~ATH9K_INT_GLOBAL ); + omask =ath9k_hw_set_interrupts (ah, ah->imask & ~ATH9K_INT_GLOBAL ); txcfg =REG_READ (ah,AR_TXCFG ); curLevel =MS (txcfg,AR_FTRIG );