package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch

   1 --- a/drivers/net/wireless/ath/ath9k/mac.h
   2 +++ b/drivers/net/wireless/ath/ath9k/mac.h
   3 @@ -133,12 +133,8 @@ struct ath_rx_status {
   4         u8 rs_rate;
   5         u8 rs_antenna;
   6         u8 rs_more;
   7 -       int8_t rs_rssi_ctl0;
   8 -       int8_t rs_rssi_ctl1;
   9 -       int8_t rs_rssi_ctl2;
  10 -       int8_t rs_rssi_ext0;
  11 -       int8_t rs_rssi_ext1;
  12 -       int8_t rs_rssi_ext2;
  13 +       int8_t rs_rssi_ctl[3];
  14 +       int8_t rs_rssi_ext[3];
  15         u8 rs_isaggr;
  16         u8 rs_firstaggr;
  17         u8 rs_moreaggr;
  18 --- a/drivers/net/wireless/ath/ath9k/recv.c
  19 +++ b/drivers/net/wireless/ath/ath9k/recv.c
  20 @@ -892,6 +892,7 @@ static void ath9k_process_rssi(struct at
  21         struct ath_hw *ah = common->ah;
  22         int last_rssi;
  23         int rssi = rx_stats->rs_rssi;
  24 +       int i, j;
  25
  26         /*
  27          * RSSI is not available for subframes in an A-MPDU.
  28 @@ -910,6 +911,20 @@ static void ath9k_process_rssi(struct at
  29                 return;
  30         }
  31
  32 +       for (i = 0, j = 0; i < ARRAY_SIZE(rx_stats->rs_rssi_ctl); i++) {
  33 +               s8 rssi;
  34 +
  35 +               if (!(ah->rxchainmask & BIT(i)))
  36 +                       continue;
  37 +
  38 +               rssi = rx_stats->rs_rssi_ctl[i];
  39 +               if (rssi != ATH9K_RSSI_BAD) {
  40 +                   rxs->chains |= BIT(j);
  41 +                   rxs->chain_signal[j] = ah->noise + rssi;
  42 +               }
  43 +               j++;
  44 +       }
  45 +
  46         /*
  47          * Update Beacon RSSI, this is used by ANI.
  48          */
  49 @@ -1000,7 +1015,7 @@ static int ath_process_fft(struct ath_so
  50         fft_sample.tlv.length = __cpu_to_be16(length);
  51
  52         fft_sample.freq = __cpu_to_be16(ah->curchan->chan->center_freq);
  53 -       fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl0);
  54 +       fft_sample.rssi = fix_rssi_inv_only(rs->rs_rssi_ctl[0]);
  55         fft_sample.noise = ah->noise;
  56
  57         switch (len - SPECTRAL_HT20_TOTAL_DATA_LEN) {
  58 --- a/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  59 +++ b/drivers/net/wireless/ath/ath9k/ar9003_mac.c
  60 @@ -476,12 +476,12 @@ int ath9k_hw_process_rxdesc_edma(struct
  61
  62         /* XXX: Keycache */
  63         rxs->rs_rssi = MS(rxsp->status5, AR_RxRSSICombined);
  64 -       rxs->rs_rssi_ctl0 = MS(rxsp->status1, AR_RxRSSIAnt00);
  65 -       rxs->rs_rssi_ctl1 = MS(rxsp->status1, AR_RxRSSIAnt01);
  66 -       rxs->rs_rssi_ctl2 = MS(rxsp->status1, AR_RxRSSIAnt02);
  67 -       rxs->rs_rssi_ext0 = MS(rxsp->status5, AR_RxRSSIAnt10);
  68 -       rxs->rs_rssi_ext1 = MS(rxsp->status5, AR_RxRSSIAnt11);
  69 -       rxs->rs_rssi_ext2 = MS(rxsp->status5, AR_RxRSSIAnt12);
  70 +       rxs->rs_rssi_ctl[0] = MS(rxsp->status1, AR_RxRSSIAnt00);
  71 +       rxs->rs_rssi_ctl[1] = MS(rxsp->status1, AR_RxRSSIAnt01);
  72 +       rxs->rs_rssi_ctl[2] = MS(rxsp->status1, AR_RxRSSIAnt02);
  73 +       rxs->rs_rssi_ext[0] = MS(rxsp->status5, AR_RxRSSIAnt10);
  74 +       rxs->rs_rssi_ext[1] = MS(rxsp->status5, AR_RxRSSIAnt11);
  75 +       rxs->rs_rssi_ext[2] = MS(rxsp->status5, AR_RxRSSIAnt12);
  76
  77         if (rxsp->status11 & AR_RxKeyIdxValid)
  78                 rxs->rs_keyix = MS(rxsp->status11, AR_KeyIdx);
  79 --- a/drivers/net/wireless/ath/ath9k/mac.c
  80 +++ b/drivers/net/wireless/ath/ath9k/mac.c
  81 @@ -554,25 +554,25 @@ int ath9k_hw_rxprocdesc(struct ath_hw *a
  82
  83         if (ads.ds_rxstatus8 & AR_PostDelimCRCErr) {
  84                 rs->rs_rssi = ATH9K_RSSI_BAD;
  85 -               rs->rs_rssi_ctl0 = ATH9K_RSSI_BAD;
  86 -               rs->rs_rssi_ctl1 = ATH9K_RSSI_BAD;
  87 -               rs->rs_rssi_ctl2 = ATH9K_RSSI_BAD;
  88 -               rs->rs_rssi_ext0 = ATH9K_RSSI_BAD;
  89 -               rs->rs_rssi_ext1 = ATH9K_RSSI_BAD;
  90 -               rs->rs_rssi_ext2 = ATH9K_RSSI_BAD;
  91 +               rs->rs_rssi_ctl[0] = ATH9K_RSSI_BAD;
  92 +               rs->rs_rssi_ctl[1] = ATH9K_RSSI_BAD;
  93 +               rs->rs_rssi_ctl[2] = ATH9K_RSSI_BAD;
  94 +               rs->rs_rssi_ext[0] = ATH9K_RSSI_BAD;
  95 +               rs->rs_rssi_ext[1] = ATH9K_RSSI_BAD;
  96 +               rs->rs_rssi_ext[2] = ATH9K_RSSI_BAD;
  97         } else {
  98                 rs->rs_rssi = MS(ads.ds_rxstatus4, AR_RxRSSICombined);
  99 -               rs->rs_rssi_ctl0 = MS(ads.ds_rxstatus0,
 100 +               rs->rs_rssi_ctl[0] = MS(ads.ds_rxstatus0,
 101                                                 AR_RxRSSIAnt00);
 102 -               rs->rs_rssi_ctl1 = MS(ads.ds_rxstatus0,
 103 +               rs->rs_rssi_ctl[1] = MS(ads.ds_rxstatus0,
 104                                                 AR_RxRSSIAnt01);
 105 -               rs->rs_rssi_ctl2 = MS(ads.ds_rxstatus0,
 106 +               rs->rs_rssi_ctl[2] = MS(ads.ds_rxstatus0,
 107                                                 AR_RxRSSIAnt02);
 108 -               rs->rs_rssi_ext0 = MS(ads.ds_rxstatus4,
 109 +               rs->rs_rssi_ext[0] = MS(ads.ds_rxstatus4,
 110                                                 AR_RxRSSIAnt10);
 111 -               rs->rs_rssi_ext1 = MS(ads.ds_rxstatus4,
 112 +               rs->rs_rssi_ext[1] = MS(ads.ds_rxstatus4,
 113                                                 AR_RxRSSIAnt11);
 114 -               rs->rs_rssi_ext2 = MS(ads.ds_rxstatus4,
 115 +               rs->rs_rssi_ext[2] = MS(ads.ds_rxstatus4,
 116                                                 AR_RxRSSIAnt12);
 117         }
 118         if (ads.ds_rxstatus8 & AR_RxKeyIdxValid)
 119 --- a/drivers/net/wireless/ath/ath9k/dfs.c
 120 +++ b/drivers/net/wireless/ath/ath9k/dfs.c
 121 @@ -158,8 +158,8 @@ void ath9k_dfs_process_phyerr(struct ath
 122                 return;
 123         }
 124
 125 -       ard.rssi = rs->rs_rssi_ctl0;
 126 -       ard.ext_rssi = rs->rs_rssi_ext0;
 127 +       ard.rssi = rs->rs_rssi_ctl[0];
 128 +       ard.ext_rssi = rs->rs_rssi_ext[0];
 129
 130         /*
 131          * hardware stores this as 8 bit signed value.
 132 --- a/drivers/net/wireless/ath/ath9k/antenna.c
 133 +++ b/drivers/net/wireless/ath/ath9k/antenna.c
 134 @@ -744,14 +744,14 @@ void ath_ant_comb_scan(struct ath_softc
 135         struct ath_ant_comb *antcomb = &sc->ant_comb;
 136         int alt_ratio = 0, alt_rssi_avg = 0, main_rssi_avg = 0, curr_alt_set;
 137         int curr_main_set;
 138 -       int main_rssi = rs->rs_rssi_ctl0;
 139 -       int alt_rssi = rs->rs_rssi_ctl1;
 140 +       int main_rssi = rs->rs_rssi_ctl[0];
 141 +       int alt_rssi = rs->rs_rssi_ctl[1];
 142         int rx_ant_conf,  main_ant_conf;
 143         bool short_scan = false, ret;
 144
 145 -       rx_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_CURRENT_SHIFT) &
 146 +       rx_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_CURRENT_SHIFT) &
 147                        ATH_ANT_RX_MASK;
 148 -       main_ant_conf = (rs->rs_rssi_ctl2 >> ATH_ANT_RX_MAIN_SHIFT) &
 149 +       main_ant_conf = (rs->rs_rssi_ctl[2] >> ATH_ANT_RX_MAIN_SHIFT) &
 150                          ATH_ANT_RX_MASK;
 151
 152         if (alt_rssi >= antcomb->low_rssi_thresh) {