ath9k: move ath9k_debug_sync_cause out of ath9k_hw
PATCH 1/4 ath9k: move ath9k_debug_sync_cause out of ath9k_hw
ath9k_hw should not depend on any ath9k data structures like ath_softc
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/ath/ath9k/ar9002_mac.c | 6 +++-- drivers/net/wireless/ath/ath9k/ar9003_mac.c | 6 +++-- drivers/net/wireless/ath/ath9k/debug.c | 41 ++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath9k/debug.h | 7 +++++ drivers/net/wireless/ath/ath9k/hw-ops.h | 5 ++-- drivers/net/wireless/ath/ath9k/hw.c | 42 ----------------------------- drivers/net/wireless/ath/ath9k/hw.h | 10 ++----- drivers/net/wireless/ath/ath9k/main.c | 4 ++- 8 files changed, 64 insertions(+), 57 deletions(-)
drivers/net/wireless/ath/ath9k/ar9002_mac.c +4 -2
@@ -29,7 +29,8 @@ static void ar9002_hw_set_desc_link(void *ds, u32 ds_link) ((struct ath_desc *) ds)->ds_link = ds_link; } -static bool ar9002_hw_get_isr (struct ath_hw *ah,enum ath9k_int *masked) +static bool ar9002_hw_get_isr (struct ath_hw *ah,enum ath9k_int *masked, +u32 *sync_cause_p) {u32 isr =0 ;u32 mask2 =0 ;
@@ -170,7 +171,8 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)return true;if (sync_cause) { -ath9k_debug_sync_cause (common, sync_cause); +if (sync_cause_p) + *sync_cause_p = sync_cause; fatal_int = (sync_cause & (AR_INTR_SYNC_HOST1_FATAL |AR_INTR_SYNC_HOST1_PERR ))
drivers/net/wireless/ath/ath9k/ar9003_mac.c +4 -2
@@ -175,7 +175,8 @@ static void ar9003_hw_set_desc_link(void *ds, u32 ds_link) ads->ctl10 |=ar9003_calc_ptr_chksum (ads); } -static bool ar9003_hw_get_isr (struct ath_hw *ah,enum ath9k_int *masked) +static bool ar9003_hw_get_isr (struct ath_hw *ah,enum ath9k_int *masked, +u32 *sync_cause_p) {u32 isr =0 ;u32 mask2 =0 ;
@@ -310,7 +311,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)ar9003_mci_get_isr (ah, masked);if (sync_cause) { -ath9k_debug_sync_cause (common, sync_cause); +if (sync_cause_p) + *sync_cause_p = sync_cause; fatal_int = (sync_cause & (AR_INTR_SYNC_HOST1_FATAL |AR_INTR_SYNC_HOST1_PERR ))
drivers/net/wireless/ath/ath9k/debug.c +41 -0
47 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/debug.h +7 -0
@@ -295,6 +295,8 @@ void ath9k_sta_add_debugfs(struct ieee80211_hw *hw,void ath9k_debug_stat_ant (struct ath_softc *sc,struct ath_hw_antcomb_conf *div_ant_conf,int main_rssi_avg,int alt_rssi_avg); +void ath9k_debug_sync_cause (struct ath_softc *sc,u32 sync_cause); +#else #define RX_STAT_INC (c)/* NOP */
@@ -329,6 +331,11 @@ static inline void ath9k_debug_stat_ant(struct ath_softc *sc, } +static inline void +ath9k_debug_sync_cause (struct ath_softc *sc,u32 sync_cause) +{ +} +#endif /* CONFIG_ATH9K_DEBUGFS */ #endif /* DEBUG_H */
drivers/net/wireless/ath/ath9k/hw-ops.h +3 -2
@@ -49,9 +49,10 @@ static inline bool ath9k_hw_calibrate(struct ath_hw *ah,return ath9k_hw_ops (ah)->calibrate (ah, chan, rxchainmask, longcal); } -static inline bool ath9k_hw_getisr (struct ath_hw *ah,enum ath9k_int *masked) +static inline bool ath9k_hw_getisr (struct ath_hw *ah,enum ath9k_int *masked, +u32 *sync_cause_p) { -return ath9k_hw_ops (ah)->get_isr (ah, masked); +return ath9k_hw_ops (ah)->get_isr (ah, masked, sync_cause_p); } static inline void ath9k_hw_set_txdesc(struct ath_hw *ah, void *ds,
drivers/net/wireless/ath/ath9k/hw.c +0 -42
48 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/hw.h +2 -8
@@ -667,7 +667,8 @@ struct ath_hw_ops {struct ath9k_channel *chan, u8 rxchainmask, bool longcal); -bool (*get_isr)(struct ath_hw *ah,enum ath9k_int *masked); +bool (*get_isr)(struct ath_hw *ah,enum ath9k_int *masked, +u32 *sync_cause_p);void (*set_txdesc)(struct ath_hw *ah,void *ds,struct ath_tx_info *i); int (*proc_txdesc)(struct ath_hw *ah, void *ds,
@@ -994,13 +995,6 @@ bool ath9k_hw_check_alive(struct ath_hw *ah);bool ath9k_hw_setpower (struct ath_hw *ah,enum ath9k_power_mode mode); -#ifdef CONFIG_ATH9K_DEBUGFS -void ath9k_debug_sync_cause (struct ath_common *common,u32 sync_cause); -#else -static inline void ath9k_debug_sync_cause (struct ath_common *common, -u32 sync_cause) {} -#endif -/* Generic hw timer primitives */ struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah, void (*trigger)(void *),
drivers/net/wireless/ath/ath9k/main.c +3 -1
@@ -541,6 +541,7 @@ irqreturn_t ath_isr(int irq, void *dev)struct ath_hw *ah = sc->sc_ah;struct ath_common *common =ath9k_hw_common (ah);enum ath9k_int status; +u32 sync_cause;bool sched = false;/*
@@ -567,7 +568,8 @@ irqreturn_t ath_isr(int irq, void *dev)* bits we haven't explicitly enabled so we mask the * value to insure we only process bits we requested. */ -ath9k_hw_getisr (ah, &status);/* NB: clears ISR too */ +ath9k_hw_getisr (ah, &status, &sync_cause);/* NB: clears ISR too */ +ath9k_debug_sync_cause (sc, sync_cause); status &= ah->imask;/* discard unasked-for bits */ /*
Signature · 1 line
1.8.3.4 (Apple Git-47)
PATCH 2/4 ath9k: call ath9k_set_tsfadjust from ath9k_beacon_config
Make that function and ath9k_allow_beacon_config static
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/ath/ath9k/ath9k.h | 2 -- drivers/net/wireless/ath/ath9k/beacon.c | 12 +++++++++--- drivers/net/wireless/ath/ath9k/main.c | 9 ++------- 3 files changed, 11 insertions(+), 12 deletions(-)
drivers/net/wireless/ath/ath9k/ath9k.h +0 -2
@@ -431,12 +431,10 @@ struct ath_beacon { };void ath9k_beacon_tasklet (unsigned long data); -bool ath9k_allow_beacon_config (struct ath_softc *sc,struct ieee80211_vif *vif);void ath9k_beacon_config (struct ath_softc *sc,struct ieee80211_vif *vif,u32 changed);void ath9k_beacon_assign_slot (struct ath_softc *sc,struct ieee80211_vif *vif);void ath9k_beacon_remove_slot (struct ath_softc *sc,struct ieee80211_vif *vif); -void ath9k_set_tsfadjust (struct ath_softc *sc,struct ieee80211_vif *vif);void ath9k_set_beacon (struct ath_softc *sc);bool ath9k_csa_is_finished (struct ath_softc *sc);
drivers/net/wireless/ath/ath9k/beacon.c +9 -3
@@ -274,7 +274,7 @@ static int ath9k_beacon_choose_slot(struct ath_softc *sc)return slot; } -void ath9k_set_tsfadjust (struct ath_softc *sc,struct ieee80211_vif *vif) +static void ath9k_set_tsfadjust (struct ath_softc *sc,struct ieee80211_vif *vif) {struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;
@@ -622,7 +622,8 @@ static void ath9k_beacon_config_adhoc(struct ath_softc *sc,set_bit (SC_OP_BEACONS , &sc->sc_flags); } -bool ath9k_allow_beacon_config (struct ath_softc *sc,struct ieee80211_vif *vif) +static bool ath9k_allow_beacon_config (struct ath_softc *sc, +struct ieee80211_vif *vif) {struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_vif *avp = (void *)vif->drv_priv;
@@ -693,12 +694,17 @@ void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,unsigned long flags;bool skip_beacon = false; +if (vif->type ==NL80211_IFTYPE_AP ) +ath9k_set_tsfadjust (sc, vif); + +if (!ath9k_allow_beacon_config (sc, vif)) +return ; +if (sc->sc_ah->opmode ==NL80211_IFTYPE_STATION ) {ath9k_cache_beacon_config (sc, bss_conf);ath9k_set_beacon (sc);set_bit (SC_OP_BEACONS , &sc->sc_flags);return ; - }/*
drivers/net/wireless/ath/ath9k/main.c +2 -7
@@ -1665,13 +1665,8 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, }if ((changed &BSS_CHANGED_BEACON_ENABLED ) || - (changed &BSS_CHANGED_BEACON_INT )) { -if (ah->opmode ==NL80211_IFTYPE_AP && - bss_conf->enable_beacon) -ath9k_set_tsfadjust (sc, vif); -if (ath9k_allow_beacon_config (sc, vif)) -ath9k_beacon_config (sc, vif, changed); - } + (changed &BSS_CHANGED_BEACON_INT )) +ath9k_beacon_config (sc, vif, changed);if (changed &BSS_CHANGED_ERP_SLOT ) {if (bss_conf->use_short_slot)
Signature · 1 line
1.8.3.4 (Apple Git-47)
PATCH 3/4 ath9k: fix TSF offset precision issue
In reply to Felix FietkauDividing the beacon interval by ATH_BCBUF (8) truncates the result for the default beacon interval of 100.
Fix the calculation by moving the division after conversion from TU to microseconds.
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/ath/ath9k/beacon.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/net/wireless/ath/ath9k/beacon.c +4 -3
@@ -279,13 +279,14 @@ static void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)struct ath_common *common =ath9k_hw_common (sc->sc_ah);struct ath_beacon_config *cur_conf = &sc->cur_beacon_conf;struct ath_vif *avp = (void *)vif->drv_priv; -u64 tsfadjust; +u32 tsfadjust;if (avp->av_bslot ==0 )return ; - tsfadjust = cur_conf->beacon_interval * avp->av_bslot /ATH_BCBUF ; - avp->tsf_adjust =cpu_to_le64 (TU_TO_USEC (tsfadjust)); + tsfadjust = cur_conf->beacon_interval * avp->av_bslot; + tsfadjust =TU_TO_USEC (tsfadjust) /ATH_BCBUF ; + avp->tsf_adjust =cpu_to_le64 (tsfadjust);ath_dbg (common,CONFIG ,"tsfadjust is: %llu for bslot: %d\n" , (unsigned long long )tsfadjust, avp->av_bslot);
Signature · 1 line
1.8.3.4 (Apple Git-47)
PATCH 4/4 ath9k: simplify/fix tx packet TID handling
In reply to Felix Fietkaumac80211 guarantees that skb->priority is set to the TID, so use it instead of trying to parse the QoS header manually.
Signed-off-by Felix Fietkau <[email protected]>
--- drivers/net/wireless/ath/ath9k/xmit.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/net/wireless/ath/ath9k/xmit.c +1 -8
@@ -174,14 +174,7 @@ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,static struct ath_atx_tid *ath_get_skb_tid (struct ath_softc *sc,struct ath_node *an,struct sk_buff *skb) { -struct ieee80211_hdr *hdr; -u8 tidno =0 ; - - hdr = (struct ieee80211_hdr *) skb->data; -if (ieee80211_is_data_qos (hdr->frame_control)) - tidno =ieee80211_get_qos_ctl (hdr)[0 ]; - - tidno &=IEEE80211_QOS_CTL_TID_MASK ; +u8 tidno = skb->priority &IEEE80211_QOS_CTL_TID_MASK ;return ATH_AN_2_TID (an, tidno); }
Signature · 1 line
1.8.3.4 (Apple Git-47)