Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

John W. Linville says: ==================== Please pull this batch of fixes intended for the 3.10 stream... Regarding the NFC bits, Samuel says: "This is the first batch of NFC fixes for 3.10, and it contains: - 3 fixes for the NFC MEI support: * We now depend on the correct Kconfig symbol. * We register an MEI event callback whenever we enable an NFC device, otherwise we fail to read anything after an enable/disable cycle. * We only disable an MEI device from its disable mey_phy_ops, preventing useless consecutive disable calls. - An NFC Makefile cleanup, as I forgot to remove a commented out line when moving the LLCP code to the NFC top level directory." As for the mac80211 bits, Johannes says: "This time I have a fix from Stanislaw for a stupid mistake I made in the auth/assoc timeout changes, a fix from Felix for 64-bit traffic counters and one from Helmut for address mask handling in mac80211. I also have a few fixes myself for four different crashes reported by a few people." And Johannes says this about the iwlwifi bit: "This fixes a brown paper-bag bug that we really should've caught in review. More details in the changelog for the fix." On top of that... Arend van Spriel and Hante Meuleman cooperate to send a series of AP and P2P mode fixes for brcmfmac. Gabor Juhos corrects a register offset for AR9550, avoiding a bus error. Dan Carpenter provides a fixup to some dmesg output in the atmel driver. And, finally... Felix Fietkau not only gives us a trio of small AR934x fixes, but also refactors the ath9k aggregation session start/stop handling (using the generic mac80211 support) in order to avoid a deadlock. Please let me know if there are problems! ==================== Signed-off-by: David S. Miller <davem@davemloft.net>

Author: davem330

drivers/net/wireless/ath/ath9k/ar9003_eeprom.h

@@ -68,13 +68,16 @@
 #define AR9300_BASE_ADDR 0x3ff
 #define AR9300_BASE_ADDR_512 0x1ff
 
-#define AR9300_OTP_BASE(AR_SREV_9340(ah) ? 0x30000 : 0x14000)
-#define AR9300_OTP_STATUS(AR_SREV_9340(ah) ? 0x30018 : 0x15f18)
+#define AR9300_OTP_BASE \
+((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30000 : 0x14000)
+#define AR9300_OTP_STATUS \
+((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x30018 : 0x15f18)
 #define AR9300_OTP_STATUS_TYPE0x7
 #define AR9300_OTP_STATUS_VALID0x4
 #define AR9300_OTP_STATUS_ACCESS_BUSY0x2
 #define AR9300_OTP_STATUS_SM_BUSY0x1
-#define AR9300_OTP_READ_DATA(AR_SREV_9340(ah) ? 0x3001c : 0x15f1c)
+#define AR9300_OTP_READ_DATA \
+((AR_SREV_9340(ah) || AR_SREV_9550(ah)) ? 0x3001c : 0x15f1c)
 
 enum targetPowerHTRates {
 HT_TARGET_RATE_0_8_16,

drivers/net/wireless/ath/ath9k/ar9003_phy.c

@@ -334,7 +334,8 @@ static void ar9003_hw_spur_ofdm(struct ath_hw *ah,
 REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,
  AR_PHY_SPUR_REG_EN_VIT_SPUR_RSSI, 1);
 
-if (REG_READ_FIELD(ah, AR_PHY_MODE,
+if (!AR_SREV_9340(ah) &&
+ REG_READ_FIELD(ah, AR_PHY_MODE,
  AR_PHY_MODE_DYNAMIC) == 0x1)
 REG_RMW_FIELD(ah, AR_PHY_SPUR_REG,
  AR_PHY_SPUR_REG_ENABLE_NF_RSSI_SPUR_MIT, 1);

drivers/net/wireless/ath/ath9k/ath9k.h

@@ -251,10 +251,9 @@ struct ath_atx_tid {
 int tidno;
 int baw_head; /* first un-acked tx buffer */
 int baw_tail; /* next unused tx buffer slot */
-int sched;
-int paused;
-u8 state;
-bool stop_cb;
+bool sched;
+bool paused;
+bool active;
 };
 
 struct ath_node {
@@ -275,10 +274,6 @@ struct ath_node {
 #endif
 };
 
-#define AGGR_CLEANUP BIT(1)
-#define AGGR_ADDBA_COMPLETE BIT(2)
-#define AGGR_ADDBA_PROGRESS BIT(3)
-
 struct ath_tx_control {
 struct ath_txq *txq;
 struct ath_node *an;
@@ -352,8 +347,7 @@ void ath_tx_tasklet(struct ath_softc *sc);
 void ath_tx_edma_tasklet(struct ath_softc *sc);
 int ath_tx_aggr_start(struct ath_softc *sc, struct ieee80211_sta *sta,
  u16 tid, u16 *ssn);
-bool ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid,
- bool flush);
+void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid);
 
 void ath_tx_aggr_wakeup(struct ath_softc *sc, struct ath_node *an);

drivers/net/wireless/ath/ath9k/hw.c

@@ -1172,6 +1172,7 @@ u32 ath9k_regd_get_ctl(struct ath_regulatory *reg, struct ath9k_channel *chan)
 static inline void ath9k_hw_set_dma(struct ath_hw *ah)
 {
 struct ath_common *common = ath9k_hw_common(ah);
+int txbuf_size;
 
 ENABLE_REGWRITE_BUFFER(ah);
 
@@ -1225,13 +1226,17 @@ static inline void ath9k_hw_set_dma(struct ath_hw *ah)
  * So set the usable tx buf size also to half to
  * avoid data/delimiter underruns
  */
-REG_WRITE(ah, AR_PCU_TXBUF_CTRL,
- AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE);
-} else if (!AR_SREV_9271(ah)) {
-REG_WRITE(ah, AR_PCU_TXBUF_CTRL,
- AR_PCU_TXBUF_CTRL_USABLE_SIZE);
+txbuf_size = AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE;
+} else if (AR_SREV_9340_13_OR_LATER(ah)) {
+/* Uses fewer entries for AR934x v1.3+ to prevent rx overruns */
+txbuf_size = AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE;
+} else {
+txbuf_size = AR_PCU_TXBUF_CTRL_USABLE_SIZE;
 }
 
+if (!AR_SREV_9271(ah))
+REG_WRITE(ah, AR_PCU_TXBUF_CTRL, txbuf_size);
+
 REGWRITE_BUFFER_FLUSH(ah);
 
 if (AR_SREV_9300_20_OR_LATER(ah))
@@ -1306,9 +1311,13 @@ static bool ath9k_hw_set_reset(struct ath_hw *ah, int type)
 AR_RTC_RC_COLD_RESET | AR_RTC_RC_WARM_RESET;
 } else {
 tmpReg = REG_READ(ah, AR_INTR_SYNC_CAUSE);
-if (tmpReg &
- (AR_INTR_SYNC_LOCAL_TIMEOUT |
- AR_INTR_SYNC_RADM_CPL_TIMEOUT)) {
+if (AR_SREV_9340(ah))
+tmpReg &= AR9340_INTR_SYNC_LOCAL_TIMEOUT;
+else
+tmpReg &= AR_INTR_SYNC_LOCAL_TIMEOUT |
+ AR_INTR_SYNC_RADM_CPL_TIMEOUT;
+
+if (tmpReg) {
 u32 val;
 REG_WRITE(ah, AR_INTR_SYNC_ENABLE, 0);
 

drivers/net/wireless/ath/ath9k/mac.c

@@ -410,7 +410,7 @@ bool ath9k_hw_resettxqueue(struct ath_hw *ah, u32 q)
 
 REG_WRITE(ah, AR_QMISC(q), AR_Q_MISC_DCU_EARLY_TERM_REQ);
 
-if (AR_SREV_9340(ah))
+if (AR_SREV_9340(ah) && !AR_SREV_9340_13_OR_LATER(ah))
 REG_WRITE(ah, AR_DMISC(q),
  AR_D_MISC_CW_BKOFF_EN | AR_D_MISC_FRAG_WAIT_EN | 0x1);
 else

drivers/net/wireless/ath/ath9k/main.c

@@ -1709,7 +1709,8 @@ static int ath9k_ampdu_action(struct ieee80211_hw *hw,
 flush = true;
 case IEEE80211_AMPDU_TX_STOP_CONT:
 ath9k_ps_wakeup(sc);
-if (ath_tx_aggr_stop(sc, sta, tid, flush))
+ath_tx_aggr_stop(sc, sta, tid);
+if (!flush)
 ieee80211_stop_tx_ba_cb_irqsafe(vif, sta->addr, tid);
 ath9k_ps_restore(sc);
 break;

drivers/net/wireless/ath/ath9k/rc.c

@@ -1227,10 +1227,7 @@ static bool ath_tx_aggr_check(struct ath_softc *sc, struct ieee80211_sta *sta,
 return false;
 
 txtid = ATH_AN_2_TID(an, tidno);
-
-if (!(txtid->state & (AGGR_ADDBA_COMPLETE | AGGR_ADDBA_PROGRESS)))
-return true;
-return false;
+return !txtid->active;
 }
 
 

drivers/net/wireless/ath/ath9k/reg.h

@@ -798,6 +798,10 @@
 #define AR_SREV_REVISION_9485_100
 #define AR_SREV_REVISION_9485_11 1
 #define AR_SREV_VERSION_93400x300
+#define AR_SREV_REVISION_9340_100
+#define AR_SREV_REVISION_9340_111
+#define AR_SREV_REVISION_9340_122
+#define AR_SREV_REVISION_9340_133
 #define AR_SREV_VERSION_95800x1C0
 #define AR_SREV_REVISION_9580_104 /* AR9580 1.0 */
 #define AR_SREV_VERSION_94620x280
@@ -897,6 +901,10 @@
 #define AR_SREV_9340(_ah) \
 (((_ah)->hw_version.macVersion == AR_SREV_VERSION_9340))
 
+#define AR_SREV_9340_13_OR_LATER(_ah) \
+(AR_SREV_9340((_ah)) && \
+ ((_ah)->hw_version.macRev >= AR_SREV_REVISION_9340_13))
+
 #define AR_SREV_9285E_20(_ah) \
  (AR_SREV_9285_12_OR_LATER(_ah) && \
  ((REG_READ(_ah, AR_AN_SYNTH9) & 0x7) == 0x1))
@@ -1007,6 +1015,8 @@ enum {
 AR_INTR_SYNC_LOCAL_TIMEOUT |
 AR_INTR_SYNC_MAC_SLEEP_ACCESS),
 
+AR9340_INTR_SYNC_LOCAL_TIMEOUT = 0x00000010,
+
 AR_INTR_SYNC_SPURIOUS = 0xFFFFFFFF,
 
 };
@@ -1881,6 +1891,7 @@ enum {
 #define AR_PCU_TXBUF_CTRL_SIZE_MASK 0x7FF
 #define AR_PCU_TXBUF_CTRL_USABLE_SIZE 0x700
 #define AR_9285_PCU_TXBUF_CTRL_USABLE_SIZE 0x380
+#define AR_9340_PCU_TXBUF_CTRL_USABLE_SIZE 0x500
 
 #define AR_PCU_MISC_MODE2 0x8344
 #define AR_PCU_MISC_MODE2_MGMT_CRYPTO_ENABLE 0x00000002