package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch

   1 --- a/include/net/mac80211.h
   2 +++ b/include/net/mac80211.h
   3 @@ -706,6 +706,9 @@ enum mac80211_rx_flags {
   4   * @signal: signal strength when receiving this frame, either in dBm, in dB or
   5   *     unspecified depending on the hardware capabilities flags
   6   *     @IEEE80211_HW_SIGNAL_*
   7 + * @chains: bitmask of receive chains for which separate signal strength
   8 + *     values were filled.
   9 + * @chain_signal: per-chain signal strength, same format as @signal
  10   * @antenna: antenna used
  11   * @rate_idx: index of data rate into band's supported rates or MCS index if
  12   *     HT rates are use (RX_FLAG_HT)
  13 @@ -722,6 +725,9 @@ struct ieee80211_rx_status {
  14         u8 band;
  15         u8 antenna;
  16         s8 signal;
  17 +
  18 +       u8 chains;
  19 +       s8 chain_signal[4];
  20  };
  21
  22  /**
  23 --- a/net/mac80211/sta_info.h
  24 +++ b/net/mac80211/sta_info.h
  25 @@ -325,6 +325,11 @@ struct sta_info {
  26         unsigned long rx_dropped;
  27         int last_signal;
  28         struct ewma avg_signal;
  29 +
  30 +       u8 chains;
  31 +       s8 chain_signal_last[4];
  32 +       struct ewma chain_signal_avg[4];
  33 +
  34         /* Plus 1 for non-QoS frames */
  35         __le16 last_seq_ctrl[NUM_RX_DATA_QUEUES + 1];
  36
  37 --- a/net/mac80211/rx.c
  38 +++ b/net/mac80211/rx.c
  39 @@ -1231,6 +1231,7 @@ ieee80211_rx_h_sta_process(struct ieee80
  40         struct sk_buff *skb = rx->skb;
  41         struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  42         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
  43 +       int i;
  44
  45         if (!sta)
  46                 return RX_CONTINUE;
  47 @@ -1275,6 +1276,19 @@ ieee80211_rx_h_sta_process(struct ieee80
  48                 ewma_add(&sta->avg_signal, -status->signal);
  49         }
  50
  51 +       if (status->chains) {
  52 +               sta->chains = status->chains;
  53 +               for (i = 0; i < 4; i++) {
  54 +                       int signal = status->chain_signal[i];
  55 +
  56 +                       if (!(status->chains & BIT(i)))
  57 +                               continue;
  58 +
  59 +                       sta->chain_signal_last[i] = signal;
  60 +                       ewma_add(&sta->chain_signal_avg[i], -signal);
  61 +               }
  62 +       }
  63 +
  64         /*
  65          * Change STA power saving mode only at the end of a frame
  66          * exchange sequence.
  67 --- a/net/mac80211/sta_info.c
  68 +++ b/net/mac80211/sta_info.c
  69 @@ -254,6 +254,8 @@ struct sta_info *sta_info_alloc(struct i
  70         do_posix_clock_monotonic_gettime(&uptime);
  71         sta->last_connected = uptime.tv_sec;
  72         ewma_init(&sta->avg_signal, 1024, 8);
  73 +       for (i = 0; i < ARRAY_SIZE(sta->chain_signal_avg); i++)
  74 +               ewma_init(&sta->chain_signal_avg[i], 1024, 8);
  75
  76         if (sta_prepare_rate_control(local, sta, gfp)) {
  77                 kfree(sta);
  78 --- a/include/net/cfg80211.h
  79 +++ b/include/net/cfg80211.h
  80 @@ -546,6 +546,8 @@ struct station_parameters {
  81   * @STATION_INFO_STA_FLAGS: @sta_flags filled
  82   * @STATION_INFO_BEACON_LOSS_COUNT: @beacon_loss_count filled
  83   * @STATION_INFO_T_OFFSET: @t_offset filled
  84 + * @STATION_INFO_CHAIN_SIGNAL: @chain_signal filled
  85 + * @STATION_INFO_CHAIN_SIGNAL_AVG: @chain_signal_avg filled
  86   */
  87  enum station_info_flags {
  88         STATION_INFO_INACTIVE_TIME      = 1<<0,
  89 @@ -569,6 +571,8 @@ enum station_info_flags {
  90         STATION_INFO_STA_FLAGS          = 1<<18,
  91         STATION_INFO_BEACON_LOSS_COUNT  = 1<<19,
  92         STATION_INFO_T_OFFSET           = 1<<20,
  93 +       STATION_INFO_CHAIN_SIGNAL       = 1<<21,
  94 +       STATION_INFO_CHAIN_SIGNAL_AVG   = 1<<22,
  95  };
  96
  97  /**
  98 @@ -652,6 +656,9 @@ struct sta_bss_parameters {
  99   *     For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
 100   * @signal_avg: Average signal strength, type depends on the wiphy's signal_type.
 101   *     For CFG80211_SIGNAL_TYPE_MBM, value is expressed in _dBm_.
 102 + * @chains: bitmask for filled values in @chain_signal, @chain_signal_avg
 103 + * @chain_signal: per-chain signal strength of last received packet in dBm
 104 + * @chain_signal_avg: per-chain signal strength average in dBm
 105   * @txrate: current unicast bitrate from this station
 106   * @rxrate: current unicast bitrate to this station
 107   * @rx_packets: packets received from this station
 108 @@ -684,6 +691,11 @@ struct station_info {
 109         u8 plink_state;
 110         s8 signal;
 111         s8 signal_avg;
 112 +
 113 +       u8 chains;
 114 +       s8 chain_signal[4];
 115 +       s8 chain_signal_avg[4];
 116 +
 117         struct rate_info txrate;
 118         struct rate_info rxrate;
 119         u32 rx_packets;
 120 --- a/drivers/net/wireless/ath/ath9k/mac.h
 121 +++ b/drivers/net/wireless/ath/ath9k/mac.h
 122 @@ -133,12 +133,8 @@ struct ath_rx_status {
 123         u8 rs_rate;
 124         u8 rs_antenna;
 125         u8 rs_more;
 126 -       int8_t rs_rssi_ctl0;
 127 -       int8_t rs_rssi_ctl1;
 128 -       int8_t rs_rssi_ctl2;
 129 -       int8_t rs_rssi_ext0;
 130 -       int8_t rs_rssi_ext1;
 131 -       int8_t rs_rssi_ext2;
 132 +       int8_t rs_rssi_ctl[3];
 133 +       int8_t rs_rssi_ext[3];
 134         u8 rs_isaggr;
 135         u8 rs_moreaggr;
 136         u8 rs_num_delims;
 137 --- a/drivers/net/wireless/ath/ath9k/recv.c
 138 +++ b/drivers/net/wireless/ath/ath9k/recv.c
 139 @@ -955,6 +955,7 @@ static int ath9k_rx_skb_preprocess(struc
 140                                    bool *decrypt_error)
 141  {
 142         struct ath_hw *ah = common->ah;
 143 +       int i, j;
 144
 145         /*
 146          * everything but the rate is checked here, the rate check is done
 147 @@ -980,6 +981,20 @@ static int ath9k_rx_skb_preprocess(struc
 148         if (rx_stats->rs_moreaggr)
 149                 rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
 150
 151 +       for (i = 0, j = 0; i < ARRAY_SIZE(rx_stats->rs_rssi_ctl); i++) {
 152 +               s8 rssi;
 153 +
 154 +               if (!(ah->rxchainmask & BIT(i)))
 155 +                       continue;
 156 +
 157 +               rssi = rx_stats->rs_rssi_ctl[i];
 158 +               if (rssi != ATH9K_RSSI_BAD) {
 159 +                   rx_status->chains |= BIT(j);
 160 +                   rx_status->chain_signal[j] = ah->noise + rssi;
 161 +               }
 162 +               j++;
 163 +       }
 164 +
 165         return 0;
 166  }
 167
 168 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 169 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
 170 @@ -458,12 +458,12 @@ int ath9k_hw_process_rxdesc_edma(struct
 171
 172         /* XXX: Keycache */
 173         rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);
 174 -       rxs->rs_rssi_ctl0 = MS(rxsp->status1, AR_RxRSSIAnt00);
 175 -       rxs->rs_rssi_ctl1 = MS(rxsp->status1, AR_RxRSSIAnt01);
 176 -       rxs->rs_rssi_ctl2 = MS(rxsp->status1, AR_RxRSSIAnt02);
 177 -       rxs->rs_rssi_ext0 = MS(rxsp->status5, AR_RxRSSIAnt10);
 178 -       rxs->rs_rssi_ext1 = MS(rxsp->status5, AR_RxRSSIAnt11);
 179 -       rxs->rs_rssi_ext2 = MS(rxsp->status5, AR_RxRSSIAnt12);
 180 +       rxs->rs_rssi_ctl[0] = MS(rxsp->status1, AR_RxRSSIAnt00);
 181 +       rxs->rs_rssi_ctl[1] = MS(rxsp->status1, AR_RxRSSIAnt01);
 182 +       rxs->rs_rssi_ctl[2] = MS(rxsp->status1, AR_RxRSSIAnt02);
 183 +       rxs->rs_rssi_ext[0] = MS(rxsp->status5, AR_RxRSSIAnt10);
 184 +       rxs->rs_rssi_ext[1] = MS(rxsp->status5, AR_RxRSSIAnt11);
 185 +       rxs->rs_rssi_ext[2] = MS(rxsp->status5, AR_RxRSSIAnt12);
 186
 187         if (rxsp->status11 & AR_RxKeyIdxValid)
 188                 rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
 189 --- a/drivers/net/wireless/ath/ath9k/mac.c
 190 +++ b/drivers/net/wireless/ath/ath9k/mac.c
 191 @@ -553,25 +553,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
 192
 193         if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {
 194                 rs->rs_rssi = ATH9K_RSSI_BAD;
 195 -               rs->rs_rssi_ctl0 = ATH9K_RSSI_BAD;
 196 -               rs->rs_rssi_ctl1 = ATH9K_RSSI_BAD;
 197 -               rs->rs_rssi_ctl2 = ATH9K_RSSI_BAD;
 198 -               rs->rs_rssi_ext0 = ATH9K_RSSI_BAD;
 199 -               rs->rs_rssi_ext1 = ATH9K_RSSI_BAD;
 200 -               rs->rs_rssi_ext2 = ATH9K_RSSI_BAD;
 201 +               rs->rs_rssi_ctl[0] = ATH9K_RSSI_BAD;
 202 +               rs->rs_rssi_ctl[1] = ATH9K_RSSI_BAD;
 203 +               rs->rs_rssi_ctl[2] = ATH9K_RSSI_BAD;
 204 +               rs->rs_rssi_ext[0] = ATH9K_RSSI_BAD;
 205 +               rs->rs_rssi_ext[1] = ATH9K_RSSI_BAD;
 206 +               rs->rs_rssi_ext[2] = ATH9K_RSSI_BAD;
 207         } else {
 208                 rs->rs_rssi = MS(ads.ds_rxstatus4, AR_RxRSSICombined);
 209 -               rs->rs_rssi_ctl0 = MS(ads.ds_rxstatus0,
 210 +               rs->rs_rssi_ctl[0] = MS(ads.ds_rxstatus0,
 211                                                 AR_RxRSSIAnt00);
 212 -               rs->rs_rssi_ctl1 = MS(ads.ds_rxstatus0,
 213 +               rs->rs_rssi_ctl[1] = MS(ads.ds_rxstatus0,
 214                                                 AR_RxRSSIAnt01);
 215 -               rs->rs_rssi_ctl2 = MS(ads.ds_rxstatus0,
 216 +               rs->rs_rssi_ctl[2] = MS(ads.ds_rxstatus0,
 217                                                 AR_RxRSSIAnt02);
 218 -               rs->rs_rssi_ext0 = MS(ads.ds_rxstatus4,
 219 +               rs->rs_rssi_ext[0] = MS(ads.ds_rxstatus4,
 220                                                 AR_RxRSSIAnt10);
 221 -               rs->rs_rssi_ext1 = MS(ads.ds_rxstatus4,
 222 +               rs->rs_rssi_ext[1] = MS(ads.ds_rxstatus4,
 223                                                 AR_RxRSSIAnt11);
 224 -               rs->rs_rssi_ext2 = MS(ads.ds_rxstatus4,
 225 +               rs->rs_rssi_ext[2] = MS(ads.ds_rxstatus4,
 226                                                 AR_RxRSSIAnt12);
 227         }
 228         if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
 229 --- a/drivers/net/wireless/ath/ath9k/debug.c
 230 +++ b/drivers/net/wireless/ath/ath9k/debug.c
 231 @@ -997,12 +997,12 @@ void ath_debug_stat_rx(struct ath_softc
 232  #ifdef CONFIG_ATH9K_MAC_DEBUG
 233         spin_lock(&sc->debug.samp_lock);
 234         RX_SAMP_DBG(jiffies) = jiffies;
 235 -       RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl0;
 236 -       RX_SAMP_DBG(rssi_ctl1) = rs->rs_rssi_ctl1;
 237 -       RX_SAMP_DBG(rssi_ctl2) = rs->rs_rssi_ctl2;
 238 -       RX_SAMP_DBG(rssi_ext0) = rs->rs_rssi_ext0;
 239 -       RX_SAMP_DBG(rssi_ext1) = rs->rs_rssi_ext1;
 240 -       RX_SAMP_DBG(rssi_ext2) = rs->rs_rssi_ext2;
 241 +       RX_SAMP_DBG(rssi_ctl0) = rs->rs_rssi_ctl[0];
 242 +       RX_SAMP_DBG(rssi_ctl1) = rs->rs_rssi_ctl[1];
 243 +       RX_SAMP_DBG(rssi_ctl2) = rs->rs_rssi_ctl[2];
 244 +       RX_SAMP_DBG(rssi_ext0) = rs->rs_rssi_ext[0];
 245 +       RX_SAMP_DBG(rssi_ext1) = rs->rs_rssi_ext[1];
 246 +       RX_SAMP_DBG(rssi_ext2) = rs->rs_rssi_ext[2];
 247         RX_SAMP_DBG(antenna) = rs->rs_antenna;
 248         RX_SAMP_DBG(rssi) = rs->rs_rssi;
 249         RX_SAMP_DBG(rate) = rs->rs_rate;
 250 --- a/include/linux/nl80211.h
 251 +++ b/include/linux/nl80211.h
 252 @@ -1734,6 +1734,8 @@ enum nl80211_sta_bss_param {
 253   * @NL80211_STA_INFO_STA_FLAGS: Contains a struct nl80211_sta_flag_update.
 254   * @NL80211_STA_INFO_BEACON_LOSS: count of times beacon loss was detected (u32)
 255   * @NL80211_STA_INFO_T_OFFSET: timing offset with respect to this STA (s64)
 256 + * @NL80211_STA_INFO_CHAIN_SIGNAL: per-chain signal strength of last PPDU
 257 + * @NL80211_STA_INFO_CHAIN_SIGNAL_AVG: per-chain signal strength average
 258   * @__NL80211_STA_INFO_AFTER_LAST: internal
 259   * @NL80211_STA_INFO_MAX: highest possible station info attribute
 260   */
 261 @@ -1758,6 +1760,8 @@ enum nl80211_sta_info {
 262         NL80211_STA_INFO_STA_FLAGS,
 263         NL80211_STA_INFO_BEACON_LOSS,
 264         NL80211_STA_INFO_T_OFFSET,
 265 +       NL80211_STA_INFO_CHAIN_SIGNAL,
 266 +       NL80211_STA_INFO_CHAIN_SIGNAL_AVG,
 267
 268         /* keep last */
 269         __NL80211_STA_INFO_AFTER_LAST,
 270 --- a/net/wireless/nl80211.c
 271 +++ b/net/wireless/nl80211.c
 272 @@ -2745,6 +2745,32 @@ nla_put_failure:
 273         return false;
 274  }
 275
 276 +static bool nl80211_put_signal(struct sk_buff *msg, u8 mask, s8 *signal,
 277 +                              int id)
 278 +{
 279 +       void *attr;
 280 +       int i = 0;
 281 +
 282 +       if (!mask)
 283 +               return true;
 284 +
 285 +       attr = nla_nest_start(msg, id);
 286 +       if (!attr)
 287 +               return false;
 288 +
 289 +       for (i = 0; i < 4; i++) {
 290 +               if (!(mask & BIT(i)))
 291 +                       continue;
 292 +
 293 +               if (nla_put_u8(msg, i, signal[i]))
 294 +                       return false;
 295 +       }
 296 +
 297 +       nla_nest_end(msg, attr);
 298 +
 299 +       return true;
 300 +}
 301 +
 302  static int nl80211_send_station(struct sk_buff *msg, u32 pid, u32 seq,
 303                                 int flags,
 304                                 struct cfg80211_registered_device *rdev,
 305 @@ -2806,6 +2832,18 @@ static int nl80211_send_station(struct s
 306         default:
 307                 break;
 308         }
 309 +       if (sinfo->filled & STATION_INFO_CHAIN_SIGNAL) {
 310 +               if (!nl80211_put_signal(msg, sinfo->chains,
 311 +                                       sinfo->chain_signal,
 312 +                                       NL80211_STA_INFO_CHAIN_SIGNAL))
 313 +                       goto nla_put_failure;
 314 +       }
 315 +       if (sinfo->filled & STATION_INFO_CHAIN_SIGNAL_AVG) {
 316 +               if (!nl80211_put_signal(msg, sinfo->chains,
 317 +                                       sinfo->chain_signal_avg,
 318 +                                       NL80211_STA_INFO_CHAIN_SIGNAL_AVG))
 319 +                       goto nla_put_failure;
 320 +       }
 321         if (sinfo->filled & STATION_INFO_TX_BITRATE) {
 322                 if (!nl80211_put_sta_rate(msg, &sinfo->txrate,
 323                                           NL80211_STA_INFO_TX_BITRATE))
 324 --- a/net/mac80211/cfg.c
 325 +++ b/net/mac80211/cfg.c
 326 @@ -355,6 +355,7 @@ static void sta_set_sinfo(struct sta_inf
 327         struct ieee80211_sub_if_data *sdata = sta->sdata;
 328         struct ieee80211_local *local = sdata->local;
 329         struct timespec uptime;
 330 +       int i;
 331
 332         sinfo->generation = sdata->local->sta_generation;
 333
 334 @@ -394,6 +395,17 @@ static void sta_set_sinfo(struct sta_inf
 335                         sinfo->signal = (s8)sta->last_signal;
 336                 sinfo->signal_avg = (s8) -ewma_read(&sta->avg_signal);
 337         }
 338 +       if (sta->chains) {
 339 +               sinfo->filled |= STATION_INFO_CHAIN_SIGNAL |
 340 +                                STATION_INFO_CHAIN_SIGNAL_AVG;
 341 +
 342 +               sinfo->chains = sta->chains;
 343 +               for (i = 0; i < ARRAY_SIZE(sinfo->chain_signal); i++) {
 344 +                       sinfo->chain_signal[i] = sta->chain_signal_last[i];
 345 +                       sinfo->chain_signal_avg[i] =
 346 +                               (s8) -ewma_read(&sta->chain_signal_avg[i]);
 347 +               }
 348 +       }
 349
 350         sta_set_rate_info_tx(sta, &sta->last_tx_rate, &sinfo->txrate);
 351
 352 --- a/drivers/net/wireless/ath/ath9k/dfs.c
 353 +++ b/drivers/net/wireless/ath/ath9k/dfs.c
 354 @@ -164,8 +164,8 @@ void ath9k_dfs_process_phyerr(struct ath
 355                 return;
 356         }
 357
 358 -       ard.rssi = rs->rs_rssi_ctl0;
 359 -       ard.ext_rssi = rs->rs_rssi_ext0;
 360 +       ard.rssi = rs->rs_rssi_ctl[0];
 361 +       ard.ext_rssi = rs->rs_rssi_ext[0];
 362
 363         /*
 364          * hardware stores this as 8 bit signed value.
 365 --- a/drivers/net/wireless/ath/ath9k/antenna.c
 366 +++ b/drivers/net/wireless/ath/ath9k/antenna.c
 367 @@ -529,14 +529,14 @@ void ath_ant_comb_scan(struct ath_softc
 368         struct ath_ant_comb *antcomb = &sc->ant_comb;
 369         int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
 370         int curr_main_set;
 371 -       int main_rssi = rs->rs_rssi_ctl0;
 372 -       int alt_rssi = rs->rs_rssi_ctl1;
 373 +       int main_rssi = rs->rs_rssi_ctl[0];
 374 +       int alt_rssi = rs->rs_rssi_ctl[1];
 375         int rx_ant_conf,  main_ant_conf;
 376         bool short_scan = false;
 377
 378 -       rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
 379 +       rx_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_CURRENT_SHIFT) &
 380                        ATH_ANT_RX_MASK;
 381 -       main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
 382 +       main_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_MAIN_SHIFT) &
 383                          ATH_ANT_RX_MASK;
 384
 385         /* Record packet only when both main_rssi and  alt_rssi is positive */