projects / openwrt / svn-archive / archive.git / blob
? search:
summary | shortlog | log | commit | commitdiff | tree
history | raw | HEAD
ath9k: fix memory corruption issues on ar5416/ar91xx
[openwrt/svn-archive/archive.git] / package / mac80211 / patches / 300-pending_work.patch
1 --- a/net/mac80211/agg-rx.c
2 +++ b/net/mac80211/agg-rx.c
3 @@ -203,6 +203,8 @@ static void ieee80211_send_addba_resp(st
4 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
5 else if (sdata->vif.type == NL80211_IFTYPE_ADHOC)
6 memcpy(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN);
7 + else if (sdata->vif.type == NL80211_IFTYPE_WDS)
8 + memcpy(mgmt->bssid, da, ETH_ALEN);
9
10 mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT |
11 IEEE80211_STYPE_ACTION);
12 --- a/net/mac80211/agg-tx.c
13 +++ b/net/mac80211/agg-tx.c
14 @@ -81,7 +81,8 @@ static void ieee80211_send_addba_request
15 memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN);
16 if (sdata->vif.type == NL80211_IFTYPE_AP ||
17 sdata->vif.type == NL80211_IFTYPE_AP_VLAN ||
18 - sdata->vif.type == NL80211_IFTYPE_MESH_POINT)
19 + sdata->vif.type == NL80211_IFTYPE_MESH_POINT ||
20 + sdata->vif.type == NL80211_IFTYPE_WDS)
21 memcpy(mgmt->bssid, sdata->vif.addr, ETH_ALEN);
22 else if (sdata->vif.type == NL80211_IFTYPE_STATION)
23 memcpy(mgmt->bssid, sdata->u.mgd.bssid, ETH_ALEN);
24 @@ -520,6 +521,7 @@ int ieee80211_start_tx_ba_session(struct
25 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
26 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
27 sdata->vif.type != NL80211_IFTYPE_AP &&
28 + sdata->vif.type != NL80211_IFTYPE_WDS &&
29 sdata->vif.type != NL80211_IFTYPE_ADHOC)
30 return -EINVAL;
31
32 --- a/net/mac80211/debugfs_sta.c
33 +++ b/net/mac80211/debugfs_sta.c
34 @@ -65,11 +65,11 @@ static ssize_t sta_flags_read(struct fil
35 test_sta_flag(sta, WLAN_STA_##flg) ? #flg "\n" : ""
36
37 int res = scnprintf(buf, sizeof(buf),
38 - "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
39 + "%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s",
40 TEST(AUTH), TEST(ASSOC), TEST(PS_STA),
41 TEST(PS_DRIVER), TEST(AUTHORIZED),
42 TEST(SHORT_PREAMBLE),
43 - TEST(WME), TEST(WDS), TEST(CLEAR_PS_FILT),
44 + TEST(WME), TEST(CLEAR_PS_FILT),
45 TEST(MFP), TEST(BLOCK_BA), TEST(PSPOLL),
46 TEST(UAPSD), TEST(SP), TEST(TDLS_PEER),
47 TEST(TDLS_PEER_AUTH), TEST(4ADDR_EVENT),
48 --- a/net/mac80211/iface.c
49 +++ b/net/mac80211/iface.c
50 @@ -501,7 +501,6 @@ int ieee80211_do_open(struct wireless_de
51 struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
52 struct net_device *dev = wdev->netdev;
53 struct ieee80211_local *local = sdata->local;
54 - struct sta_info *sta;
55 u32 changed = 0;
56 int res;
57 u32 hw_reconf_flags = 0;
58 @@ -658,30 +657,8 @@ int ieee80211_do_open(struct wireless_de
59
60 set_bit(SDATA_STATE_RUNNING, &sdata->state);
61
62 - if (sdata->vif.type == NL80211_IFTYPE_WDS) {
63 - /* Create STA entry for the WDS peer */
64 - sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
65 - GFP_KERNEL);
66 - if (!sta) {
67 - res = -ENOMEM;
68 - goto err_del_interface;
69 - }
70 -
71 - sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
72 - sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
73 - sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
74 -
75 - res = sta_info_insert(sta);
76 - if (res) {
77 - /* STA has been freed */
78 - goto err_del_interface;
79 - }
80 -
81 - rate_control_rate_init(sta);
82 - netif_carrier_on(dev);
83 - } else if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) {
84 + if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE)
85 rcu_assign_pointer(local->p2p_sdata, sdata);
86 - }
87
88 /*
89 * set_multicast_list will be invoked by the networking core
90 @@ -1066,6 +1043,72 @@ static void ieee80211_if_setup(struct ne
91 dev->destructor = free_netdev;
92 }
93
94 +static void ieee80211_wds_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
95 + struct sk_buff *skb)
96 +{
97 + struct ieee80211_local *local = sdata->local;
98 + struct ieee80211_rx_status *rx_status;
99 + struct ieee802_11_elems elems;
100 + struct ieee80211_mgmt *mgmt;
101 + struct sta_info *sta;
102 + size_t baselen;
103 + u32 rates = 0;
104 + u16 stype;
105 + bool new = false;
106 + enum ieee80211_band band = local->hw.conf.channel->band;
107 + struct ieee80211_supported_band *sband = local->hw.wiphy->bands[band];
108 +
109 + rx_status = IEEE80211_SKB_RXCB(skb);
110 + mgmt = (struct ieee80211_mgmt *) skb->data;
111 + stype = le16_to_cpu(mgmt->frame_control) & IEEE80211_FCTL_STYPE;
112 +
113 + if (stype != IEEE80211_STYPE_BEACON)
114 + return;
115 +
116 + baselen = (u8 *) mgmt->u.probe_resp.variable - (u8 *) mgmt;
117 + if (baselen > skb->len)
118 + return;
119 +
120 + ieee802_11_parse_elems(mgmt->u.probe_resp.variable,
121 + skb->len - baselen, &elems);
122 +
123 + rates = ieee80211_sta_get_rates(local, &elems, band, NULL);
124 +
125 + rcu_read_lock();
126 +
127 + sta = sta_info_get(sdata, sdata->u.wds.remote_addr);
128 +
129 + if (!sta) {
130 + rcu_read_unlock();
131 + sta = sta_info_alloc(sdata, sdata->u.wds.remote_addr,
132 + GFP_KERNEL);
133 + if (!sta)
134 + return;
135 +
136 + new = true;
137 + }
138 +
139 + sta->last_rx = jiffies;
140 + sta->sta.supp_rates[local->hw.conf.channel->band] = rates;
141 +
142 + if (elems.ht_cap_elem)
143 + ieee80211_ht_cap_ie_to_sta_ht_cap(sdata, sband,
144 + elems.ht_cap_elem, &sta->sta.ht_cap);
145 +
146 + if (elems.wmm_param)
147 + set_sta_flag(sta, WLAN_STA_WME);
148 +
149 + if (new) {
150 + sta_info_pre_move_state(sta, IEEE80211_STA_AUTH);
151 + sta_info_pre_move_state(sta, IEEE80211_STA_ASSOC);
152 + sta_info_pre_move_state(sta, IEEE80211_STA_AUTHORIZED);
153 + rate_control_rate_init(sta);
154 + sta_info_insert_rcu(sta);
155 + }
156 +
157 + rcu_read_unlock();
158 +}
159 +
160 static void ieee80211_iface_work(struct work_struct *work)
161 {
162 struct ieee80211_sub_if_data *sdata =
163 @@ -1170,6 +1213,9 @@ static void ieee80211_iface_work(struct
164 break;
165 ieee80211_mesh_rx_queued_mgmt(sdata, skb);
166 break;
167 + case NL80211_IFTYPE_WDS:
168 + ieee80211_wds_rx_queued_mgmt(sdata, skb);
169 + break;
170 default:
171 WARN(1, "frame for unexpected interface type");
172 break;
173 --- a/net/mac80211/rx.c
174 +++ b/net/mac80211/rx.c
175 @@ -2350,6 +2350,7 @@ ieee80211_rx_h_action(struct ieee80211_r
176 sdata->vif.type != NL80211_IFTYPE_MESH_POINT &&
177 sdata->vif.type != NL80211_IFTYPE_AP_VLAN &&
178 sdata->vif.type != NL80211_IFTYPE_AP &&
179 + sdata->vif.type != NL80211_IFTYPE_WDS &&
180 sdata->vif.type != NL80211_IFTYPE_ADHOC)
181 break;
182
183 @@ -2655,14 +2656,15 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_
184
185 if (!ieee80211_vif_is_mesh(&sdata->vif) &&
186 sdata->vif.type != NL80211_IFTYPE_ADHOC &&
187 - sdata->vif.type != NL80211_IFTYPE_STATION)
188 + sdata->vif.type != NL80211_IFTYPE_STATION &&
189 + sdata->vif.type != NL80211_IFTYPE_WDS)
190 return RX_DROP_MONITOR;
191
192 switch (stype) {
193 case cpu_to_le16(IEEE80211_STYPE_AUTH):
194 case cpu_to_le16(IEEE80211_STYPE_BEACON):
195 case cpu_to_le16(IEEE80211_STYPE_PROBE_RESP):
196 - /* process for all: mesh, mlme, ibss */
197 + /* process for all: mesh, mlme, ibss, wds */
198 break;
199 case cpu_to_le16(IEEE80211_STYPE_ASSOC_RESP):
200 case cpu_to_le16(IEEE80211_STYPE_REASSOC_RESP):
201 @@ -2987,10 +2989,16 @@ static int prepare_for_handlers(struct i
202 }
203 break;
204 case NL80211_IFTYPE_WDS:
205 - if (bssid || !ieee80211_is_data(hdr->frame_control))
206 - return 0;
207 if (!ether_addr_equal(sdata->u.wds.remote_addr, hdr->addr2))
208 return 0;
209 +
210 + if (ieee80211_is_data(hdr->frame_control) ||
211 + ieee80211_is_action(hdr->frame_control)) {
212 + if (compare_ether_addr(sdata->vif.addr, hdr->addr1))
213 + return 0;
214 + } else if (!ieee80211_is_beacon(hdr->frame_control))
215 + return 0;
216 +
217 break;
218 case NL80211_IFTYPE_P2P_DEVICE:
219 if (!ieee80211_is_public_action(hdr, skb->len) &&
220 --- a/net/mac80211/sta_info.h
221 +++ b/net/mac80211/sta_info.h
222 @@ -32,7 +32,6 @@
223 * @WLAN_STA_SHORT_PREAMBLE: Station is capable of receiving short-preamble
224 * frames.
225 * @WLAN_STA_WME: Station is a QoS-STA.
226 - * @WLAN_STA_WDS: Station is one of our WDS peers.
227 * @WLAN_STA_CLEAR_PS_FILT: Clear PS filter in hardware (using the
228 * IEEE80211_TX_CTL_CLEAR_PS_FILT control flag) when the next
229 * frame to this station is transmitted.
230 @@ -64,7 +63,6 @@ enum ieee80211_sta_info_flags {
231 WLAN_STA_AUTHORIZED,
232 WLAN_STA_SHORT_PREAMBLE,
233 WLAN_STA_WME,
234 - WLAN_STA_WDS,
235 WLAN_STA_CLEAR_PS_FILT,
236 WLAN_STA_MFP,
237 WLAN_STA_BLOCK_BA,
238 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
239 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
240 @@ -324,7 +324,6 @@ struct ath_rx {
241
242 int ath_startrecv(struct ath_softc *sc);
243 bool ath_stoprecv(struct ath_softc *sc);
244 -void ath_flushrecv(struct ath_softc *sc);
245 u32 ath_calcrxfilter(struct ath_softc *sc);
246 int ath_rx_init(struct ath_softc *sc, int nbufs);
247 void ath_rx_cleanup(struct ath_softc *sc);
248 @@ -641,7 +640,6 @@ void ath_ant_comb_update(struct ath_soft
249 enum sc_op_flags {
250 SC_OP_INVALID,
251 SC_OP_BEACONS,
252 - SC_OP_RXFLUSH,
253 SC_OP_ANI_RUN,
254 SC_OP_PRIM_STA_VIF,
255 SC_OP_HW_RESET,
256 --- a/drivers/net/wireless/ath/ath9k/beacon.c
257 +++ b/drivers/net/wireless/ath/ath9k/beacon.c
258 @@ -147,6 +147,7 @@ static struct ath_buf *ath9k_beacon_gene
259 skb->len, DMA_TO_DEVICE);
260 dev_kfree_skb_any(skb);
261 bf->bf_buf_addr = 0;
262 + bf->bf_mpdu = NULL;
263 }
264
265 skb = ieee80211_beacon_get(hw, vif);
266 @@ -359,7 +360,6 @@ void ath9k_beacon_tasklet(unsigned long
267 return;
268
269 bf = ath9k_beacon_generate(sc->hw, vif);
270 - WARN_ON(!bf);
271
272 if (sc->beacon.bmisscnt != 0) {
273 ath_dbg(common, BSTUCK, "resume beacon xmit after %u misses\n",
274 --- a/drivers/net/wireless/ath/ath9k/debug.c
275 +++ b/drivers/net/wireless/ath/ath9k/debug.c
276 @@ -861,7 +861,6 @@ static ssize_t read_file_recv(struct fil
277 RXS_ERR("RX-LENGTH-ERR", rx_len_err);
278 RXS_ERR("RX-OOM-ERR", rx_oom_err);
279 RXS_ERR("RX-RATE-ERR", rx_rate_err);
280 - RXS_ERR("RX-DROP-RXFLUSH", rx_drop_rxflush);
281 RXS_ERR("RX-TOO-MANY-FRAGS", rx_too_many_frags_err);
282
283 PHY_ERR("UNDERRUN ERR", ATH9K_PHYERR_UNDERRUN);
284 --- a/drivers/net/wireless/ath/ath9k/debug.h
285 +++ b/drivers/net/wireless/ath/ath9k/debug.h
286 @@ -216,7 +216,6 @@ struct ath_tx_stats {
287 * @rx_oom_err: No. of frames dropped due to OOM issues.
288 * @rx_rate_err: No. of frames dropped due to rate errors.
289 * @rx_too_many_frags_err: Frames dropped due to too-many-frags received.
290 - * @rx_drop_rxflush: No. of frames dropped due to RX-FLUSH.
291 * @rx_beacons: No. of beacons received.
292 * @rx_frags: No. of rx-fragements received.
293 */
294 @@ -235,7 +234,6 @@ struct ath_rx_stats {
295 u32 rx_oom_err;
296 u32 rx_rate_err;
297 u32 rx_too_many_frags_err;
298 - u32 rx_drop_rxflush;
299 u32 rx_beacons;
300 u32 rx_frags;
301 };
302 --- a/drivers/net/wireless/ath/ath9k/main.c
303 +++ b/drivers/net/wireless/ath/ath9k/main.c
304 @@ -182,7 +182,7 @@ static void ath_restart_work(struct ath_
305 ath_start_ani(sc);
306 }
307
308 -static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx, bool flush)
309 +static bool ath_prepare_reset(struct ath_softc *sc, bool retry_tx)
310 {
311 struct ath_hw *ah = sc->sc_ah;
312 bool ret = true;
313 @@ -196,19 +196,15 @@ static bool ath_prepare_reset(struct ath
314 ath9k_debug_samp_bb_mac(sc);
315 ath9k_hw_disable_interrupts(ah);
316
317 + tasklet_disable(&sc->intr_tq);
318 +
319 if (!ath_stoprecv(sc))
320 ret = false;
321
322 if (!ath_drain_all_txq(sc, retry_tx))
323 ret = false;
324
325 - if (!flush) {
326 - if (ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
327 - ath_rx_tasklet(sc, 1, true);
328 - ath_rx_tasklet(sc, 1, false);
329 - } else {
330 - ath_flushrecv(sc);
331 - }
332 + tasklet_enable(&sc->intr_tq);
333
334 return ret;
335 }
336 @@ -262,7 +258,6 @@ static int ath_reset_internal(struct ath
337 struct ath_common *common = ath9k_hw_common(ah);
338 struct ath9k_hw_cal_data *caldata = NULL;
339 bool fastcc = true;
340 - bool flush = false;
341 int r;
342
343 __ath_cancel_work(sc);
344 @@ -276,11 +271,10 @@ static int ath_reset_internal(struct ath
345
346 if (!hchan) {
347 fastcc = false;
348 - flush = true;
349 hchan = ah->curchan;
350 }
351
352 - if (!ath_prepare_reset(sc, retry_tx, flush))
353 + if (!ath_prepare_reset(sc, retry_tx))
354 fastcc = false;
355
356 ath_dbg(common, CONFIG, "Reset to %u MHz, HT40: %d fastcc: %d\n",
357 @@ -804,7 +798,7 @@ static void ath9k_stop(struct ieee80211_
358 ath9k_hw_cfg_gpio_input(ah, ah->led_pin);
359 }
360
361 - ath_prepare_reset(sc, false, true);
362 + ath_prepare_reset(sc, false);
363
364 if (sc->rx.frag) {
365 dev_kfree_skb_any(sc->rx.frag);
366 --- a/drivers/net/wireless/ath/ath9k/recv.c
367 +++ b/drivers/net/wireless/ath/ath9k/recv.c
368 @@ -280,7 +280,6 @@ int ath_rx_init(struct ath_softc *sc, in
369
370 spin_lock_init(&sc->sc_pcu_lock);
371 spin_lock_init(&sc->rx.rxbuflock);
372 - clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
373
374 common->rx_bufsize = IEEE80211_MAX_MPDU_LEN / 2 +
375 sc->sc_ah->caps.rx_status_len;
376 @@ -464,6 +463,13 @@ start_recv:
377 return 0;
378 }
379
380 +static void ath_flushrecv(struct ath_softc *sc)
381 +{
382 + if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
383 + ath_rx_tasklet(sc, 1, true);
384 + ath_rx_tasklet(sc, 1, false);
385 +}
386 +
387 bool ath_stoprecv(struct ath_softc *sc)
388 {
389 struct ath_hw *ah = sc->sc_ah;
390 @@ -474,6 +480,8 @@ bool ath_stoprecv(struct ath_softc *sc)
391 ath9k_hw_setrxfilter(ah, 0);
392 stopped = ath9k_hw_stopdmarecv(ah, &reset);
393
394 + ath_flushrecv(sc);
395 +
396 if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
397 ath_edma_stop_recv(sc);
398 else
399 @@ -490,15 +498,6 @@ bool ath_stoprecv(struct ath_softc *sc)
400 return stopped && !reset;
401 }
402
403 -void ath_flushrecv(struct ath_softc *sc)
404 -{
405 - set_bit(SC_OP_RXFLUSH, &sc->sc_flags);
406 - if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA)
407 - ath_rx_tasklet(sc, 1, true);
408 - ath_rx_tasklet(sc, 1, false);
409 - clear_bit(SC_OP_RXFLUSH, &sc->sc_flags);
410 -}
411 -
412 static bool ath_beacon_dtim_pending_cab(struct sk_buff *skb)
413 {
414 /* Check whether the Beacon frame has DTIM indicating buffered bc/mc */
415 @@ -735,6 +734,7 @@ static struct ath_buf *ath_get_next_rx_b
416 return NULL;
417 }
418
419 + list_del(&bf->list);
420 if (!bf->bf_mpdu)
421 return bf;
422
423 @@ -1057,9 +1057,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
424
425 do {
426 bool decrypt_error = false;
427 - /* If handling rx interrupt and flush is in progress => exit */
428 - if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags) && (flush == 0))
429 - break;
430
431 memset(&rs, 0, sizeof(rs));
432 if (edma)
433 @@ -1102,15 +1099,6 @@ int ath_rx_tasklet(struct ath_softc *sc,
434
435 ath_debug_stat_rx(sc, &rs);
436
437 - /*
438 - * If we're asked to flush receive queue, directly
439 - * chain it back at the queue without processing it.
440 - */
441 - if (test_bit(SC_OP_RXFLUSH, &sc->sc_flags)) {
442 - RX_STAT_INC(rx_drop_rxflush);
443 - goto requeue_drop_frag;
444 - }
445 -
446 memset(rxs, 0, sizeof(struct ieee80211_rx_status));
447
448 rxs->mactime = (tsf & ~0xffffffffULL) | rs.rs_tstamp;
449 @@ -1245,14 +1233,15 @@ requeue_drop_frag:
450 sc->rx.frag = NULL;
451 }
452 requeue:
453 + list_add_tail(&bf->list, &sc->rx.rxbuf);
454 + if (flush)
455 + continue;
456 +
457 if (edma) {
458 - list_add_tail(&bf->list, &sc->rx.rxbuf);
459 ath_rx_edma_buf_link(sc, qtype);
460 } else {
461 - list_move_tail(&bf->list, &sc->rx.rxbuf);
462 ath_rx_buf_link(sc, bf);
463 - if (!flush)
464 - ath9k_hw_rxena(ah);
465 + ath9k_hw_rxena(ah);
466 }
467 } while (1);
468
469 --- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
470 +++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
471 @@ -4586,14 +4586,14 @@ static int ar9003_hw_cal_pier_get(struct
472 return 0;
473 }
474
475 -static int ar9003_hw_power_control_override(struct ath_hw *ah,
476 - int frequency,
477 - int *correction,
478 - int *voltage, int *temperature)
479 +static void ar9003_hw_power_control_override(struct ath_hw *ah,
480 + int frequency,
481 + int *correction,
482 + int *voltage, int *temperature)
483 {
484 - int tempSlope = 0;
485 + int temp_slope = 0, temp_slope1 = 0, temp_slope2 = 0;
486 struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
487 - int f[8], t[8], i;
488 + int f[8], t[8], t1[3], t2[3], i;
489
490 REG_RMW(ah, AR_PHY_TPC_11_B0,
491 (correction[0] << AR_PHY_TPC_OLPC_GAIN_DELTA_S),
492 @@ -4624,38 +4624,108 @@ static int ar9003_hw_power_control_overr
493 * enable temperature compensation
494 * Need to use register names
495 */
496 - if (frequency < 4000)
497 - tempSlope = eep->modalHeader2G.tempSlope;
498 - else if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
499 - for (i = 0; i < 8; i++) {
500 - t[i] = eep->base_ext1.tempslopextension[i];
501 - f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
502 - }
503 - tempSlope = ar9003_hw_power_interpolate((s32) frequency,
504 - f, t, 8);
505 - } else if (eep->base_ext2.tempSlopeLow != 0) {
506 - t[0] = eep->base_ext2.tempSlopeLow;
507 - f[0] = 5180;
508 - t[1] = eep->modalHeader5G.tempSlope;
509 - f[1] = 5500;
510 - t[2] = eep->base_ext2.tempSlopeHigh;
511 - f[2] = 5785;
512 - tempSlope = ar9003_hw_power_interpolate((s32) frequency,
513 - f, t, 3);
514 - } else
515 - tempSlope = eep->modalHeader5G.tempSlope;
516 + if (frequency < 4000) {
517 + temp_slope = eep->modalHeader2G.tempSlope;
518 + } else {
519 + if (AR_SREV_9550(ah)) {
520 + t[0] = eep->base_ext1.tempslopextension[2];
521 + t1[0] = eep->base_ext1.tempslopextension[3];
522 + t2[0] = eep->base_ext1.tempslopextension[4];
523 + f[0] = 5180;
524 +
525 + t[1] = eep->modalHeader5G.tempSlope;
526 + t1[1] = eep->base_ext1.tempslopextension[0];
527 + t2[1] = eep->base_ext1.tempslopextension[1];
528 + f[1] = 5500;
529 +
530 + t[2] = eep->base_ext1.tempslopextension[5];
531 + t1[2] = eep->base_ext1.tempslopextension[6];
532 + t2[2] = eep->base_ext1.tempslopextension[7];
533 + f[2] = 5785;
534 +
535 + temp_slope = ar9003_hw_power_interpolate(frequency,
536 + f, t, 3);
537 + temp_slope1 = ar9003_hw_power_interpolate(frequency,
538 + f, t1, 3);
539 + temp_slope2 = ar9003_hw_power_interpolate(frequency,
540 + f, t2, 3);
541 +
542 + goto tempslope;
543 + }
544 +
545 + if ((eep->baseEepHeader.miscConfiguration & 0x20) != 0) {
546 + for (i = 0; i < 8; i++) {
547 + t[i] = eep->base_ext1.tempslopextension[i];
548 + f[i] = FBIN2FREQ(eep->calFreqPier5G[i], 0);
549 + }
550 + temp_slope = ar9003_hw_power_interpolate((s32) frequency,
551 + f, t, 8);
552 + } else if (eep->base_ext2.tempSlopeLow != 0) {
553 + t[0] = eep->base_ext2.tempSlopeLow;
554 + f[0] = 5180;
555 + t[1] = eep->modalHeader5G.tempSlope;
556 + f[1] = 5500;
557 + t[2] = eep->base_ext2.tempSlopeHigh;
558 + f[2] = 5785;
559 + temp_slope = ar9003_hw_power_interpolate((s32) frequency,
560 + f, t, 3);
561 + } else {
562 + temp_slope = eep->modalHeader5G.tempSlope;
563 + }
564 + }
565
566 - REG_RMW_FIELD(ah, AR_PHY_TPC_19, AR_PHY_TPC_19_ALPHA_THERM, tempSlope);
567 +tempslope:
568 + if (AR_SREV_9550(ah)) {
569 + /*
570 + * AR955x has tempSlope register for each chain.
571 + * Check whether temp_compensation feature is enabled or not.
572 + */
573 + if (eep->baseEepHeader.featureEnable & 0x1) {
574 + if (frequency < 4000) {
575 + REG_RMW_FIELD(ah, AR_PHY_TPC_19,
576 + AR_PHY_TPC_19_ALPHA_THERM,
577 + eep->base_ext2.tempSlopeLow);
578 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
579 + AR_PHY_TPC_19_ALPHA_THERM,
580 + temp_slope);
581 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
582 + AR_PHY_TPC_19_ALPHA_THERM,
583 + eep->base_ext2.tempSlopeHigh);
584 + } else {
585 + REG_RMW_FIELD(ah, AR_PHY_TPC_19,
586 + AR_PHY_TPC_19_ALPHA_THERM,
587 + temp_slope);
588 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
589 + AR_PHY_TPC_19_ALPHA_THERM,
590 + temp_slope1);
591 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
592 + AR_PHY_TPC_19_ALPHA_THERM,
593 + temp_slope2);
594 + }
595 + } else {
596 + /*
597 + * If temp compensation is not enabled,
598 + * set all registers to 0.
599 + */
600 + REG_RMW_FIELD(ah, AR_PHY_TPC_19,
601 + AR_PHY_TPC_19_ALPHA_THERM, 0);
602 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
603 + AR_PHY_TPC_19_ALPHA_THERM, 0);
604 + REG_RMW_FIELD(ah, AR_PHY_TPC_19_B2,
605 + AR_PHY_TPC_19_ALPHA_THERM, 0);
606 + }
607 + } else {
608 + REG_RMW_FIELD(ah, AR_PHY_TPC_19,
609 + AR_PHY_TPC_19_ALPHA_THERM, temp_slope);
610 + }
611
612 if (AR_SREV_9462_20(ah))
613 REG_RMW_FIELD(ah, AR_PHY_TPC_19_B1,
614 - AR_PHY_TPC_19_B1_ALPHA_THERM, tempSlope);
615 + AR_PHY_TPC_19_B1_ALPHA_THERM, temp_slope);
616
617
618 REG_RMW_FIELD(ah, AR_PHY_TPC_18, AR_PHY_TPC_18_THERM_CAL_VALUE,
619 temperature[0]);
620 -
621 - return 0;
622 }
623
624 /* Apply the recorded correction values. */
625 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
626 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
627 @@ -68,7 +68,7 @@ static const int m2ThreshExt_off = 127;
628 static int ar9003_hw_set_channel(struct ath_hw *ah, struct ath9k_channel *chan)
629 {
630 u16 bMode, fracMode = 0, aModeRefSel = 0;
631 - u32 freq, channelSel = 0, reg32 = 0;
632 + u32 freq, chan_frac, div, channelSel = 0, reg32 = 0;
633 struct chan_centers centers;
634 int loadSynthChannel;
635
636 @@ -77,9 +77,6 @@ static int ar9003_hw_set_channel(struct
637
638 if (freq < 4800) { /* 2 GHz, fractional mode */
639 if (AR_SREV_9330(ah)) {
640 - u32 chan_frac;
641 - u32 div;
642 -
643 if (ah->is_clk_25mhz)
644 div = 75;
645 else
646 @@ -89,34 +86,40 @@ static int ar9003_hw_set_channel(struct
647 chan_frac = (((freq * 4) % div) * 0x20000) / div;
648 channelSel = (channelSel << 17) | chan_frac;
649 } else if (AR_SREV_9485(ah) || AR_SREV_9565(ah)) {
650 - u32 chan_frac;
651 -
652 /*
653 - * freq_ref = 40 / (refdiva >> amoderefsel); where refdiva=1 and amoderefsel=0
654 + * freq_ref = 40 / (refdiva >> amoderefsel);
655 + * where refdiva=1 and amoderefsel=0
656 * ndiv = ((chan_mhz * 4) / 3) / freq_ref;
657 * chansel = int(ndiv), chanfrac = (ndiv - chansel) * 0x20000
658 */
659 channelSel = (freq * 4) / 120;
660 chan_frac = (((freq * 4) % 120) * 0x20000) / 120;
661 channelSel = (channelSel << 17) | chan_frac;
662 - } else if (AR_SREV_9340(ah) || AR_SREV_9550(ah)) {
663 + } else if (AR_SREV_9340(ah)) {
664 if (ah->is_clk_25mhz) {
665 - u32 chan_frac;
666 -
667 channelSel = (freq * 2) / 75;
668 chan_frac = (((freq * 2) % 75) * 0x20000) / 75;
669 channelSel = (channelSel << 17) | chan_frac;
670 - } else
671 + } else {
672 channelSel = CHANSEL_2G(freq) >> 1;
673 - } else
674 + }
675 + } else if (AR_SREV_9550(ah)) {
676 + if (ah->is_clk_25mhz)
677 + div = 75;
678 + else
679 + div = 120;
680 +
681 + channelSel = (freq * 4) / div;
682 + chan_frac = (((freq * 4) % div) * 0x20000) / div;
683 + channelSel = (channelSel << 17) | chan_frac;
684 + } else {
685 channelSel = CHANSEL_2G(freq);
686 + }
687 /* Set to 2G mode */
688 bMode = 1;
689 } else {
690 if ((AR_SREV_9340(ah) || AR_SREV_9550(ah)) &&
691 ah->is_clk_25mhz) {
692 - u32 chan_frac;
693 -
694 channelSel = freq / 75;
695 chan_frac = ((freq % 75) * 0x20000) / 75;
696 channelSel = (channelSel << 17) | chan_frac;
697 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
698 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
699 @@ -1028,7 +1028,7 @@
700 #define AR_PHY_TPC_5_B2 (AR_SM2_BASE + 0x208)
701 #define AR_PHY_TPC_6_B2 (AR_SM2_BASE + 0x20c)
702 #define AR_PHY_TPC_11_B2 (AR_SM2_BASE + 0x220)
703 -#define AR_PHY_PDADC_TAB_2 (AR_SM2_BASE + 0x240)
704 +#define AR_PHY_TPC_19_B2 (AR_SM2_BASE + 0x240)
705 #define AR_PHY_TX_IQCAL_STATUS_B2 (AR_SM2_BASE + 0x48c)
706 #define AR_PHY_TX_IQCAL_CORR_COEFF_B2(_i) (AR_SM2_BASE + 0x450 + ((_i) << 2))
707
708 --- a/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
709 +++ b/drivers/net/wireless/ath/ath9k/ar955x_1p0_initvals.h
710 @@ -23,16 +23,16 @@
711 static const u32 ar955x_1p0_radio_postamble[][5] = {
712 /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
713 {0x00016098, 0xd2dd5554, 0xd2dd5554, 0xd28b3330, 0xd28b3330},
714 - {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x06345f2a, 0x06345f2a},
715 - {0x000160ac, 0xa4647c00, 0xa4647c00, 0xa4646800, 0xa4646800},
716 - {0x000160b0, 0x01885f52, 0x01885f52, 0x04accf3a, 0x04accf3a},
717 - {0x00016104, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
718 + {0x0001609c, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a, 0x0a566f3a},
719 + {0x000160ac, 0xa4647c00, 0xa4647c00, 0x24647c00, 0x24647c00},
720 + {0x000160b0, 0x01885f52, 0x01885f52, 0x01885f52, 0x01885f52},
721 + {0x00016104, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
722 {0x0001610c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
723 {0x00016140, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
724 - {0x00016504, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
725 + {0x00016504, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
726 {0x0001650c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
727 {0x00016540, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
728 - {0x00016904, 0xb7a00001, 0xb7a00001, 0xb7a00001, 0xb7a00001},
729 + {0x00016904, 0xb7a00000, 0xb7a00000, 0xb7a00001, 0xb7a00001},
730 {0x0001690c, 0xc0000000, 0xc0000000, 0xc0000000, 0xc0000000},
731 {0x00016940, 0x10804008, 0x10804008, 0x10804008, 0x10804008},
732 };
733 @@ -69,15 +69,15 @@ static const u32 ar955x_1p0_baseband_pos
734 {0x0000a204, 0x005c0ec0, 0x005c0ec4, 0x005c0ec4, 0x005c0ec0},
735 {0x0000a208, 0x00000104, 0x00000104, 0x00000004, 0x00000004},
736 {0x0000a22c, 0x07e26a2f, 0x07e26a2f, 0x01026a2f, 0x01026a2f},
737 - {0x0000a230, 0x0000000a, 0x00000014, 0x00000016, 0x0000000b},
738 + {0x0000a230, 0x0000400a, 0x00004014, 0x00004016, 0x0000400b},
739 {0x0000a234, 0x00000fff, 0x10000fff, 0x10000fff, 0x00000fff},
740 {0x0000a238, 0xffb01018, 0xffb01018, 0xffb01018, 0xffb01018},
741 {0x0000a250, 0x00000000, 0x00000000, 0x00000210, 0x00000108},
742 {0x0000a254, 0x000007d0, 0x00000fa0, 0x00001130, 0x00000898},
743 {0x0000a258, 0x02020002, 0x02020002, 0x02020002, 0x02020002},
744 - {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01000e0e, 0x01000e0e},
745 + {0x0000a25c, 0x01000e0e, 0x01000e0e, 0x01010e0e, 0x01010e0e},
746 {0x0000a260, 0x0a021501, 0x0a021501, 0x3a021501, 0x3a021501},
747 - {0x0000a264, 0x00000e0e, 0x00000e0e, 0x00000e0e, 0x00000e0e},
748 + {0x0000a264, 0x00000e0e, 0x00000e0e, 0x01000e0e, 0x01000e0e},
749 {0x0000a280, 0x00000007, 0x00000007, 0x0000000b, 0x0000000b},
750 {0x0000a284, 0x00000000, 0x00000000, 0x00000010, 0x00000010},
751 {0x0000a288, 0x00000110, 0x00000110, 0x00000110, 0x00000110},
752 @@ -125,7 +125,7 @@ static const u32 ar955x_1p0_radio_core[]
753 {0x00016094, 0x00000000},
754 {0x000160a0, 0x0a108ffe},
755 {0x000160a4, 0x812fc370},
756 - {0x000160a8, 0x423c8000},
757 + {0x000160a8, 0x423c8100},
758 {0x000160b4, 0x92480080},
759 {0x000160c0, 0x006db6d0},
760 {0x000160c4, 0x6db6db60},
761 @@ -134,7 +134,7 @@ static const u32 ar955x_1p0_radio_core[]
762 {0x00016100, 0x11999601},
763 {0x00016108, 0x00080010},
764 {0x00016144, 0x02084080},
765 - {0x00016148, 0x000080c0},
766 + {0x00016148, 0x00008040},
767 {0x00016280, 0x01800804},
768 {0x00016284, 0x00038dc5},
769 {0x00016288, 0x00000000},
770 @@ -178,7 +178,7 @@ static const u32 ar955x_1p0_radio_core[]
771 {0x00016500, 0x11999601},
772 {0x00016508, 0x00080010},
773 {0x00016544, 0x02084080},
774 - {0x00016548, 0x000080c0},
775 + {0x00016548, 0x00008040},
776 {0x00016780, 0x00000000},
777 {0x00016784, 0x00000000},
778 {0x00016788, 0x00400705},
779 @@ -218,7 +218,7 @@ static const u32 ar955x_1p0_radio_core[]
780 {0x00016900, 0x11999601},
781 {0x00016908, 0x00080010},
782 {0x00016944, 0x02084080},
783 - {0x00016948, 0x000080c0},
784 + {0x00016948, 0x00008040},
785 {0x00016b80, 0x00000000},
786 {0x00016b84, 0x00000000},
787 {0x00016b88, 0x00400705},
788 @@ -245,9 +245,9 @@ static const u32 ar955x_1p0_radio_core[]
789
790 static const u32 ar955x_1p0_modes_xpa_tx_gain_table[][9] = {
791 /* Addr 5G_HT20_L 5G_HT40_L 5G_HT20_M 5G_HT40_M 5G_HT20_H 5G_HT40_H 2G_HT40 2G_HT20 */
792 - {0x0000a2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
793 - {0x0000a2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
794 - {0x0000a2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
795 + {0x0000a2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
796 + {0x0000a2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
797 + {0x0000a2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
798 {0x0000a2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
799 {0x0000a410, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050de, 0x000050da, 0x000050da},
800 {0x0000a500, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000003, 0x00000000, 0x00000000},
801 @@ -256,63 +256,63 @@ static const u32 ar955x_1p0_modes_xpa_tx
802 {0x0000a50c, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c00000b, 0x0c000006, 0x0c000006},
803 {0x0000a510, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x1000000d, 0x0f00000a, 0x0f00000a},
804 {0x0000a514, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x14000011, 0x1300000c, 0x1300000c},
805 - {0x0000a518, 0x19004008, 0x19004008, 0x19004008, 0x19004008, 0x18004008, 0x18004008, 0x1700000e, 0x1700000e},
806 - {0x0000a51c, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1d00400a, 0x1c00400a, 0x1c00400a, 0x1b000064, 0x1b000064},
807 - {0x0000a520, 0x230020a2, 0x230020a2, 0x210020a2, 0x210020a2, 0x200020a2, 0x200020a2, 0x1f000242, 0x1f000242},
808 - {0x0000a524, 0x2500006e, 0x2500006e, 0x2500006e, 0x2500006e, 0x2400006e, 0x2400006e, 0x23000229, 0x23000229},
809 - {0x0000a528, 0x29022221, 0x29022221, 0x28022221, 0x28022221, 0x27022221, 0x27022221, 0x270002a2, 0x270002a2},
810 - {0x0000a52c, 0x2d00062a, 0x2d00062a, 0x2c00062a, 0x2c00062a, 0x2a00062a, 0x2a00062a, 0x2c001203, 0x2c001203},
811 - {0x0000a530, 0x340220a5, 0x340220a5, 0x320220a5, 0x320220a5, 0x2f0220a5, 0x2f0220a5, 0x30001803, 0x30001803},
812 - {0x0000a534, 0x380022c5, 0x380022c5, 0x350022c5, 0x350022c5, 0x320022c5, 0x320022c5, 0x33000881, 0x33000881},
813 - {0x0000a538, 0x3b002486, 0x3b002486, 0x39002486, 0x39002486, 0x36002486, 0x36002486, 0x38001809, 0x38001809},
814 - {0x0000a53c, 0x3f00248a, 0x3f00248a, 0x3d00248a, 0x3d00248a, 0x3a00248a, 0x3a00248a, 0x3a000814, 0x3a000814},
815 - {0x0000a540, 0x4202242c, 0x4202242c, 0x4102242c, 0x4102242c, 0x3f02242c, 0x3f02242c, 0x3f001a0c, 0x3f001a0c},
816 - {0x0000a544, 0x490044c6, 0x490044c6, 0x460044c6, 0x460044c6, 0x420044c6, 0x420044c6, 0x43001a0e, 0x43001a0e},
817 - {0x0000a548, 0x4d024485, 0x4d024485, 0x4a024485, 0x4a024485, 0x46024485, 0x46024485, 0x46001812, 0x46001812},
818 - {0x0000a54c, 0x51044483, 0x51044483, 0x4e044483, 0x4e044483, 0x4a044483, 0x4a044483, 0x49001884, 0x49001884},
819 - {0x0000a550, 0x5404a40c, 0x5404a40c, 0x5204a40c, 0x5204a40c, 0x4d04a40c, 0x4d04a40c, 0x4d001e84, 0x4d001e84},
820 - {0x0000a554, 0x57024632, 0x57024632, 0x55024632, 0x55024632, 0x52024632, 0x52024632, 0x50001e69, 0x50001e69},
821 - {0x0000a558, 0x5c00a634, 0x5c00a634, 0x5900a634, 0x5900a634, 0x5600a634, 0x5600a634, 0x550006f4, 0x550006f4},
822 - {0x0000a55c, 0x5f026832, 0x5f026832, 0x5d026832, 0x5d026832, 0x5a026832, 0x5a026832, 0x59000ad3, 0x59000ad3},
823 - {0x0000a560, 0x6602b012, 0x6602b012, 0x6202b012, 0x6202b012, 0x5d02b012, 0x5d02b012, 0x5e000ad5, 0x5e000ad5},
824 - {0x0000a564, 0x6e02d0e1, 0x6e02d0e1, 0x6802d0e1, 0x6802d0e1, 0x6002d0e1, 0x6002d0e1, 0x61001ced, 0x61001ced},
825 - {0x0000a568, 0x7202b4c4, 0x7202b4c4, 0x6c02b4c4, 0x6c02b4c4, 0x6502b4c4, 0x6502b4c4, 0x660018d4, 0x660018d4},
826 - {0x0000a56c, 0x75007894, 0x75007894, 0x70007894, 0x70007894, 0x6b007894, 0x6b007894, 0x660018d4, 0x660018d4},
827 - {0x0000a570, 0x7b025c74, 0x7b025c74, 0x75025c74, 0x75025c74, 0x70025c74, 0x70025c74, 0x660018d4, 0x660018d4},
828 - {0x0000a574, 0x8300bcb5, 0x8300bcb5, 0x7a00bcb5, 0x7a00bcb5, 0x7600bcb5, 0x7600bcb5, 0x660018d4, 0x660018d4},
829 - {0x0000a578, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
830 - {0x0000a57c, 0x8a04dc74, 0x8a04dc74, 0x7f04dc74, 0x7f04dc74, 0x7c04dc74, 0x7c04dc74, 0x660018d4, 0x660018d4},
831 + {0x0000a518, 0x1700002b, 0x1700002b, 0x1700002b, 0x1700002b, 0x1600002b, 0x1600002b, 0x1700000e, 0x1700000e},
832 + {0x0000a51c, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1b00002d, 0x1a00002d, 0x1a00002d, 0x1b000064, 0x1b000064},
833 + {0x0000a520, 0x20000031, 0x20000031, 0x1f000031, 0x1f000031, 0x1e000031, 0x1e000031, 0x1f000242, 0x1f000242},
834 + {0x0000a524, 0x24000051, 0x24000051, 0x23000051, 0x23000051, 0x23000051, 0x23000051, 0x23000229, 0x23000229},
835 + {0x0000a528, 0x27000071, 0x27000071, 0x27000071, 0x27000071, 0x26000071, 0x26000071, 0x270002a2, 0x270002a2},
836 + {0x0000a52c, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2b000092, 0x2c001203, 0x2c001203},
837 + {0x0000a530, 0x3000028c, 0x3000028c, 0x2f00028c, 0x2f00028c, 0x2e00028c, 0x2e00028c, 0x30001803, 0x30001803},
838 + {0x0000a534, 0x34000290, 0x34000290, 0x33000290, 0x33000290, 0x32000290, 0x32000290, 0x33000881, 0x33000881},
839 + {0x0000a538, 0x37000292, 0x37000292, 0x36000292, 0x36000292, 0x35000292, 0x35000292, 0x38001809, 0x38001809},
840 + {0x0000a53c, 0x3b02028d, 0x3b02028d, 0x3a02028d, 0x3a02028d, 0x3902028d, 0x3902028d, 0x3a000814, 0x3a000814},
841 + {0x0000a540, 0x3f020291, 0x3f020291, 0x3e020291, 0x3e020291, 0x3d020291, 0x3d020291, 0x3f001a0c, 0x3f001a0c},
842 + {0x0000a544, 0x44020490, 0x44020490, 0x43020490, 0x43020490, 0x42020490, 0x42020490, 0x43001a0e, 0x43001a0e},
843 + {0x0000a548, 0x48020492, 0x48020492, 0x47020492, 0x47020492, 0x46020492, 0x46020492, 0x46001812, 0x46001812},
844 + {0x0000a54c, 0x4c020692, 0x4c020692, 0x4b020692, 0x4b020692, 0x4a020692, 0x4a020692, 0x49001884, 0x49001884},
845 + {0x0000a550, 0x50020892, 0x50020892, 0x4f020892, 0x4f020892, 0x4e020892, 0x4e020892, 0x4d001e84, 0x4d001e84},
846 + {0x0000a554, 0x53040891, 0x53040891, 0x53040891, 0x53040891, 0x52040891, 0x52040891, 0x50001e69, 0x50001e69},
847 + {0x0000a558, 0x58040893, 0x58040893, 0x57040893, 0x57040893, 0x56040893, 0x56040893, 0x550006f4, 0x550006f4},
848 + {0x0000a55c, 0x5c0408b4, 0x5c0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x5a0408b4, 0x59000ad3, 0x59000ad3},
849 + {0x0000a560, 0x610408b6, 0x610408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e0408b6, 0x5e000ad5, 0x5e000ad5},
850 + {0x0000a564, 0x670408f6, 0x670408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x620408f6, 0x61001ced, 0x61001ced},
851 + {0x0000a568, 0x6a040cf6, 0x6a040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x66040cf6, 0x660018d4, 0x660018d4},
852 + {0x0000a56c, 0x6d040d76, 0x6d040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x6a040d76, 0x660018d4, 0x660018d4},
853 + {0x0000a570, 0x70060db6, 0x70060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x6e060db6, 0x660018d4, 0x660018d4},
854 + {0x0000a574, 0x730a0df6, 0x730a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x720a0df6, 0x660018d4, 0x660018d4},
855 + {0x0000a578, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
856 + {0x0000a57c, 0x770a13f6, 0x770a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x760a13f6, 0x660018d4, 0x660018d4},
857 {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
858 {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
859 {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
860 - {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03804000, 0x03804000},
861 - {0x0000a610, 0x04c08c01, 0x04c08c01, 0x04808b01, 0x04808b01, 0x04808a01, 0x04808a01, 0x0300ca02, 0x0300ca02},
862 - {0x0000a614, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00000e04, 0x00000e04},
863 - {0x0000a618, 0x04010c01, 0x04010c01, 0x03c10b01, 0x03c10b01, 0x03810a01, 0x03810a01, 0x03014000, 0x03014000},
864 - {0x0000a61c, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x00000000, 0x00000000},
865 - {0x0000a620, 0x04010303, 0x04010303, 0x03c10303, 0x03c10303, 0x03810303, 0x03810303, 0x00000000, 0x00000000},
866 - {0x0000a624, 0x03814e05, 0x03814e05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03414d05, 0x03014000, 0x03014000},
867 - {0x0000a628, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x00c0c000, 0x03804c05, 0x03804c05},
868 - {0x0000a62c, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x00c0c303, 0x0701de06, 0x0701de06},
869 - {0x0000a630, 0x03418000, 0x03418000, 0x03018000, 0x03018000, 0x02c18000, 0x02c18000, 0x07819c07, 0x07819c07},
870 - {0x0000a634, 0x03815004, 0x03815004, 0x03414f04, 0x03414f04, 0x03414e04, 0x03414e04, 0x0701dc07, 0x0701dc07},
871 - {0x0000a638, 0x03005302, 0x03005302, 0x02c05202, 0x02c05202, 0x02805202, 0x02805202, 0x0701dc07, 0x0701dc07},
872 - {0x0000a63c, 0x04c09302, 0x04c09302, 0x04809202, 0x04809202, 0x04809202, 0x04809202, 0x0701dc07, 0x0701dc07},
873 - {0x0000b2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
874 - {0x0000b2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
875 - {0x0000b2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
876 + {0x0000a60c, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x02c04b01, 0x03804000, 0x03804000},
877 + {0x0000a610, 0x04008b01, 0x04008b01, 0x04008b01, 0x04008b01, 0x03c08b01, 0x03c08b01, 0x0300ca02, 0x0300ca02},
878 + {0x0000a614, 0x05811403, 0x05811403, 0x05411303, 0x05411303, 0x05411303, 0x05411303, 0x00000e04, 0x00000e04},
879 + {0x0000a618, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
880 + {0x0000a61c, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
881 + {0x0000a620, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x00000000, 0x00000000},
882 + {0x0000a624, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03014000, 0x03014000},
883 + {0x0000a628, 0x05811604, 0x05811604, 0x05411504, 0x05411504, 0x05411504, 0x05411504, 0x03804c05, 0x03804c05},
884 + {0x0000a62c, 0x06815604, 0x06815604, 0x06415504, 0x06415504, 0x06015504, 0x06015504, 0x0701de06, 0x0701de06},
885 + {0x0000a630, 0x07819a05, 0x07819a05, 0x07419905, 0x07419905, 0x07019805, 0x07019805, 0x07819c07, 0x07819c07},
886 + {0x0000a634, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
887 + {0x0000a638, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
888 + {0x0000a63c, 0x07819e06, 0x07819e06, 0x07419d06, 0x07419d06, 0x07019c06, 0x07019c06, 0x0701dc07, 0x0701dc07},
889 + {0x0000b2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
890 + {0x0000b2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
891 + {0x0000b2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
892 {0x0000b2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
893 - {0x0000c2dc, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xffffaaaa, 0xfffd5aaa, 0xfffd5aaa},
894 - {0x0000c2e0, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xffffcccc, 0xfffe9ccc, 0xfffe9ccc},
895 - {0x0000c2e4, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xfffff0f0, 0xffffe0f0, 0xffffe0f0},
896 + {0x0000c2dc, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xffff6aaa, 0xfffd5aaa, 0xfffd5aaa},
897 + {0x0000c2e0, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffdcccc, 0xfffe9ccc, 0xfffe9ccc},
898 + {0x0000c2e4, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffe3b0f0, 0xffffe0f0, 0xffffe0f0},
899 {0x0000c2e8, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xffffff00, 0xfffcff00, 0xfffcff00},
900 {0x00016044, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
901 - {0x00016048, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
902 + {0x00016048, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
903 {0x00016280, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01801e84, 0x01808e84, 0x01808e84},
904 {0x00016444, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
905 - {0x00016448, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
906 + {0x00016448, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
907 {0x00016844, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x056db2d4, 0x010002d4, 0x010002d4},
908 - {0x00016848, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x62482401, 0x66482401, 0x66482401},
909 + {0x00016848, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401, 0x66482401},
910 };
911
912 static const u32 ar955x_1p0_mac_core[][2] = {
913 @@ -846,7 +846,7 @@ static const u32 ar955x_1p0_baseband_cor
914 {0x0000a44c, 0x00000001},
915 {0x0000a450, 0x00010000},
916 {0x0000a458, 0x00000000},
917 - {0x0000a644, 0x3fad9d74},
918 + {0x0000a644, 0xbfad9d74},
919 {0x0000a648, 0x0048060a},
920 {0x0000a64c, 0x00003c37},
921 {0x0000a670, 0x03020100},
922 @@ -1277,7 +1277,7 @@ static const u32 ar955x_1p0_modes_fast_c
923 {0x0000801c, 0x148ec02b, 0x148ec057},
924 {0x00008318, 0x000044c0, 0x00008980},
925 {0x00009e00, 0x0372131c, 0x0372131c},
926 - {0x0000a230, 0x0000000b, 0x00000016},
927 + {0x0000a230, 0x0000400b, 0x00004016},
928 {0x0000a254, 0x00000898, 0x00001130},
929 };
930
931 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c
932 +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
933 @@ -347,6 +347,8 @@ void ath9k_htc_txcompletion_cb(struct ht
934 endpoint->ep_callbacks.tx(endpoint->ep_callbacks.priv,
935 skb, htc_hdr->endpoint_id,
936 txok);
937 + } else {
938 + kfree_skb(skb);
939 }
940 }
941
942 --- a/net/wireless/reg.c
943 +++ b/net/wireless/reg.c
944 @@ -142,8 +142,8 @@ static void rcu_free_regdom(const struct
945
946 static struct regulatory_request *get_last_request(void)
947 {
948 - return rcu_dereference_protected(last_request,
949 - lockdep_is_held(&reg_mutex));
950 + return rcu_dereference_check(last_request,
951 + lockdep_is_held(&reg_mutex));
952 }
953
954 /* Used to queue up regulatory hints */
955 @@ -1125,7 +1125,9 @@ static bool is_ht40_allowed(struct ieee8
956 if (chan->flags & IEEE80211_CHAN_DISABLED)
957 return false;
958 /* This would happen when regulatory rules disallow HT40 completely */
959 - return !(chan->flags & IEEE80211_CHAN_NO_HT40);
960 + if ((chan->flags & IEEE80211_CHAN_NO_HT40) == IEEE80211_CHAN_NO_HT40)
961 + return false;
962 + return true;
963 }
964
965 static void reg_process_ht_flags_channel(struct wiphy *wiphy,
966 @@ -1850,7 +1852,7 @@ static void restore_regulatory_settings(
967 mutex_lock(&cfg80211_mutex);
968 mutex_lock(&reg_mutex);
969
970 - reset_regdomains(true, cfg80211_world_regdom);
971 + reset_regdomains(true, &world_regdom);
972 restore_alpha2(alpha2, reset_user);
973
974 /*
975 @@ -2251,14 +2253,21 @@ int set_regdom(const struct ieee80211_re
976
977 int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
978 {
979 - struct regulatory_request *lr = get_last_request();
980 + struct regulatory_request *lr;
981 + u8 alpha2[2];
982 + bool add = false;
983
984 + rcu_read_lock();
985 + lr = get_last_request();
986 if (lr && !lr->processed) {
987 - if (add_uevent_var(env, "COUNTRY=%c%c",
988 - lr->alpha2[0], lr->alpha2[1]))
989 - return -ENOMEM;
990 + memcpy(alpha2, lr->alpha2, 2);
991 + add = true;
992 }
993 + rcu_read_unlock();
994
995 + if (add)
996 + return add_uevent_var(env, "COUNTRY=%c%c",
997 + alpha2[0], alpha2[1]);
998 return 0;
999 }
1000
1001 --- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
1002 +++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
1003 @@ -967,7 +967,7 @@ static bool ar9003_hw_init_cal(struct at
1004 struct ath9k_hw_cal_data *caldata = ah->caldata;
1005 bool txiqcal_done = false, txclcal_done = false;
1006 bool is_reusable = true, status = true;
1007 - bool run_rtt_cal = false, run_agc_cal;
1008 + bool run_rtt_cal = false, run_agc_cal, sep_iq_cal = false;
1009 bool rtt = !!(ah->caps.hw_caps & ATH9K_HW_CAP_RTT);
1010 u32 agc_ctrl = 0, agc_supp_cals = AR_PHY_AGC_CONTROL_OFFSET_CAL |
1011 AR_PHY_AGC_CONTROL_FLTR_CAL |
1012 @@ -1013,7 +1013,8 @@ static bool ar9003_hw_init_cal(struct at
1013 }
1014 }
1015
1016 - if (!(ah->enabled_cals & TX_IQ_CAL))
1017 + if ((IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan)) ||
1018 + !(ah->enabled_cals & TX_IQ_CAL))
1019 goto skip_tx_iqcal;
1020
1021 /* Do Tx IQ Calibration */
1022 @@ -1033,21 +1034,22 @@ static bool ar9003_hw_init_cal(struct at
1023 REG_CLR_BIT(ah, AR_PHY_TX_IQCAL_CONTROL_0,
1024 AR_PHY_TX_IQCAL_CONTROL_0_ENABLE_TXIQ_CAL);
1025 txiqcal_done = run_agc_cal = true;
1026 - goto skip_tx_iqcal;
1027 - } else if (caldata && !caldata->done_txiqcal_once)
1028 + } else if (caldata && !caldata->done_txiqcal_once) {
1029 run_agc_cal = true;
1030 + sep_iq_cal = true;
1031 + }
1032
1033 +skip_tx_iqcal:
1034 if (ath9k_hw_mci_is_enabled(ah) && IS_CHAN_2GHZ(chan) && run_agc_cal)
1035 ar9003_mci_init_cal_req(ah, &is_reusable);
1036
1037 - if (!(IS_CHAN_HALF_RATE(chan) || IS_CHAN_QUARTER_RATE(chan))) {
1038 + if (sep_iq_cal) {
1039 txiqcal_done = ar9003_hw_tx_iq_cal_run(ah);
1040 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_DIS);
1041 udelay(5);
1042 REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
1043 }
1044
1045 -skip_tx_iqcal:
1046 if (run_agc_cal || !(ah->ah_flags & AH_FASTCC)) {
1047 /* Calibrate the AGC */
1048 REG_WRITE(ah, AR_PHY_AGC_CONTROL,
1049 --- a/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
1050 +++ b/drivers/net/wireless/ath/ath9k/ar9003_2p2_initvals.h
1051 @@ -744,6 +744,186 @@ static const u32 ar9300Modes_high_ob_db_
1052 {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1053 };
1054
1055 +static const u32 ar9300Modes_mixed_ob_db_tx_gain_table_2p2[][5] = {
1056 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1057 + {0x0000a2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1058 + {0x0000a2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1059 + {0x0000a2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1060 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1061 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1062 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1063 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1064 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1065 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1066 + {0x0000a510, 0x16000220, 0x16000220, 0x0f000202, 0x0f000202},
1067 + {0x0000a514, 0x1c000223, 0x1c000223, 0x11000400, 0x11000400},
1068 + {0x0000a518, 0x21002220, 0x21002220, 0x15000402, 0x15000402},
1069 + {0x0000a51c, 0x27002223, 0x27002223, 0x19000404, 0x19000404},
1070 + {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000603, 0x1b000603},
1071 + {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000a02, 0x1f000a02},
1072 + {0x0000a528, 0x34022225, 0x34022225, 0x23000a04, 0x23000a04},
1073 + {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x26000a20, 0x26000a20},
1074 + {0x0000a530, 0x3e02222c, 0x3e02222c, 0x2a000e20, 0x2a000e20},
1075 + {0x0000a534, 0x4202242a, 0x4202242a, 0x2e000e22, 0x2e000e22},
1076 + {0x0000a538, 0x4702244a, 0x4702244a, 0x31000e24, 0x31000e24},
1077 + {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x34001640, 0x34001640},
1078 + {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38001660, 0x38001660},
1079 + {0x0000a544, 0x52022470, 0x52022470, 0x3b001861, 0x3b001861},
1080 + {0x0000a548, 0x55022490, 0x55022490, 0x3e001a81, 0x3e001a81},
1081 + {0x0000a54c, 0x59022492, 0x59022492, 0x42001a83, 0x42001a83},
1082 + {0x0000a550, 0x5d022692, 0x5d022692, 0x44001c84, 0x44001c84},
1083 + {0x0000a554, 0x61022892, 0x61022892, 0x48001ce3, 0x48001ce3},
1084 + {0x0000a558, 0x65024890, 0x65024890, 0x4c001ce5, 0x4c001ce5},
1085 + {0x0000a55c, 0x69024892, 0x69024892, 0x50001ce9, 0x50001ce9},
1086 + {0x0000a560, 0x6e024c92, 0x6e024c92, 0x54001ceb, 0x54001ceb},
1087 + {0x0000a564, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1088 + {0x0000a568, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1089 + {0x0000a56c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1090 + {0x0000a570, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1091 + {0x0000a574, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1092 + {0x0000a578, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1093 + {0x0000a57c, 0x74026e92, 0x74026e92, 0x56001eec, 0x56001eec},
1094 + {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
1095 + {0x0000a584, 0x06800003, 0x06800003, 0x04800002, 0x04800002},
1096 + {0x0000a588, 0x0a800020, 0x0a800020, 0x08800004, 0x08800004},
1097 + {0x0000a58c, 0x10800023, 0x10800023, 0x0b800200, 0x0b800200},
1098 + {0x0000a590, 0x16800220, 0x16800220, 0x0f800202, 0x0f800202},
1099 + {0x0000a594, 0x1c800223, 0x1c800223, 0x11800400, 0x11800400},
1100 + {0x0000a598, 0x21802220, 0x21802220, 0x15800402, 0x15800402},
1101 + {0x0000a59c, 0x27802223, 0x27802223, 0x19800404, 0x19800404},
1102 + {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800603, 0x1b800603},
1103 + {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800a02, 0x1f800a02},
1104 + {0x0000a5a8, 0x34822225, 0x34822225, 0x23800a04, 0x23800a04},
1105 + {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x26800a20, 0x26800a20},
1106 + {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x2a800e20, 0x2a800e20},
1107 + {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2e800e22, 0x2e800e22},
1108 + {0x0000a5b8, 0x4782244a, 0x4782244a, 0x31800e24, 0x31800e24},
1109 + {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x34801640, 0x34801640},
1110 + {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38801660, 0x38801660},
1111 + {0x0000a5c4, 0x52822470, 0x52822470, 0x3b801861, 0x3b801861},
1112 + {0x0000a5c8, 0x55822490, 0x55822490, 0x3e801a81, 0x3e801a81},
1113 + {0x0000a5cc, 0x59822492, 0x59822492, 0x42801a83, 0x42801a83},
1114 + {0x0000a5d0, 0x5d822692, 0x5d822692, 0x44801c84, 0x44801c84},
1115 + {0x0000a5d4, 0x61822892, 0x61822892, 0x48801ce3, 0x48801ce3},
1116 + {0x0000a5d8, 0x65824890, 0x65824890, 0x4c801ce5, 0x4c801ce5},
1117 + {0x0000a5dc, 0x69824892, 0x69824892, 0x50801ce9, 0x50801ce9},
1118 + {0x0000a5e0, 0x6e824c92, 0x6e824c92, 0x54801ceb, 0x54801ceb},
1119 + {0x0000a5e4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1120 + {0x0000a5e8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1121 + {0x0000a5ec, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1122 + {0x0000a5f0, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1123 + {0x0000a5f4, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1124 + {0x0000a5f8, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1125 + {0x0000a5fc, 0x74826e92, 0x74826e92, 0x56801eec, 0x56801eec},
1126 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1127 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1128 + {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1129 + {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1130 + {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1131 + {0x0000a614, 0x02004000, 0x02004000, 0x01404000, 0x01404000},
1132 + {0x0000a618, 0x02004801, 0x02004801, 0x01404501, 0x01404501},
1133 + {0x0000a61c, 0x02808a02, 0x02808a02, 0x02008501, 0x02008501},
1134 + {0x0000a620, 0x0380ce03, 0x0380ce03, 0x0280ca03, 0x0280ca03},
1135 + {0x0000a624, 0x04411104, 0x04411104, 0x03010c04, 0x03010c04},
1136 + {0x0000a628, 0x04411104, 0x04411104, 0x04014c04, 0x04014c04},
1137 + {0x0000a62c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1138 + {0x0000a630, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1139 + {0x0000a634, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1140 + {0x0000a638, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1141 + {0x0000a63c, 0x04411104, 0x04411104, 0x04015005, 0x04015005},
1142 + {0x0000b2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1143 + {0x0000b2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1144 + {0x0000b2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1145 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1146 + {0x0000c2dc, 0x00033800, 0x00033800, 0x03aaa352, 0x03aaa352},
1147 + {0x0000c2e0, 0x0003c000, 0x0003c000, 0x03ccc584, 0x03ccc584},
1148 + {0x0000c2e4, 0x03fc0000, 0x03fc0000, 0x03f0f800, 0x03f0f800},
1149 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1150 + {0x00016044, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1151 + {0x00016048, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1152 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1153 + {0x00016444, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1154 + {0x00016448, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1155 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1156 + {0x00016844, 0x012492d4, 0x012492d4, 0x056db2e4, 0x056db2e4},
1157 + {0x00016848, 0x66480001, 0x66480001, 0x8e480001, 0x8e480001},
1158 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1159 +};
1160 +
1161 +static const u32 ar9300Modes_type5_tx_gain_table_2p2[][5] = {
1162 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1163 + {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1164 + {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1165 + {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1166 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1167 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1168 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1169 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1170 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1171 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1172 + {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
1173 + {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
1174 + {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
1175 + {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
1176 + {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
1177 + {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
1178 + {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
1179 + {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
1180 + {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
1181 + {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
1182 + {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
1183 + {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
1184 + {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
1185 + {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
1186 + {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
1187 + {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
1188 + {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
1189 + {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
1190 + {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
1191 + {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
1192 + {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
1193 + {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1194 + {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1195 + {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1196 + {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1197 + {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1198 + {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1199 + {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1200 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1201 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1202 + {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1203 + {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1204 + {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1205 + {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
1206 + {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
1207 + {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
1208 + {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
1209 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
1210 + {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
1211 + {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1212 + {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1213 + {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1214 + {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1215 + {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1216 + {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1217 + {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1218 + {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1219 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1220 + {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1221 + {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1222 + {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1223 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1224 + {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1225 + {0x00016048, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1226 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1227 + {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1228 + {0x00016448, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1229 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1230 + {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1231 + {0x00016848, 0x65240001, 0x65240001, 0x66480001, 0x66480001},
1232 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1233 +};
1234 +
1235 static const u32 ar9300Common_rx_gain_table_2p2[][2] = {
1236 /* Addr allmodes */
1237 {0x0000a000, 0x00010000},
1238 --- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
1239 +++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
1240 @@ -507,28 +507,59 @@ static void ar9003_tx_gain_table_mode4(s
1241 else if (AR_SREV_9580(ah))
1242 INIT_INI_ARRAY(&ah->iniModesTxGain,
1243 ar9580_1p0_mixed_ob_db_tx_gain_table);
1244 + else
1245 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1246 + ar9300Modes_mixed_ob_db_tx_gain_table_2p2);
1247 +}
1248 +
1249 +static void ar9003_tx_gain_table_mode5(struct ath_hw *ah)
1250 +{
1251 + if (AR_SREV_9485_11(ah))
1252 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1253 + ar9485Modes_green_ob_db_tx_gain_1_1);
1254 + else if (AR_SREV_9340(ah))
1255 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1256 + ar9340Modes_ub124_tx_gain_table_1p0);
1257 + else if (AR_SREV_9580(ah))
1258 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1259 + ar9580_1p0_type5_tx_gain_table);
1260 + else if (AR_SREV_9300_22(ah))
1261 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1262 + ar9300Modes_type5_tx_gain_table_2p2);
1263 +}
1264 +
1265 +static void ar9003_tx_gain_table_mode6(struct ath_hw *ah)
1266 +{
1267 + if (AR_SREV_9340(ah))
1268 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1269 + ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0);
1270 + else if (AR_SREV_9485_11(ah))
1271 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1272 + ar9485Modes_green_spur_ob_db_tx_gain_1_1);
1273 + else if (AR_SREV_9580(ah))
1274 + INIT_INI_ARRAY(&ah->iniModesTxGain,
1275 + ar9580_1p0_type6_tx_gain_table);
1276 }
1277
1278 +typedef void (*ath_txgain_tab)(struct ath_hw *ah);
1279 +
1280 static void ar9003_tx_gain_table_apply(struct ath_hw *ah)
1281 {
1282 - switch (ar9003_hw_get_tx_gain_idx(ah)) {
1283 - case 0:
1284 - default:
1285 - ar9003_tx_gain_table_mode0(ah);
1286 - break;
1287 - case 1:
1288 - ar9003_tx_gain_table_mode1(ah);
1289 - break;
1290 - case 2:
1291 - ar9003_tx_gain_table_mode2(ah);
1292 - break;
1293 - case 3:
1294 - ar9003_tx_gain_table_mode3(ah);
1295 - break;
1296 - case 4:
1297 - ar9003_tx_gain_table_mode4(ah);
1298 - break;
1299 - }
1300 + static const ath_txgain_tab modes[] = {
1301 + ar9003_tx_gain_table_mode0,
1302 + ar9003_tx_gain_table_mode1,
1303 + ar9003_tx_gain_table_mode2,
1304 + ar9003_tx_gain_table_mode3,
1305 + ar9003_tx_gain_table_mode4,
1306 + ar9003_tx_gain_table_mode5,
1307 + ar9003_tx_gain_table_mode6,
1308 + };
1309 + int idx = ar9003_hw_get_tx_gain_idx(ah);
1310 +
1311 + if (idx >= ARRAY_SIZE(modes))
1312 + idx = 0;
1313 +
1314 + modes[idx](ah);
1315 }
1316
1317 static void ar9003_rx_gain_table_mode0(struct ath_hw *ah)
1318 @@ -673,7 +704,7 @@ void ar9003_hw_attach_ops(struct ath_hw
1319 struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
1320 struct ath_hw_ops *ops = ath9k_hw_ops(ah);
1321
1322 - priv_ops->init_mode_regs = ar9003_hw_init_mode_regs;
1323 + ar9003_hw_init_mode_regs(ah);
1324 priv_ops->init_mode_gain_regs = ar9003_hw_init_mode_gain_regs;
1325
1326 ops->config_pci_powersave = ar9003_hw_configpcipowersave;
1327 --- a/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1328 +++ b/drivers/net/wireless/ath/ath9k/ar9340_initvals.h
1329 @@ -1172,6 +1172,106 @@ static const u32 ar9340Modes_mixed_ob_db
1330 {0x00016448, 0x24925666, 0x24925666, 0x8e481266, 0x8e481266},
1331 };
1332
1333 +static const u32 ar9340Modes_low_ob_db_and_spur_tx_gain_table_1p0[][5] = {
1334 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1335 + {0x0000a2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
1336 + {0x0000a2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
1337 + {0x0000a2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
1338 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
1339 + {0x0000a394, 0x00000444, 0x00000444, 0x00000404, 0x00000404},
1340 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1341 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1342 + {0x0000a504, 0x06000003, 0x06000003, 0x02000001, 0x02000001},
1343 + {0x0000a508, 0x0a000020, 0x0a000020, 0x05000003, 0x05000003},
1344 + {0x0000a50c, 0x10000023, 0x10000023, 0x0a000005, 0x0a000005},
1345 + {0x0000a510, 0x16000220, 0x16000220, 0x0e000201, 0x0e000201},
1346 + {0x0000a514, 0x1c000223, 0x1c000223, 0x11000203, 0x11000203},
1347 + {0x0000a518, 0x21002220, 0x21002220, 0x14000401, 0x14000401},
1348 + {0x0000a51c, 0x27002223, 0x27002223, 0x18000403, 0x18000403},
1349 + {0x0000a520, 0x2b022220, 0x2b022220, 0x1b000602, 0x1b000602},
1350 + {0x0000a524, 0x2f022222, 0x2f022222, 0x1f000802, 0x1f000802},
1351 + {0x0000a528, 0x34022225, 0x34022225, 0x21000620, 0x21000620},
1352 + {0x0000a52c, 0x3a02222a, 0x3a02222a, 0x25000820, 0x25000820},
1353 + {0x0000a530, 0x3e02222c, 0x3e02222c, 0x29000822, 0x29000822},
1354 + {0x0000a534, 0x4202242a, 0x4202242a, 0x2d000824, 0x2d000824},
1355 + {0x0000a538, 0x4702244a, 0x4702244a, 0x30000828, 0x30000828},
1356 + {0x0000a53c, 0x4b02244c, 0x4b02244c, 0x3400082a, 0x3400082a},
1357 + {0x0000a540, 0x4e02246c, 0x4e02246c, 0x38000849, 0x38000849},
1358 + {0x0000a544, 0x5302266c, 0x5302266c, 0x3b000a2c, 0x3b000a2c},
1359 + {0x0000a548, 0x5702286c, 0x5702286c, 0x3e000e2b, 0x3e000e2b},
1360 + {0x0000a54c, 0x5c02486b, 0x5c02486b, 0x42000e2d, 0x42000e2d},
1361 + {0x0000a550, 0x61024a6c, 0x61024a6c, 0x4500124a, 0x4500124a},
1362 + {0x0000a554, 0x66026a6c, 0x66026a6c, 0x4900124c, 0x4900124c},
1363 + {0x0000a558, 0x6b026e6c, 0x6b026e6c, 0x4c00126c, 0x4c00126c},
1364 + {0x0000a55c, 0x7002708c, 0x7002708c, 0x4f00128c, 0x4f00128c},
1365 + {0x0000a560, 0x7302b08a, 0x7302b08a, 0x52001290, 0x52001290},
1366 + {0x0000a564, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1367 + {0x0000a568, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1368 + {0x0000a56c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1369 + {0x0000a570, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1370 + {0x0000a574, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1371 + {0x0000a578, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1372 + {0x0000a57c, 0x7702b08c, 0x7702b08c, 0x56001292, 0x56001292},
1373 + {0x0000a580, 0x00800000, 0x00800000, 0x00800000, 0x00800000},
1374 + {0x0000a584, 0x06800003, 0x06800003, 0x02800001, 0x02800001},
1375 + {0x0000a588, 0x0a800020, 0x0a800020, 0x05800003, 0x05800003},
1376 + {0x0000a58c, 0x10800023, 0x10800023, 0x0a800005, 0x0a800005},
1377 + {0x0000a590, 0x16800220, 0x16800220, 0x0e800201, 0x0e800201},
1378 + {0x0000a594, 0x1c800223, 0x1c800223, 0x11800203, 0x11800203},
1379 + {0x0000a598, 0x21820220, 0x21820220, 0x14800401, 0x14800401},
1380 + {0x0000a59c, 0x27820223, 0x27820223, 0x18800403, 0x18800403},
1381 + {0x0000a5a0, 0x2b822220, 0x2b822220, 0x1b800602, 0x1b800602},
1382 + {0x0000a5a4, 0x2f822222, 0x2f822222, 0x1f800802, 0x1f800802},
1383 + {0x0000a5a8, 0x34822225, 0x34822225, 0x21800620, 0x21800620},
1384 + {0x0000a5ac, 0x3a82222a, 0x3a82222a, 0x25800820, 0x25800820},
1385 + {0x0000a5b0, 0x3e82222c, 0x3e82222c, 0x29800822, 0x29800822},
1386 + {0x0000a5b4, 0x4282242a, 0x4282242a, 0x2d800824, 0x2d800824},
1387 + {0x0000a5b8, 0x4782244a, 0x4782244a, 0x30800828, 0x30800828},
1388 + {0x0000a5bc, 0x4b82244c, 0x4b82244c, 0x3480082a, 0x3480082a},
1389 + {0x0000a5c0, 0x4e82246c, 0x4e82246c, 0x38800849, 0x38800849},
1390 + {0x0000a5c4, 0x5382266c, 0x5382266c, 0x3b800a2c, 0x3b800a2c},
1391 + {0x0000a5c8, 0x5782286c, 0x5782286c, 0x3e800e2b, 0x3e800e2b},
1392 + {0x0000a5cc, 0x5c84286b, 0x5c84286b, 0x42800e2d, 0x42800e2d},
1393 + {0x0000a5d0, 0x61842a6c, 0x61842a6c, 0x4580124a, 0x4580124a},
1394 + {0x0000a5d4, 0x66862a6c, 0x66862a6c, 0x4980124c, 0x4980124c},
1395 + {0x0000a5d8, 0x6b862e6c, 0x6b862e6c, 0x4c80126c, 0x4c80126c},
1396 + {0x0000a5dc, 0x7086308c, 0x7086308c, 0x4f80128c, 0x4f80128c},
1397 + {0x0000a5e0, 0x738a308a, 0x738a308a, 0x52801290, 0x52801290},
1398 + {0x0000a5e4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1399 + {0x0000a5e8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1400 + {0x0000a5ec, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1401 + {0x0000a5f0, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1402 + {0x0000a5f4, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1403 + {0x0000a5f8, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1404 + {0x0000a5fc, 0x778a308c, 0x778a308c, 0x56801292, 0x56801292},
1405 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1406 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1407 + {0x0000a608, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1408 + {0x0000a60c, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1409 + {0x0000a610, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1410 + {0x0000a614, 0x01404000, 0x01404000, 0x01404501, 0x01404501},
1411 + {0x0000a618, 0x01404501, 0x01404501, 0x01404501, 0x01404501},
1412 + {0x0000a61c, 0x02008802, 0x02008802, 0x01404501, 0x01404501},
1413 + {0x0000a620, 0x0300cc03, 0x0300cc03, 0x03c0cf02, 0x03c0cf02},
1414 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03c0cf03, 0x03c0cf03},
1415 + {0x0000a628, 0x0300cc03, 0x0300cc03, 0x04011004, 0x04011004},
1416 + {0x0000a62c, 0x03810c03, 0x03810c03, 0x05419405, 0x05419405},
1417 + {0x0000a630, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1418 + {0x0000a634, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1419 + {0x0000a638, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1420 + {0x0000a63c, 0x03810e04, 0x03810e04, 0x05419506, 0x05419506},
1421 + {0x0000b2dc, 0x0380c7fc, 0x0380c7fc, 0x03eaac5a, 0x03eaac5a},
1422 + {0x0000b2e0, 0x0000f800, 0x0000f800, 0x03f330ac, 0x03f330ac},
1423 + {0x0000b2e4, 0x03ff0000, 0x03ff0000, 0x03fc3f00, 0x03fc3f00},
1424 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ffc000, 0x03ffc000},
1425 + {0x00016044, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
1426 + {0x00016048, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
1427 + {0x00016280, 0x01000015, 0x01000015, 0x01001015, 0x01001015},
1428 + {0x00016288, 0xf0318000, 0xf0318000, 0xf0318000, 0xf0318000},
1429 + {0x00016444, 0x022492db, 0x022492db, 0x022492db, 0x022492db},
1430 + {0x00016448, 0x24925666, 0x24925666, 0x24925266, 0x24925266},
1431 +};
1432 +
1433 static const u32 ar9340_1p0_mac_core[][2] = {
1434 /* Addr allmodes */
1435 {0x00000008, 0x00000000},
1436 --- a/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1437 +++ b/drivers/net/wireless/ath/ath9k/ar9485_initvals.h
1438 @@ -260,6 +260,79 @@ static const u32 ar9485Modes_high_power_
1439 {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1440 };
1441
1442 +static const u32 ar9485Modes_green_ob_db_tx_gain_1_1[][5] = {
1443 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1444 + {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
1445 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1446 + {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
1447 + {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
1448 + {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
1449 + {0x0000a508, 0x0c002e00, 0x0c002e00, 0x06000203, 0x06000203},
1450 + {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
1451 + {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
1452 + {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
1453 + {0x0000a518, 0x25020ec0, 0x25020ec0, 0x15000604, 0x15000604},
1454 + {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x18000605, 0x18000605},
1455 + {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000a04, 0x1c000a04},
1456 + {0x0000a524, 0x35001fc4, 0x35001fc4, 0x21000a06, 0x21000a06},
1457 + {0x0000a528, 0x3c022f04, 0x3c022f04, 0x29000a24, 0x29000a24},
1458 + {0x0000a52c, 0x41023e85, 0x41023e85, 0x2f000e21, 0x2f000e21},
1459 + {0x0000a530, 0x48023ec6, 0x48023ec6, 0x31000e20, 0x31000e20},
1460 + {0x0000a534, 0x4d023f01, 0x4d023f01, 0x33000e20, 0x33000e20},
1461 + {0x0000a538, 0x53023f4b, 0x53023f4b, 0x43000e62, 0x43000e62},
1462 + {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x45000e63, 0x45000e63},
1463 + {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x49000e65, 0x49000e65},
1464 + {0x0000a544, 0x6502feca, 0x6502feca, 0x4b000e66, 0x4b000e66},
1465 + {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4d001645, 0x4d001645},
1466 + {0x0000a54c, 0x7203feca, 0x7203feca, 0x51001865, 0x51001865},
1467 + {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x55001a86, 0x55001a86},
1468 + {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x57001ce9, 0x57001ce9},
1469 + {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5a001ceb, 0x5a001ceb},
1470 + {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x5e001eeb, 0x5e001eeb},
1471 + {0x0000a560, 0x900fff0b, 0x900fff0b, 0x5e001eeb, 0x5e001eeb},
1472 + {0x0000a564, 0x960fffcb, 0x960fffcb, 0x5e001eeb, 0x5e001eeb},
1473 + {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1474 + {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1475 + {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1476 + {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1477 + {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1478 + {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x5e001eeb, 0x5e001eeb},
1479 + {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1480 + {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1481 + {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1482 + {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1483 + {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1484 + {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1485 + {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1486 + {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1487 + {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1488 + {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1489 + {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1490 + {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
1491 + {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
1492 + {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
1493 + {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1494 + {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1495 + {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1496 + {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1497 + {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1498 + {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1499 + {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1500 + {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1501 + {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1502 + {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1503 + {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1504 + {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1505 + {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1506 + {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1507 + {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1508 + {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1509 + {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1510 + {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1511 + {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1512 + {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1513 +};
1514 +
1515 static const u32 ar9485Modes_high_ob_db_tx_gain_1_1[][5] = {
1516 /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1517 {0x000098bc, 0x00000002, 0x00000002, 0x00000002, 0x00000002},
1518 @@ -450,6 +523,79 @@ static const u32 ar9485Modes_low_ob_db_t
1519
1520 #define ar9485_modes_lowest_ob_db_tx_gain_1_1 ar9485Modes_low_ob_db_tx_gain_1_1
1521
1522 +static const u32 ar9485Modes_green_spur_ob_db_tx_gain_1_1[][5] = {
1523 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1524 + {0x000098bc, 0x00000003, 0x00000003, 0x00000003, 0x00000003},
1525 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d8, 0x000050d8},
1526 + {0x0000a458, 0x80000000, 0x80000000, 0x80000000, 0x80000000},
1527 + {0x0000a500, 0x00022200, 0x00022200, 0x00000006, 0x00000006},
1528 + {0x0000a504, 0x05062002, 0x05062002, 0x03000201, 0x03000201},
1529 + {0x0000a508, 0x0c002e00, 0x0c002e00, 0x07000203, 0x07000203},
1530 + {0x0000a50c, 0x11062202, 0x11062202, 0x0a000401, 0x0a000401},
1531 + {0x0000a510, 0x17022e00, 0x17022e00, 0x0e000403, 0x0e000403},
1532 + {0x0000a514, 0x1d000ec2, 0x1d000ec2, 0x12000405, 0x12000405},
1533 + {0x0000a518, 0x25020ec0, 0x25020ec0, 0x14000406, 0x14000406},
1534 + {0x0000a51c, 0x2b020ec3, 0x2b020ec3, 0x1800040a, 0x1800040a},
1535 + {0x0000a520, 0x2f001f04, 0x2f001f04, 0x1c000460, 0x1c000460},
1536 + {0x0000a524, 0x35001fc4, 0x35001fc4, 0x22000463, 0x22000463},
1537 + {0x0000a528, 0x3c022f04, 0x3c022f04, 0x26000465, 0x26000465},
1538 + {0x0000a52c, 0x41023e85, 0x41023e85, 0x2e0006e0, 0x2e0006e0},
1539 + {0x0000a530, 0x48023ec6, 0x48023ec6, 0x310006e0, 0x310006e0},
1540 + {0x0000a534, 0x4d023f01, 0x4d023f01, 0x330006e0, 0x330006e0},
1541 + {0x0000a538, 0x53023f4b, 0x53023f4b, 0x3e0008e3, 0x3e0008e3},
1542 + {0x0000a53c, 0x5a027f09, 0x5a027f09, 0x410008e5, 0x410008e5},
1543 + {0x0000a540, 0x5f027fc9, 0x5f027fc9, 0x430008e6, 0x430008e6},
1544 + {0x0000a544, 0x6502feca, 0x6502feca, 0x4a0008ec, 0x4a0008ec},
1545 + {0x0000a548, 0x6b02ff4a, 0x6b02ff4a, 0x4e0008f1, 0x4e0008f1},
1546 + {0x0000a54c, 0x7203feca, 0x7203feca, 0x520008f3, 0x520008f3},
1547 + {0x0000a550, 0x7703ff0b, 0x7703ff0b, 0x54000eed, 0x54000eed},
1548 + {0x0000a554, 0x7d06ffcb, 0x7d06ffcb, 0x58000ef1, 0x58000ef1},
1549 + {0x0000a558, 0x8407ff0b, 0x8407ff0b, 0x5c000ef3, 0x5c000ef3},
1550 + {0x0000a55c, 0x8907ffcb, 0x8907ffcb, 0x60000ef5, 0x60000ef5},
1551 + {0x0000a560, 0x900fff0b, 0x900fff0b, 0x62000ef6, 0x62000ef6},
1552 + {0x0000a564, 0x960fffcb, 0x960fffcb, 0x62000ef6, 0x62000ef6},
1553 + {0x0000a568, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1554 + {0x0000a56c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1555 + {0x0000a570, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1556 + {0x0000a574, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1557 + {0x0000a578, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1558 + {0x0000a57c, 0x9c1fff0b, 0x9c1fff0b, 0x62000ef6, 0x62000ef6},
1559 + {0x0000b500, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1560 + {0x0000b504, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1561 + {0x0000b508, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1562 + {0x0000b50c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1563 + {0x0000b510, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1564 + {0x0000b514, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1565 + {0x0000b518, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1566 + {0x0000b51c, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1567 + {0x0000b520, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1568 + {0x0000b524, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1569 + {0x0000b528, 0x0000001a, 0x0000001a, 0x0000001a, 0x0000001a},
1570 + {0x0000b52c, 0x0000002a, 0x0000002a, 0x0000002a, 0x0000002a},
1571 + {0x0000b530, 0x0000003a, 0x0000003a, 0x0000003a, 0x0000003a},
1572 + {0x0000b534, 0x0000004a, 0x0000004a, 0x0000004a, 0x0000004a},
1573 + {0x0000b538, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1574 + {0x0000b53c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1575 + {0x0000b540, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1576 + {0x0000b544, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1577 + {0x0000b548, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1578 + {0x0000b54c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1579 + {0x0000b550, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1580 + {0x0000b554, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1581 + {0x0000b558, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1582 + {0x0000b55c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1583 + {0x0000b560, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1584 + {0x0000b564, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1585 + {0x0000b568, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1586 + {0x0000b56c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1587 + {0x0000b570, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1588 + {0x0000b574, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1589 + {0x0000b578, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1590 + {0x0000b57c, 0x0000005b, 0x0000005b, 0x0000005b, 0x0000005b},
1591 + {0x00016044, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db, 0x05d6b2db},
1592 + {0x00016048, 0x6c924260, 0x6c924260, 0x6c924260, 0x6c924260},
1593 +};
1594 +
1595 static const u32 ar9485_1_1[][2] = {
1596 /* Addr allmodes */
1597 {0x0000a580, 0x00000000},
1598 --- a/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
1599 +++ b/drivers/net/wireless/ath/ath9k/ar9580_1p0_initvals.h
1600 @@ -685,6 +685,82 @@ static const u32 ar9580_1p0_mixed_ob_db_
1601
1602 #define ar9580_1p0_high_ob_db_tx_gain_table ar9300Modes_high_ob_db_tx_gain_table_2p2
1603
1604 +#define ar9580_1p0_type5_tx_gain_table ar9300Modes_type5_tx_gain_table_2p2
1605 +
1606 +static const u32 ar9580_1p0_type6_tx_gain_table[][5] = {
1607 + /* Addr 5G_HT20 5G_HT40 2G_HT40 2G_HT20 */
1608 + {0x0000a2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1609 + {0x0000a2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1610 + {0x0000a2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1611 + {0x0000a2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1612 + {0x0000a410, 0x000050d9, 0x000050d9, 0x000050d9, 0x000050d9},
1613 + {0x0000a500, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1614 + {0x0000a504, 0x06000003, 0x06000003, 0x04000002, 0x04000002},
1615 + {0x0000a508, 0x0a000020, 0x0a000020, 0x08000004, 0x08000004},
1616 + {0x0000a50c, 0x10000023, 0x10000023, 0x0b000200, 0x0b000200},
1617 + {0x0000a510, 0x15000028, 0x15000028, 0x0f000202, 0x0f000202},
1618 + {0x0000a514, 0x1b00002b, 0x1b00002b, 0x12000400, 0x12000400},
1619 + {0x0000a518, 0x1f020028, 0x1f020028, 0x16000402, 0x16000402},
1620 + {0x0000a51c, 0x2502002b, 0x2502002b, 0x19000404, 0x19000404},
1621 + {0x0000a520, 0x2a04002a, 0x2a04002a, 0x1c000603, 0x1c000603},
1622 + {0x0000a524, 0x2e06002a, 0x2e06002a, 0x21000a02, 0x21000a02},
1623 + {0x0000a528, 0x3302202d, 0x3302202d, 0x25000a04, 0x25000a04},
1624 + {0x0000a52c, 0x3804202c, 0x3804202c, 0x28000a20, 0x28000a20},
1625 + {0x0000a530, 0x3c06202c, 0x3c06202c, 0x2c000e20, 0x2c000e20},
1626 + {0x0000a534, 0x4108202d, 0x4108202d, 0x30000e22, 0x30000e22},
1627 + {0x0000a538, 0x4506402d, 0x4506402d, 0x34000e24, 0x34000e24},
1628 + {0x0000a53c, 0x4906222d, 0x4906222d, 0x38001640, 0x38001640},
1629 + {0x0000a540, 0x4d062231, 0x4d062231, 0x3c001660, 0x3c001660},
1630 + {0x0000a544, 0x50082231, 0x50082231, 0x3f001861, 0x3f001861},
1631 + {0x0000a548, 0x5608422e, 0x5608422e, 0x43001a81, 0x43001a81},
1632 + {0x0000a54c, 0x5e08442e, 0x5e08442e, 0x47001a83, 0x47001a83},
1633 + {0x0000a550, 0x620a4431, 0x620a4431, 0x4a001c84, 0x4a001c84},
1634 + {0x0000a554, 0x640a4432, 0x640a4432, 0x4e001ce3, 0x4e001ce3},
1635 + {0x0000a558, 0x680a4434, 0x680a4434, 0x52001ce5, 0x52001ce5},
1636 + {0x0000a55c, 0x6c0a6434, 0x6c0a6434, 0x56001ce9, 0x56001ce9},
1637 + {0x0000a560, 0x6f0a6633, 0x6f0a6633, 0x5a001ceb, 0x5a001ceb},
1638 + {0x0000a564, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1639 + {0x0000a568, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1640 + {0x0000a56c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1641 + {0x0000a570, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1642 + {0x0000a574, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1643 + {0x0000a578, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1644 + {0x0000a57c, 0x730c6634, 0x730c6634, 0x5d001eec, 0x5d001eec},
1645 + {0x0000a600, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1646 + {0x0000a604, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
1647 + {0x0000a608, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1648 + {0x0000a60c, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1649 + {0x0000a610, 0x01804601, 0x01804601, 0x00000000, 0x00000000},
1650 + {0x0000a614, 0x01804601, 0x01804601, 0x01404000, 0x01404000},
1651 + {0x0000a618, 0x01804601, 0x01804601, 0x01404501, 0x01404501},
1652 + {0x0000a61c, 0x01804601, 0x01804601, 0x02008501, 0x02008501},
1653 + {0x0000a620, 0x03408d02, 0x03408d02, 0x0280ca03, 0x0280ca03},
1654 + {0x0000a624, 0x0300cc03, 0x0300cc03, 0x03010c04, 0x03010c04},
1655 + {0x0000a628, 0x03410d04, 0x03410d04, 0x04014c04, 0x04014c04},
1656 + {0x0000a62c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1657 + {0x0000a630, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1658 + {0x0000a634, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1659 + {0x0000a638, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1660 + {0x0000a63c, 0x03410d04, 0x03410d04, 0x04015005, 0x04015005},
1661 + {0x0000b2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1662 + {0x0000b2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1663 + {0x0000b2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1664 + {0x0000b2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1665 + {0x0000c2dc, 0x000cfff0, 0x000cfff0, 0x03aaa352, 0x03aaa352},
1666 + {0x0000c2e0, 0x000f0000, 0x000f0000, 0x03ccc584, 0x03ccc584},
1667 + {0x0000c2e4, 0x03f00000, 0x03f00000, 0x03f0f800, 0x03f0f800},
1668 + {0x0000c2e8, 0x00000000, 0x00000000, 0x03ff0000, 0x03ff0000},
1669 + {0x00016044, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1670 + {0x00016048, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1671 + {0x00016068, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1672 + {0x00016444, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1673 + {0x00016448, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1674 + {0x00016468, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1675 + {0x00016844, 0x012492d4, 0x012492d4, 0x012492d4, 0x012492d4},
1676 + {0x00016848, 0x61200001, 0x61200001, 0x66480001, 0x66480001},
1677 + {0x00016868, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c, 0x6db6db6c},
1678 +};
1679 +
1680 static const u32 ar9580_1p0_soc_preamble[][2] = {
1681 /* Addr allmodes */
1682 {0x000040a4, 0x00a0c1c9},
1683 --- a/drivers/net/wireless/ath/ath9k/reg.h
1684 +++ b/drivers/net/wireless/ath/ath9k/reg.h
1685 @@ -789,6 +789,7 @@
1686 #define AR_SREV_REVISION_9271_11 1
1687 #define AR_SREV_VERSION_9300 0x1c0
1688 #define AR_SREV_REVISION_9300_20 2 /* 2.0 and 2.1 */
1689 +#define AR_SREV_REVISION_9300_22 3
1690 #define AR_SREV_VERSION_9330 0x200
1691 #define AR_SREV_REVISION_9330_10 0
1692 #define AR_SREV_REVISION_9330_11 1
1693 @@ -869,6 +870,9 @@
1694 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9300))
1695 #define AR_SREV_9300_20_OR_LATER(_ah) \
1696 ((_ah)->hw_version.macVersion >= AR_SREV_VERSION_9300)
1697 +#define AR_SREV_9300_22(_ah) \
1698 + (AR_SREV_9300(ah) && \
1699 + ((_ah)->hw_version.macRev == AR_SREV_REVISION_9300_22))
1700
1701 #define AR_SREV_9330(_ah) \
1702 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9330))
1703 --- a/net/mac80211/mlme.c
1704 +++ b/net/mac80211/mlme.c
1705 @@ -199,11 +199,11 @@ static u32 ieee80211_config_ht_tx(struct
1706 case NL80211_CHAN_WIDTH_40:
1707 if (sdata->vif.bss_conf.chandef.chan->center_freq >
1708 sdata->vif.bss_conf.chandef.center_freq1 &&
1709 - chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
1710 + chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
1711 disable_40 = true;
1712 if (sdata->vif.bss_conf.chandef.chan->center_freq <
1713 sdata->vif.bss_conf.chandef.center_freq1 &&
1714 - chan->flags & IEEE80211_CHAN_NO_HT40MINUS)
1715 + chan->flags & IEEE80211_CHAN_NO_HT40PLUS)
1716 disable_40 = true;
1717 break;
1718 default:
1719 --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
1720 +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
1721 @@ -485,9 +485,7 @@ static int ar5008_hw_rf_alloc_ext_banks(
1722 ATH_ALLOC_BANK(ah->analogBank2Data, ah->iniBank2.ia_rows);
1723 ATH_ALLOC_BANK(ah->analogBank3Data, ah->iniBank3.ia_rows);
1724 ATH_ALLOC_BANK(ah->analogBank6Data, ah->iniBank6.ia_rows);
1725 - ATH_ALLOC_BANK(ah->analogBank6TPCData, ah->iniBank6TPC.ia_rows);
1726 ATH_ALLOC_BANK(ah->analogBank7Data, ah->iniBank7.ia_rows);
1727 - ATH_ALLOC_BANK(ah->bank6Temp, ah->iniBank6.ia_rows);
1728
1729 return 0;
1730 #undef ATH_ALLOC_BANK
1731 @@ -517,6 +515,7 @@ static bool ar5008_hw_set_rf_regs(struct
1732 u32 ob5GHz = 0, db5GHz = 0;
1733 u32 ob2GHz = 0, db2GHz = 0;
1734 int regWrites = 0;
1735 + int i;
1736
1737 /*
1738 * Software does not need to program bank data
1739 @@ -541,13 +540,9 @@ static bool ar5008_hw_set_rf_regs(struct
1740 /* Setup Bank 6 Write */
1741 ar5008_rf_bank_setup(ah->analogBank3Data, &ah->iniBank3,
1742 modesIndex);
1743 - {
1744 - int i;
1745 - for (i = 0; i < ah->iniBank6TPC.ia_rows; i++) {
1746 - ah->analogBank6Data[i] =
1747 - INI_RA(&ah->iniBank6TPC, i, modesIndex);
1748 - }
1749 - }
1750 +
1751 + for (i = 0; i < ah->iniBank6.ia_rows; i++)
1752 + ah->analogBank6Data[i] = INI_RA(&ah->iniBank6, i, modesIndex);
1753
1754 /* Only the 5 or 2 GHz OB/DB need to be set for a mode */
1755 if (eepMinorRev >= 2) {
1756 @@ -572,18 +567,12 @@ static bool ar5008_hw_set_rf_regs(struct
1757 ar5008_rf_bank_setup(ah->analogBank7Data, &ah->iniBank7, 1);
1758
1759 /* Write Analog registers */
1760 - REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data,
1761 - regWrites);
1762 - REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data,
1763 - regWrites);
1764 - REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data,
1765 - regWrites);
1766 - REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data,
1767 - regWrites);
1768 - REG_WRITE_RF_ARRAY(&ah->iniBank6TPC, ah->analogBank6Data,
1769 - regWrites);
1770 - REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data,
1771 - regWrites);
1772 + REG_WRITE_RF_ARRAY(&ah->iniBank0, ah->analogBank0Data, regWrites);
1773 + REG_WRITE_RF_ARRAY(&ah->iniBank1, ah->analogBank1Data, regWrites);
1774 + REG_WRITE_RF_ARRAY(&ah->iniBank2, ah->analogBank2Data, regWrites);
1775 + REG_WRITE_RF_ARRAY(&ah->iniBank3, ah->analogBank3Data, regWrites);
1776 + REG_WRITE_RF_ARRAY(&ah->iniBank6, ah->analogBank6Data, regWrites);
1777 + REG_WRITE_RF_ARRAY(&ah->iniBank7, ah->analogBank7Data, regWrites);
1778
1779 return true;
1780 }
1781 --- a/drivers/net/wireless/ath/ath9k/ar9002_hw.c
1782 +++ b/drivers/net/wireless/ath/ath9k/ar9002_hw.c
1783 @@ -23,13 +23,13 @@
1784
1785 /* General hardware code for the A5008/AR9001/AR9002 hadware families */
1786
1787 -static void ar9002_hw_init_mode_regs(struct ath_hw *ah)
1788 +static int ar9002_hw_init_mode_regs(struct ath_hw *ah)
1789 {
1790 if (AR_SREV_9271(ah)) {
1791 INIT_INI_ARRAY(&ah->iniModes, ar9271Modes_9271);
1792 INIT_INI_ARRAY(&ah->iniCommon, ar9271Common_9271);
1793 INIT_INI_ARRAY(&ah->iniModes_9271_ANI_reg, ar9271Modes_9271_ANI_reg);
1794 - return;
1795 + return 0;
1796 }
1797
1798 if (ah->config.pcie_clock_req)
1799 @@ -67,12 +67,10 @@ static void ar9002_hw_init_mode_regs(str
1800 } else if (AR_SREV_9100_OR_LATER(ah)) {
1801 INIT_INI_ARRAY(&ah->iniModes, ar5416Modes_9100);
1802 INIT_INI_ARRAY(&ah->iniCommon, ar5416Common_9100);
1803 - INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6_9100);
1804 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac_9100);
1805 } else {
1806 INIT_INI_ARRAY(&ah->iniModes, ar5416Modes);
1807 INIT_INI_ARRAY(&ah->iniCommon, ar5416Common);
1808 - INIT_INI_ARRAY(&ah->iniBank6TPC, ar5416Bank6TPC);
1809 INIT_INI_ARRAY(&ah->iniAddac, ar5416Addac);
1810 }
1811
1812 @@ -86,14 +84,11 @@ static void ar9002_hw_init_mode_regs(str
1813 INIT_INI_ARRAY(&ah->iniBank3, ar5416Bank3);
1814 INIT_INI_ARRAY(&ah->iniBank7, ar5416Bank7);
1815
1816 - /* Common for AR5416, AR9160 */
1817 - if (!AR_SREV_9100(ah))
1818 - INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6);
1819 -
1820 /* Common for AR913x, AR9160 */
1821 if (!AR_SREV_5416(ah))
1822 - INIT_INI_ARRAY(&ah->iniBank6TPC,
1823 - ar5416Bank6TPC_9100);
1824 + INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC_9100);
1825 + else
1826 + INIT_INI_ARRAY(&ah->iniBank6, ar5416Bank6TPC);
1827 }
1828
1829 /* iniAddac needs to be modified for these chips */
1830 @@ -104,7 +99,7 @@ static void ar9002_hw_init_mode_regs(str
1831
1832 data = devm_kzalloc(ah->dev, size, GFP_KERNEL);
1833 if (!data)
1834 - return;
1835 + return -ENOMEM;
1836
1837 memcpy(data, addac->ia_array, size);
1838 addac->ia_array = data;
1839 @@ -120,6 +115,7 @@ static void ar9002_hw_init_mode_regs(str
1840 INIT_INI_ARRAY(&ah->iniCckfirJapan2484,
1841 ar9287Common_japan_2484_cck_fir_coeff_9287_1_1);
1842 }
1843 + return 0;
1844 }
1845
1846 static void ar9280_20_hw_init_rxgain_ini(struct ath_hw *ah)
1847 @@ -415,7 +411,10 @@ int ar9002_hw_attach_ops(struct ath_hw *
1848 struct ath_hw_ops *ops = ath9k_hw_ops(ah);
1849 int ret;
1850
1851 - priv_ops->init_mode_regs = ar9002_hw_init_mode_regs;
1852 + ret = ar9002_hw_init_mode_regs(ah);
1853 + if (ret)
1854 + return ret;
1855 +
1856 priv_ops->init_mode_gain_regs = ar9002_hw_init_mode_gain_regs;
1857
1858 ops->config_pci_powersave = ar9002_hw_configpcipowersave;
1859 --- a/drivers/net/wireless/ath/ath9k/hw.c
1860 +++ b/drivers/net/wireless/ath/ath9k/hw.c
1861 @@ -54,11 +54,6 @@ static void ath9k_hw_init_cal_settings(s
1862 ath9k_hw_private_ops(ah)->init_cal_settings(ah);
1863 }
1864
1865 -static void ath9k_hw_init_mode_regs(struct ath_hw *ah)
1866 -{
1867 - ath9k_hw_private_ops(ah)->init_mode_regs(ah);
1868 -}
1869 -
1870 static u32 ath9k_hw_compute_pll_control(struct ath_hw *ah,
1871 struct ath9k_channel *chan)
1872 {
1873 @@ -670,8 +665,6 @@ static int __ath9k_hw_init(struct ath_hw
1874 if (!AR_SREV_9300_20_OR_LATER(ah))
1875 ah->ani_function &= ~ATH9K_ANI_MRC_CCK;
1876
1877 - ath9k_hw_init_mode_regs(ah);
1878 -
1879 if (!ah->is_pciexpress)
1880 ath9k_hw_disablepcie(ah);
1881
1882 --- a/drivers/net/wireless/ath/ath9k/hw.h
1883 +++ b/drivers/net/wireless/ath/ath9k/hw.h
1884 @@ -599,7 +599,6 @@ struct ath_hw_radar_conf {
1885 * @init_cal_settings: setup types of calibrations supported
1886 * @init_cal: starts actual calibration
1887 *
1888 - * @init_mode_regs: Initializes mode registers
1889 * @init_mode_gain_regs: Initialize TX/RX gain registers
1890 *
1891 * @rf_set_freq: change frequency
1892 @@ -618,7 +617,6 @@ struct ath_hw_private_ops {
1893 void (*init_cal_settings)(struct ath_hw *ah);
1894 bool (*init_cal)(struct ath_hw *ah, struct ath9k_channel *chan);
1895
1896 - void (*init_mode_regs)(struct ath_hw *ah);
1897 void (*init_mode_gain_regs)(struct ath_hw *ah);
1898 void (*setup_calibration)(struct ath_hw *ah,
1899 struct ath9k_cal_list *currCal);
1900 @@ -815,9 +813,7 @@ struct ath_hw {
1901 u32 *analogBank2Data;
1902 u32 *analogBank3Data;
1903 u32 *analogBank6Data;
1904 - u32 *analogBank6TPCData;
1905 u32 *analogBank7Data;
1906 - u32 *bank6Temp;
1907
1908 int coverage_class;
1909 u32 slottime;
1910 @@ -858,7 +854,6 @@ struct ath_hw {
1911 struct ar5416IniArray iniBank2;
1912 struct ar5416IniArray iniBank3;
1913 struct ar5416IniArray iniBank6;
1914 - struct ar5416IniArray iniBank6TPC;
1915 struct ar5416IniArray iniBank7;
1916 struct ar5416IniArray iniAddac;
1917 struct ar5416IniArray iniPcieSerdes;
OpenWrt SVN history