Changeset 36344

Timestamp:

2013-04-16T12:53:02+02:00 (5 years ago)

Author:

nbd

Message:

ath9k: change the BSSID mask calculation to fix setting arbitrary MAC address on interfaces

Signed-off-by: Felix Fietkau <nbd@…>

Location:

trunk/package/mac80211/patches

Files:

• 300-pending_work.patch (modified) (2 diffs)
• 510-ath9k_intr_mitigation_tweak.patch (modified) (1 diff)
• 512-ath9k_channelbw_debugfs.patch (modified) (5 diffs)
• 521-ath9k_cur_txpower.patch (modified) (2 diffs)
• 524-ath9k_use_configured_antenna_gain.patch (modified) (2 diffs)
• 530-ath9k_extra_leds.patch (modified) (2 diffs)
• 553-ath9k_debugfs_diag.patch (modified) (1 diff)
• 555-ath9k-allow-to-disable-bands-via-platform-data.patch (modified) (1 diff)

trunk/package/mac80211/patches/300-pending_work.patch

@@ -608 +608 @@
         if (!ath9k_hw_set_reset_reg(ah, reset_type))
                 return false;
+@@ -1876,13 +1878,12 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+ 
+        ENABLE_REGWRITE_BUFFER(ah);
+ 
+-       REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
+-       REG_WRITE(ah, AR_STA_ID1, get_unaligned_le16(common->macaddr + 4)
+-                 | macStaId1
++       REG_RMW(ah, AR_STA_ID1, macStaId1
+                  | AR_STA_ID1_RTS_USE_DEF
+                  | (ah->config.
+                     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)
+-                 | ah->sta_id1_defaults);
++                 | ah->sta_id1_defaults,
++                 ~AR_STA_ID1_SADH_MASK);
+        ath_hw_setbssidmask(common);
+        REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
+        ath9k_hw_write_associd(ah);
 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c
 +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1630 +1647 @@
                 p += sprintf(p, "  %6u.%1u   %6u.%1u   %6u.%1u        "
                                 "%3u(%3u)   %8llu    %8llu\n",
+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
+@@ -657,11 +657,10 @@ enum sc_op_flags {
+ struct ath_rate_table;
+ 
+ struct ath9k_vif_iter_data {
+-       const u8 *hw_macaddr; /* phy's hardware address, set
+-                              * before starting iteration for
+-                              * valid bssid mask.
+-                              */
++       u8 hw_macaddr[ETH_ALEN]; /* address of the first vif */
+        u8 mask[ETH_ALEN]; /* bssid mask */
++       bool has_hw_macaddr;
++
+        int naps;      /* number of AP vifs */
+        int nmeshes;   /* number of mesh vifs */
+        int nstations; /* number of station vifs */
+--- a/drivers/net/wireless/ath/ath9k/main.c
++++ b/drivers/net/wireless/ath/ath9k/main.c
+@@ -835,10 +835,14 @@ static void ath9k_vif_iter(void *data, u
+        struct ath9k_vif_iter_data *iter_data = data;
+        int i;
+ 
+-       if (iter_data->hw_macaddr)
++       if (iter_data->has_hw_macaddr) {
+                for (i = 0; i < ETH_ALEN; i++)
+                        iter_data->mask[i] &=
+                                ~(iter_data->hw_macaddr[i] ^ mac[i]);
++       } else {
++               memcpy(iter_data->hw_macaddr, mac, ETH_ALEN);
++               iter_data->has_hw_macaddr = true;
++       }
+ 
+        switch (vif->type) {
+        case NL80211_IFTYPE_AP:
+@@ -887,7 +891,6 @@ void ath9k_calculate_iter_data(struct ie
+         * together with the BSSID mask when matching addresses.
+         */
+        memset(iter_data, 0, sizeof(*iter_data));
+-       iter_data->hw_macaddr = common->macaddr;
+        memset(&iter_data->mask, 0xff, ETH_ALEN);
+ 
+        if (vif)
+@@ -897,6 +900,8 @@ void ath9k_calculate_iter_data(struct ie
+        ieee80211_iterate_active_interfaces_atomic(
+                sc->hw, IEEE80211_IFACE_ITER_RESUME_ALL,
+                ath9k_vif_iter, iter_data);
++
++       memcpy(common->macaddr, iter_data->hw_macaddr, ETH_ALEN);
+ }
+ 
+ /* Called with sc->mutex held. */
+--- a/drivers/net/wireless/ath/ath9k/reg.h
++++ b/drivers/net/wireless/ath/ath9k/reg.h
+@@ -1493,9 +1493,6 @@ enum {
+ #define AR9271_RADIO_RF_RST                    0x20
+ #define AR9271_GATE_MAC_CTL                    0x4000
+ 
+-#define AR_STA_ID0                 0x8000
+-#define AR_STA_ID1                 0x8004
+-#define AR_STA_ID1_SADH_MASK       0x0000FFFF
+ #define AR_STA_ID1_STA_AP          0x00010000
+ #define AR_STA_ID1_ADHOC           0x00020000
+ #define AR_STA_ID1_PWR_SAV         0x00040000
+--- a/drivers/net/wireless/ath/hw.c
++++ b/drivers/net/wireless/ath/hw.c
+@@ -118,6 +118,12 @@
+ void ath_hw_setbssidmask(struct ath_common *common)
+ {
+        void *ah = common->ah;
++       u32 id1;
++
++       REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));
++       id1 = REG_READ(ah, AR_STA_ID1) & ~AR_STA_ID1_SADH_MASK;
++       id1 |= get_unaligned_le16(common->macaddr + 4);
++       REG_WRITE(ah, AR_STA_ID1, id1);
+ 
+        REG_WRITE(ah, AR_BSSMSKL, get_unaligned_le32(common->bssidmask));
+        REG_WRITE(ah, AR_BSSMSKU, get_unaligned_le16(common->bssidmask + 4));
+--- a/drivers/net/wireless/ath/reg.h
++++ b/drivers/net/wireless/ath/reg.h
+@@ -23,6 +23,10 @@
+ #define AR_MIBC_CMC            0x00000004
+ #define AR_MIBC_MCS            0x00000008
+ 
++#define AR_STA_ID0             0x8000
++#define AR_STA_ID1             0x8004
++#define AR_STA_ID1_SADH_MASK   0x0000ffff
++
+ /*
+  * BSSID mask registers. See ath_hw_set_bssid_mask()
+  * for detailed documentation about these registers.

trunk/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch

@@ -1 +1 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -1947,8 +1947,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -1946,8 +1946,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
                 REG_WRITE(ah, AR_OBS, 8);
  

trunk/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch

@@ -1 +1 @@
 --- a/drivers/net/wireless/ath/ath9k/ath9k.h
 +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-@@ -690,6 +690,7 @@ struct ath_softc {
+@@ -689,6 +689,7 @@ struct ath_softc {
         struct ieee80211_hw *hw;
         struct device *dev;
@@ -9 +9 @@
         struct survey_info survey[ATH9K_NUM_CHANNELS];
  
-@@ -894,6 +895,7 @@ struct fft_sample_ht20 {
+@@ -893,6 +894,7 @@ struct fft_sample_ht20 {
         u8 data[SPECTRAL_HT20_NUM_BINS];
  } __packed;
@@ -81 +81 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1131,7 +1131,7 @@ int ath9k_spectral_scan_config(struct ie
+@@ -1136,7 +1136,7 @@ int ath9k_spectral_scan_config(struct ie
         return 0;
  }
@@ -90 +90 @@
         struct ath_softc *sc = hw->priv;
         struct ath_hw *ah = sc->sc_ah;
-@@ -1185,9 +1185,11 @@ static int ath9k_config(struct ieee80211
+@@ -1190,9 +1190,11 @@ static int ath9k_config(struct ieee80211
  
         if ((changed & IEEE80211_CONF_CHANGE_CHANNEL) || reset_channel) {
@@ -102 +102 @@
                 if (ah->curchan)
                         old_pos = ah->curchan - &ah->channels[0];
-@@ -1230,7 +1232,23 @@ static int ath9k_config(struct ieee80211
+@@ -1235,7 +1237,23 @@ static int ath9k_config(struct ieee80211
                         memset(&sc->survey[pos], 0, sizeof(struct survey_info));
                 }

trunk/package/mac80211/patches/521-ath9k_cur_txpower.patch

@@ -1 +1 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1255,6 +1255,8 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1260,6 +1260,8 @@ int ath9k_config(struct ieee80211_hw *hw
                         return -EINVAL;
                 }
@@ -10 +10 @@
                  * The most recent snapshot of channel->noisefloor for the old
                  * channel is only available after the hardware reset. Copy it to
-@@ -1274,6 +1276,7 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1279,6 +1281,7 @@ int ath9k_config(struct ieee80211_hw *hw
                 sc->config.txpowlimit = 2 * conf->power_level;
                 ath9k_cmn_update_txpow(ah, sc->curtxpow,

trunk/package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch

@@ -11 +11 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2818,7 +2818,7 @@ void ath9k_hw_apply_txpower(struct ath_h
+@@ -2817,7 +2817,7 @@ void ath9k_hw_apply_txpower(struct ath_h
         channel = chan->chan;
         chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
@@ -22 +22 @@
 --- a/drivers/net/wireless/ath/ath9k/main.c
 +++ b/drivers/net/wireless/ath/ath9k/main.c
-@@ -1272,7 +1272,10 @@ int ath9k_config(struct ieee80211_hw *hw
+@@ -1277,7 +1277,10 @@ int ath9k_config(struct ieee80211_hw *hw
         }
  

trunk/package/mac80211/patches/530-ath9k_extra_leds.patch

@@ -11 +11 @@
  static inline void ath_init_leds(struct ath_softc *sc)
  {
-@@ -686,6 +689,13 @@ enum spectral_mode {
+@@ -685,6 +688,13 @@ enum spectral_mode {
         SPECTRAL_CHANSCAN,
  };
@@ -25 +25 @@
         struct ieee80211_hw *hw;
         struct device *dev;
-@@ -727,9 +737,8 @@ struct ath_softc {
+@@ -726,9 +736,8 @@ struct ath_softc {
         struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS];
  

trunk/package/mac80211/patches/553-ath9k_debugfs_diag.patch

@@ -116 +116 @@
                    struct ath9k_hw_cal_data *caldata, bool fastcc)
  {
-@@ -2024,6 +2038,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
+@@ -2023,6 +2037,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
         }
  

trunk/package/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch

@@ -13 +13 @@
 --- a/drivers/net/wireless/ath/ath9k/hw.c
 +++ b/drivers/net/wireless/ath/ath9k/hw.c
-@@ -2414,17 +2414,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
+@@ -2413,17 +2413,25 @@ int ath9k_hw_fill_cap_info(struct ath_hw
         }