1 commit 4c8a3486cb577d40c1ef75f0a8dc9a04773eef83
2 Author: Nickolay Ledovskikh <nledovskikh@gmail.com>
3 Date: Fri Apr 25 22:53:34 2014 +0400
5 ath5k: Fix AR5K_PHY_TXPOWER_RATE_MAX register value setting.
7 I was reading ath5k power setting code and
8 noticed typing error in ath5k_hw_txpower function.
9 Invalid value was written to AR5K_PHY_TXPOWER_RATE_MAX
12 Signed-off-by: Nikolay Ledovskikh <nledovskikh@gmail.com>
13 Acked-by: Nick Kossifidis <mickflemm@gmail.com>
14 Signed-off-by: John W. Linville <linville@tuxdriver.com>
16 commit 4d76248013dbb1948429555208900a585b0f351d
17 Author: Janusz Dziedzic <janusz.dziedzic@tieto.com>
18 Date: Tue Apr 8 13:38:43 2014 +0200
20 ath9k: Enable DFS only when ATH9K_DFS_CERTIFIED
22 Add DFS interface combination only when
23 CONFIG_ATH9K_DFS_CERTIFIED is set. In other case
24 user can run CAC/beaconing without proper handling
25 of pulse events (without radar detection activated).
27 Reported-by: Cedric Voncken <cedric.voncken@acksys.fr>
28 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
29 Signed-off-by: John W. Linville <linville@tuxdriver.com>
31 commit c83a4e5156a4b4dd22137d33a5625440982d6d37
32 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
33 Date: Mon Apr 28 21:17:08 2014 +0530
35 ath9k_hw: fix worse EVM for 11b rates
37 Adjust FIR filter co-efficients to improve EVM for 11b rates.
39 Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
40 Signed-off-by: John W. Linville <linville@tuxdriver.com>
42 commit 8aab2c7a2f4a957e344db429dfb1190ae59ce8b5
43 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
44 Date: Mon Apr 28 21:17:07 2014 +0530
46 ath9k_hw: update ar9300 initvals
48 * rfsat gainchange hysteresis of rf_gain stuck with large
51 Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
52 Signed-off-by: John W. Linville <linville@tuxdriver.com>
54 commit 8c7ae357cc5b6bd037ad2d666e9f3789cf882925
55 Author: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
56 Date: Wed Apr 23 15:07:57 2014 +0530
58 ath9k: fix race in setting ATH_OP_INVALID
60 The commit "ath9k: move sc_flags to ath_common" moved setting
61 ATH_OP_INVALID flag below ieee80211_register_hw. This is causing
62 the flag never being cleared randomly as the drv_start is called
63 prior to setting flag. Fix this by setting the flag prior to
66 Signed-off-by: Rajkumar Manoharan <rmanohar@qti.qualcomm.com>
67 Signed-off-by: John W. Linville <linville@tuxdriver.com>
69 commit c82552c5b0cb1735dbcbad78b1ffc6d3c212dc56
70 Author: Tim Harvey <tharvey@gateworks.com>
71 Date: Mon Apr 21 16:14:57 2014 -0700
73 ath9k: add a recv budget
75 Implement a recv budget so that in cases of high traffic we still allow other
76 taskets to get processed.
78 Without this, we can encounter a host of issues during high wireless traffic
79 reception depending on system load including rcu stall's detected (ARM),
80 soft lockups, failure to service critical tasks such as watchdog resets,
81 and triggering of the tx stuck tasklet.
83 The same thing was proposed previously by Ben:
84 http://www.spinics.net/lists/linux-wireless/msg112891.html
86 The only difference here is that I make sure only processed packets are counted
87 in the budget by checking at the end of the rx loop.
89 Signed-off-by: Tim Harvey <tharvey@gateworks.com>
90 Acked-by: Felix Fietkau <nbd@openwrt.org>
91 Signed-off-by: John W. Linville <linville@tuxdriver.com>
93 commit 3a758134e66ca74a9df792616b5288b2fa2cfd7f
94 Author: Tim Harvey <tharvey@gateworks.com>
95 Date: Mon Apr 21 16:14:56 2014 -0700
97 ath9k: fix possible hang on flush
99 If a flush is requested, make sure to clear the descriptor once we've
102 This resolves a hang that will occur if all RX descriptors are full when a
105 Signed-off-by: Tim Harvey <tharvey@gateworks.com>
106 Acked-by: Felix Fietkau <nbd@openwrt.org>
107 Signed-off-by: John W. Linville <linville@tuxdriver.com>
109 commit eefb1d6adc4c60d219182b8917e4567484ce07fc
110 Author: Felix Fietkau <nbd@openwrt.org>
111 Date: Mon Apr 28 18:27:41 2014 +0200
113 ath9k: remove tid->paused flag
115 There are some corner cases where the driver could get stuck with a full
116 tid queue that is paused, leading to a software tx queue hang.
118 Since the tx queueing rework, pausing per-tid queues on aggregation
119 session setup is no longer necessary. The driver will assign sequence
120 numbers to buffered frames when a new session is established, in order
121 to get the correct starting sequence number.
123 mac80211 prevents new frames from entering the queue during setup.
125 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
127 commit 98a713933d8495f4078f561c1e651b738dd5b531
128 Author: Felix Fietkau <nbd@openwrt.org>
129 Date: Sun Apr 27 14:49:03 2014 +0200
131 ath9k_hw: do not lower ANI setting below default on AR913x
133 When the amount of noise fluctuates strongly, low immunity settings
134 can sometimes disrupt signal detection on AR913x chips. When that
135 happens, no OFDM/CCK errors are reported anymore, and ANI tunes the
136 radio to the lowest immunity settings.
137 Usually rx/tx fails as well in that case.
139 To fix this, keep noise immunity settings at or above ANI default level,
140 which will keep radio parameters at or above INI values.
142 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
144 commit 7cbb4c021bfd1e656f5b9953a947ab3c64e4e3b0
145 Author: Felix Fietkau <nbd@openwrt.org>
146 Date: Thu Apr 10 10:49:01 2014 +0200
148 mac80211: exclude AP_VLAN interfaces from tx power calculation
150 Their power value is initialized to zero. This patch fixes an issue
151 where the configured power drops to the minimum value when AP_VLAN
152 interfaces are created/removed.
154 Cc: stable@vger.kernel.org
155 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
157 commit 0ca13e26341733bf9577287fb04a3bef0d2f5cc9
158 Author: Felix Fietkau <nbd@openwrt.org>
159 Date: Wed Apr 9 00:07:01 2014 +0200
161 mac80211: suppress BSS info change notifications for AP_VLAN
163 Fixes warnings on tx power changes
165 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
167 commit ec998e5991781ecdaad0911dc64f1c8d3749c308
168 Author: Felix Fietkau <nbd@openwrt.org>
169 Date: Tue Apr 8 23:42:17 2014 +0200
171 ath9k: fix a scheduling while atomic bug in CSA handling
173 Commit "ath9k: prepare for multi-interface CSA support" added a call to
174 ieee80211_iterate_active_interfaces in atomic context (beacon tasklet),
176 Use ieee80211_iterate_active_interfaces_atomic instead.
178 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
180 commit 93f310a38a1d81a4bc8fcd9bf29628bd721cf2ef
181 Author: Felix Fietkau <nbd@openwrt.org>
182 Date: Sun Apr 6 23:35:28 2014 +0200
184 ath9k_hw: reduce ANI firstep range for older chips
186 Use 0-8 instead of 0-16, which is closer to the old implementation.
187 Also drop the overwrite of the firstep_low parameter to improve
190 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
193 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
194 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
195 @@ -1004,11 +1004,9 @@ static bool ar5008_hw_ani_control_new(st
196 case ATH9K_ANI_FIRSTEP_LEVEL:{
201 REG_RMW_FIELD(ah, AR_PHY_FIND_SIG,
202 AR_PHY_FIND_SIG_FIRSTEP, value);
203 - REG_RMW_FIELD(ah, AR_PHY_FIND_SIG_LOW,
204 - AR_PHY_FIND_SIG_FIRSTEP_LOW, value);
206 if (level != aniState->firstepLevel) {
208 --- a/drivers/net/wireless/ath/ath9k/beacon.c
209 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
210 @@ -312,10 +312,9 @@ static void ath9k_csa_update_vif(void *d
212 void ath9k_csa_update(struct ath_softc *sc)
214 - ieee80211_iterate_active_interfaces(sc->hw,
215 - IEEE80211_IFACE_ITER_NORMAL,
216 - ath9k_csa_update_vif,
218 + ieee80211_iterate_active_interfaces_atomic(sc->hw,
219 + IEEE80211_IFACE_ITER_NORMAL,
220 + ath9k_csa_update_vif, sc);
223 void ath9k_beacon_tasklet(unsigned long data)
224 --- a/net/mac80211/main.c
225 +++ b/net/mac80211/main.c
226 @@ -152,6 +152,8 @@ static u32 ieee80211_hw_conf_chan(struct
227 list_for_each_entry_rcu(sdata, &local->interfaces, list) {
228 if (!rcu_access_pointer(sdata->vif.chanctx_conf))
230 + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
232 power = min(power, sdata->vif.bss_conf.txpower);
235 @@ -203,7 +205,7 @@ void ieee80211_bss_info_change_notify(st
237 struct ieee80211_local *local = sdata->local;
240 + if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
243 drv_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed);
244 --- a/drivers/net/wireless/ath/ath9k/ani.c
245 +++ b/drivers/net/wireless/ath/ath9k/ani.c
246 @@ -155,6 +155,9 @@ static void ath9k_hw_set_ofdm_nil(struct
247 ATH9K_ANI_RSSI_THR_LOW,
248 ATH9K_ANI_RSSI_THR_HIGH);
250 + if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_OFDM_DEF_LEVEL)
251 + immunityLevel = ATH9K_ANI_OFDM_DEF_LEVEL;
254 aniState->ofdmNoiseImmunityLevel = immunityLevel;
256 @@ -235,6 +238,9 @@ static void ath9k_hw_set_cck_nil(struct
257 BEACON_RSSI(ah), ATH9K_ANI_RSSI_THR_LOW,
258 ATH9K_ANI_RSSI_THR_HIGH);
260 + if (AR_SREV_9100(ah) && immunityLevel < ATH9K_ANI_CCK_DEF_LEVEL)
261 + immunityLevel = ATH9K_ANI_CCK_DEF_LEVEL;
263 if (ah->opmode == NL80211_IFTYPE_STATION &&
264 BEACON_RSSI(ah) <= ATH9K_ANI_RSSI_THR_LOW &&
265 immunityLevel > ATH9K_ANI_CCK_MAX_LEVEL_LOW_RSSI)
266 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
267 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
268 @@ -251,7 +251,6 @@ struct ath_atx_tid {
276 --- a/drivers/net/wireless/ath/ath9k/xmit.c
277 +++ b/drivers/net/wireless/ath/ath9k/xmit.c
278 @@ -107,9 +107,6 @@ static void ath_tx_queue_tid(struct ath_
280 struct ath_atx_ac *ac = tid->ac;
288 @@ -1407,7 +1404,6 @@ int ath_tx_aggr_start(struct ath_softc *
289 ath_tx_tid_change_state(sc, txtid);
291 txtid->active = true;
292 - txtid->paused = true;
293 *ssn = txtid->seq_start = txtid->seq_next;
294 txtid->bar_index = -1;
296 @@ -1427,7 +1423,6 @@ void ath_tx_aggr_stop(struct ath_softc *
298 ath_txq_lock(sc, txq);
299 txtid->active = false;
300 - txtid->paused = false;
301 ath_tx_flush_tid(sc, txtid);
302 ath_tx_tid_change_state(sc, txtid);
303 ath_txq_unlock_complete(sc, txq);
304 @@ -1487,7 +1482,7 @@ void ath_tx_aggr_wakeup(struct ath_softc
305 ath_txq_lock(sc, txq);
306 ac->clear_ps_filter = true;
308 - if (!tid->paused && ath_tid_has_buffered(tid)) {
309 + if (ath_tid_has_buffered(tid)) {
310 ath_tx_queue_tid(txq, tid);
311 ath_txq_schedule(sc, txq);
313 @@ -1510,7 +1505,6 @@ void ath_tx_aggr_resume(struct ath_softc
314 ath_txq_lock(sc, txq);
316 tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
317 - tid->paused = false;
319 if (ath_tid_has_buffered(tid)) {
320 ath_tx_queue_tid(txq, tid);
321 @@ -1544,8 +1538,6 @@ void ath9k_release_buffered_frames(struc
324 tid = ATH_AN_2_TID(an, i);
328 ath_txq_lock(sc, tid->ac->txq);
329 while (nframes > 0) {
330 @@ -1844,9 +1836,6 @@ void ath_txq_schedule(struct ath_softc *
331 list_del(&tid->list);
337 if (ath_tx_sched_aggr(sc, txq, tid, &stop))
340 @@ -2698,7 +2687,6 @@ void ath_tx_node_init(struct ath_softc *
341 tid->baw_size = WME_MAX_BA;
342 tid->baw_head = tid->baw_tail = 0;
344 - tid->paused = false;
346 __skb_queue_head_init(&tid->buf_q);
347 __skb_queue_head_init(&tid->retry_q);
348 --- a/drivers/net/wireless/ath/ath9k/recv.c
349 +++ b/drivers/net/wireless/ath/ath9k/recv.c
350 @@ -975,6 +975,7 @@ int ath_rx_tasklet(struct ath_softc *sc,
353 dma_addr_t new_buf_addr;
354 + unsigned int budget = 512;
357 dma_type = DMA_BIDIRECTIONAL;
358 @@ -1113,15 +1114,17 @@ requeue_drop_frag:
361 list_add_tail(&bf->list, &sc->rx.rxbuf);
366 ath_rx_edma_buf_link(sc, qtype);
368 ath_rx_buf_relink(sc, bf);
369 - ath9k_hw_rxena(ah);
371 + ath9k_hw_rxena(ah);
378 if (!(ah->imask & ATH9K_INT_RXEOL)) {
379 --- a/drivers/net/wireless/ath/ath9k/ahb.c
380 +++ b/drivers/net/wireless/ath/ath9k/ahb.c
381 @@ -86,7 +86,6 @@ static int ath_ahb_probe(struct platform
385 - struct ath_common *common;
388 if (!dev_get_platdata(&pdev->dev)) {
389 @@ -146,9 +145,6 @@ static int ath_ahb_probe(struct platform
390 wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
391 hw_name, (unsigned long)mem, irq);
393 - common = ath9k_hw_common(sc->sc_ah);
394 - /* Will be cleared in ath9k_start() */
395 - set_bit(ATH_OP_INVALID, &common->op_flags);
399 --- a/drivers/net/wireless/ath/ath9k/init.c
400 +++ b/drivers/net/wireless/ath/ath9k/init.c
401 @@ -670,6 +670,7 @@ static const struct ieee80211_iface_comb
402 .num_different_channels = 1,
403 .beacon_int_infra_match = true,
405 +#ifdef CONFIG_ATH9K_DFS_CERTIFIED
407 .limits = if_dfs_limits,
408 .n_limits = ARRAY_SIZE(if_dfs_limits),
409 @@ -679,6 +680,7 @@ static const struct ieee80211_iface_comb
410 .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
411 BIT(NL80211_CHAN_WIDTH_20),
416 static void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
417 @@ -781,6 +783,9 @@ int ath9k_init_device(u16 devid, struct
418 common = ath9k_hw_common(ah);
419 ath9k_set_hw_capab(sc, hw);
421 + /* Will be cleared in ath9k_start() */
422 + set_bit(ATH_OP_INVALID, &common->op_flags);
424 /* Initialize regulatory */
425 error = ath_regd_init(&common->regulatory, sc->hw->wiphy,
427 --- a/drivers/net/wireless/ath/ath9k/pci.c
428 +++ b/drivers/net/wireless/ath/ath9k/pci.c
429 @@ -784,7 +784,6 @@ static int ath_pci_probe(struct pci_dev
431 struct ath_softc *sc;
432 struct ieee80211_hw *hw;
433 - struct ath_common *common;
437 @@ -877,10 +876,6 @@ static int ath_pci_probe(struct pci_dev
438 wiphy_info(hw->wiphy, "%s mem=0x%lx, irq=%d\n",
439 hw_name, (unsigned long)sc->mem, pdev->irq);
441 - /* Will be cleared in ath9k_start() */
442 - common = ath9k_hw_common(sc->sc_ah);
443 - set_bit(ATH_OP_INVALID, &common->op_flags);
448 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
449 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
450 @@ -410,7 +410,7 @@ static const u32 ar9300_2p2_baseband_cor
451 {0x00009e30, 0x06336f77},
452 {0x00009e34, 0x6af6532f},
453 {0x00009e38, 0x0cc80c00},
454 - {0x00009e40, 0x0d261820},
455 + {0x00009e40, 0x0d261800},
456 {0x00009e4c, 0x00001004},
457 {0x00009e50, 0x00ff03f1},
458 {0x00009e54, 0x00000000},
459 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
460 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p1_initvals.h
461 @@ -592,7 +592,7 @@ static const u32 ar9331_1p1_baseband_cor
462 {0x00009e30, 0x06336f77},
463 {0x00009e34, 0x6af6532f},
464 {0x00009e38, 0x0cc80c00},
465 - {0x00009e40, 0x0d261820},
466 + {0x00009e40, 0x0d261800},
467 {0x00009e4c, 0x00001004},
468 {0x00009e50, 0x00ff03f1},
469 {0x00009fc0, 0x803e4788},
470 --- a/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
471 +++ b/drivers/net/wireless/ath/ath9k/ar9330_1p2_initvals.h
472 @@ -231,7 +231,7 @@ static const u32 ar9331_1p2_baseband_cor
473 {0x00009e30, 0x06336f77},
474 {0x00009e34, 0x6af6532f},
475 {0x00009e38, 0x0cc80c00},
476 - {0x00009e40, 0x0d261820},
477 + {0x00009e40, 0x0d261800},
478 {0x00009e4c, 0x00001004},
479 {0x00009e50, 0x00ff03f1},
480 {0x00009fc0, 0x803e4788},
481 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
482 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
483 @@ -318,7 +318,7 @@ static const u32 ar9340_1p0_baseband_cor
484 {0x00009e30, 0x06336f77},
485 {0x00009e34, 0x6af6532f},
486 {0x00009e38, 0x0cc80c00},
487 - {0x00009e40, 0x0d261820},
488 + {0x00009e40, 0x0d261800},
489 {0x00009e4c, 0x00001004},
490 {0x00009e50, 0x00ff03f1},
491 {0x00009e54, 0x00000000},
492 @@ -348,9 +348,9 @@ static const u32 ar9340_1p0_baseband_cor
493 {0x0000a370, 0x00000000},
494 {0x0000a390, 0x00000001},
495 {0x0000a394, 0x00000444},
496 - {0x0000a398, 0x00000000},
497 - {0x0000a39c, 0x210d0401},
498 - {0x0000a3a0, 0xab9a7144},
499 + {0x0000a398, 0x001f0e0f},
500 + {0x0000a39c, 0x0075393f},
501 + {0x0000a3a0, 0xb79f6427},
502 {0x0000a3a4, 0x00000000},
503 {0x0000a3a8, 0xaaaaaaaa},
504 {0x0000a3ac, 0x3c466478},
505 --- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
506 +++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
507 @@ -90,7 +90,7 @@ static const u32 ar9580_1p0_baseband_cor
508 {0x00009e30, 0x06336f77},
509 {0x00009e34, 0x6af6532f},
510 {0x00009e38, 0x0cc80c00},
511 - {0x00009e40, 0x0d261820},
512 + {0x00009e40, 0x0d261800},
513 {0x00009e4c, 0x00001004},
514 {0x00009e50, 0x00ff03f1},
515 {0x00009e54, 0x00000000},
516 --- a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
517 +++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
518 @@ -257,9 +257,9 @@ static const u32 qca953x_1p0_baseband_co
519 {0x0000a370, 0x00000000},
520 {0x0000a390, 0x00000001},
521 {0x0000a394, 0x00000444},
522 - {0x0000a398, 0x1f020503},
523 - {0x0000a39c, 0x29180c03},
524 - {0x0000a3a0, 0x9a8b6844},
525 + {0x0000a398, 0x001f0e0f},
526 + {0x0000a39c, 0x0075393f},
527 + {0x0000a3a0, 0xb79f6427},
528 {0x0000a3a4, 0x000000ff},
529 {0x0000a3a8, 0x6a6a6a6a},
530 {0x0000a3ac, 0x6a6a6a6a},
531 --- a/drivers/net/wireless/ath/ath5k/phy.c
532 +++ b/drivers/net/wireless/ath/ath5k/phy.c
533 @@ -3709,8 +3709,8 @@ ath5k_hw_txpower(struct ath5k_hw *ah, st
534 AR5K_REG_MS(AR5K_TUNE_MAX_TXPOWER, AR5K_TPC_CHIRP),
537 - ath5k_hw_reg_write(ah, AR5K_PHY_TXPOWER_RATE_MAX |
538 - AR5K_TUNE_MAX_TXPOWER, AR5K_PHY_TXPOWER_RATE_MAX);
539 + ath5k_hw_reg_write(ah, AR5K_TUNE_MAX_TXPOWER,
540 + AR5K_PHY_TXPOWER_RATE_MAX);