Skip to content

Commit 67fc7a3

Browse files
derennbd168
authored andcommitted
wifi: mt76: mt7921: add ack signal support
This reports signal strength of ACK packets from the peer as measured at each interface. Reviewed-by: Ryder Lee <[email protected]> Signed-off-by: Deren Wu <[email protected]> Reviewed-by: AngeloGioacchino Del Regno <[email protected]> Signed-off-by: Felix Fietkau <[email protected]>
1 parent 914189a commit 67fc7a3

File tree

5 files changed

+45
-0
lines changed

5 files changed

+45
-0
lines changed

drivers/net/wireless/mediatek/mt76/mt7921/init.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
120120
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HT);
121121
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_VHT);
122122
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_BEACON_RATE_HE);
123+
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT);
123124

124125
ieee80211_hw_set(hw, SINGLE_SCAN_ON_ALL_BANDS);
125126
ieee80211_hw_set(hw, HAS_RATE_CONTROL);
@@ -142,6 +143,8 @@ mt7921_init_wiphy(struct ieee80211_hw *hw)
142143
static void
143144
mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
144145
{
146+
u32 mask, set;
147+
145148
mt76_rmw_field(dev, MT_TMAC_CTCR0(band),
146149
MT_TMAC_CTCR0_INS_DDLMT_REFTIME, 0x3f);
147150
mt76_set(dev, MT_TMAC_CTCR0(band),
@@ -158,6 +161,12 @@ mt7921_mac_init_band(struct mt7921_dev *dev, u8 band)
158161
mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_MAX_RX_LEN, 1536);
159162
/* disable rx rate report by default due to hw issues */
160163
mt76_clear(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN);
164+
165+
/* filter out non-resp frames and get instantaneous signal reporting */
166+
mask = MT_WTBLOFF_TOP_RSCR_RCPI_MODE | MT_WTBLOFF_TOP_RSCR_RCPI_PARAM;
167+
set = FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_MODE, 0) |
168+
FIELD_PREP(MT_WTBLOFF_TOP_RSCR_RCPI_PARAM, 0x3);
169+
mt76_rmw(dev, MT_WTBLOFF_TOP_RSCR(band), mask, set);
161170
}
162171

163172
u8 mt7921_check_offload_capability(struct device *dev, const char *fw_wm)

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ void mt7921_mac_sta_poll(struct mt7921_dev *dev)
5959
u32 tx_time[IEEE80211_NUM_ACS], rx_time[IEEE80211_NUM_ACS];
6060
LIST_HEAD(sta_poll_list);
6161
struct rate_info *rate;
62+
s8 rssi[4];
6263
int i;
6364

6465
spin_lock_bh(&dev->sta_poll_lock);
@@ -160,6 +161,20 @@ void mt7921_mac_sta_poll(struct mt7921_dev *dev)
160161
else
161162
rate->flags &= ~RATE_INFO_FLAGS_SHORT_GI;
162163
}
164+
165+
/* get signal strength of resp frames (CTS/BA/ACK) */
166+
addr = mt7921_mac_wtbl_lmac_addr(idx, 30);
167+
val = mt76_rr(dev, addr);
168+
169+
rssi[0] = to_rssi(GENMASK(7, 0), val);
170+
rssi[1] = to_rssi(GENMASK(15, 8), val);
171+
rssi[2] = to_rssi(GENMASK(23, 16), val);
172+
rssi[3] = to_rssi(GENMASK(31, 14), val);
173+
174+
msta->ack_signal =
175+
mt76_rx_signal(msta->vif->phy->mt76->antenna_mask, rssi);
176+
177+
ewma_avg_signal_add(&msta->avg_ack_signal, -msta->ack_signal);
163178
}
164179
}
165180
EXPORT_SYMBOL_GPL(mt7921_mac_sta_poll);

drivers/net/wireless/mediatek/mt76/mt7921/main.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,8 @@ void mt7921_mac_sta_assoc(struct mt76_dev *mdev, struct ieee80211_vif *vif,
855855
mt76_connac_mcu_uni_add_bss(&dev->mphy, vif, &mvif->sta.wcid,
856856
true, mvif->ctx);
857857

858+
ewma_avg_signal_init(&msta->avg_ack_signal);
859+
858860
mt7921_mac_wtbl_update(dev, msta->wcid.idx,
859861
MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
860862
memset(msta->airtime_ac, 0, sizeof(msta->airtime_ac));
@@ -1425,6 +1427,12 @@ static void mt7921_sta_statistics(struct ieee80211_hw *hw,
14251427
}
14261428
sinfo->txrate.flags = txrate->flags;
14271429
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE);
1430+
1431+
sinfo->ack_signal = (s8)msta->ack_signal;
1432+
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_ACK_SIGNAL);
1433+
1434+
sinfo->avg_ack_signal = -(s8)ewma_avg_signal_read(&msta->avg_ack_signal);
1435+
sinfo->filled |= BIT_ULL(NL80211_STA_INFO_ACK_SIGNAL_AVG);
14281436
}
14291437

14301438
#ifdef CONFIG_PM

drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ enum mt7921_rxq_id {
144144
MT7921_RXQ_MCU_WM = 0,
145145
};
146146

147+
DECLARE_EWMA(avg_signal, 10, 8)
148+
147149
struct mt7921_sta {
148150
struct mt76_wcid wcid; /* must be first */
149151

@@ -152,6 +154,9 @@ struct mt7921_sta {
152154
struct list_head poll_list;
153155
u32 airtime_ac[8];
154156

157+
int ack_signal;
158+
struct ewma_avg_signal avg_ack_signal;
159+
155160
unsigned long last_txs;
156161
unsigned long ampdu_state;
157162

drivers/net/wireless/mediatek/mt76/mt7921/regs.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,14 @@
8080
#define MT_DMA_DCR0_MAX_RX_LEN GENMASK(15, 3)
8181
#define MT_DMA_DCR0_RXD_G5_EN BIT(23)
8282

83+
/* WTBLOFF TOP: band 0(0x820e9000),band 1(0x820f9000) */
84+
#define MT_WTBLOFF_TOP_BASE(_band) ((_band) ? 0x820f9000 : 0x820e9000)
85+
#define MT_WTBLOFF_TOP(_band, ofs) (MT_WTBLOFF_TOP_BASE(_band) + (ofs))
86+
87+
#define MT_WTBLOFF_TOP_RSCR(_band) MT_WTBLOFF_TOP(_band, 0x008)
88+
#define MT_WTBLOFF_TOP_RSCR_RCPI_MODE GENMASK(31, 30)
89+
#define MT_WTBLOFF_TOP_RSCR_RCPI_PARAM GENMASK(25, 24)
90+
8391
/* LPON: band 0(0x24200), band 1(0xa4200) */
8492
#define MT_WF_LPON_BASE(_band) ((_band) ? 0x820fb000 : 0x820eb000)
8593
#define MT_WF_LPON(_band, ofs) (MT_WF_LPON_BASE(_band) + (ofs))

0 commit comments

Comments
 (0)