mt76: mt7603: rework and fix tx status reporting
Subsystems (2)
Felix Fietkau
maintainerPATCH 1/2 mt76: mt7603: rework and fix tx status reporting
Tx status reporting on mt7603 has a number of issues:
- the hardware can alter the first rate index, but it is not reported to the driver
- probing is very imprecise, because it alters the per-client rate set, but only considers info->status.rates for rate selection of a single probe packet
- short/long GI selection has limitations, which are not accurately reported to mac80211
- if rates are changed while packets are in flight, tx status reports for the old rate set might be processed based on the new selection
This led to very suboptimal rate selection with minstrel_ht.
This patch completely reworks tx status reporting to get rid of these limitations:
- Store the previous and current rate set in the driver + the TSF value at the time of the switch.
- Use the tx status TSF value to determine which rate set needs to be used as reference.
- Report only short or long GI rates for a single status event, not a mix.
- The hardware reports the last used rate index. Use it along with the retry count to figure out what rate was used for the first attempt.
- Use the same retry count value for all rate slots to make this calculation work.
- Derive the probe rate from the current rateset instead of the skb cb
- Do not wait for a status report for the probe frame before removing the probe rate from the rate table. Do it immediately after it was referenced in a tx status report.
- Use the first half of the first rate retry budget for the probe rate in order to avoid using too many retries on that rate
With this patch, throughput under bad link conditions is improved significantly, and there is a lot less rate fluctuation going on.
--- .../net/wireless/mediatek/mt76/mt7603/init.c | 5 +- .../net/wireless/mediatek/mt76/mt7603/mac.c | 127 +++++++++++++----- .../wireless/mediatek/mt76/mt7603/mt7603.h | 11 +- .../net/wireless/mediatek/mt76/mt7603/regs.h | 6 + 4 files changed, 108 insertions(+), 41 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +2 -3
@@ -229,9 +229,8 @@ mt7603_mac_init(struct mt7603_dev *dev)mt76_wr (dev,MT_AGG_ARUCR ,FIELD_PREP (MT_AGG_ARxCR_LIMIT (0 ),7 )); mt76_wr(dev, MT_AGG_ARDCR, - FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), 0) | - FIELD_PREP(MT_AGG_ARxCR_LIMIT(1), - max_t(int, 0, MT7603_RATE_RETRY - 2)) | + FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), MT7603_RATE_RETRY - 1) | + FIELD_PREP(MT_AGG_ARxCR_LIMIT(1), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(2), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(3), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(4), MT7603_RATE_RETRY - 1) |
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +90 -37
214 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +10 -1
@@ -51,6 +51,11 @@ enum mt7603_bw { MT_BW_80, }; +struct mt7603_rate_set { +struct ieee80211_tx_rate probe_rate; +struct ieee80211_tx_rate rates[4 ]; +}; +struct mt7603_sta {struct mt76_wcid wcid;/* must be first */
@@ -58,7 +63,11 @@ struct mt7603_sta {struct sk_buff_head psq; -struct ieee80211_tx_rate rates[8 ]; +struct ieee80211_tx_rate rates[4 ]; + +struct mt7603_rate_set rateset[2 ]; +u32 rate_set_tsf; +u8 rate_count;u8 n_rates;
drivers/net/wireless/mediatek/mt76/mt7603/regs.h +6 -0
@@ -480,6 +480,12 @@ enum {#define MT_LPON_BASE 0x24000#define MT_LPON (n) (MT_LPON_BASE + (n)) +#define MT_LPON_T0CR MT_LPON(0x010) +#define MT_LPON_T0CR_MODE GENMASK(1, 0) + +#define MT_LPON_UTTR0 MT_LPON(0x018) +#define MT_LPON_UTTR1 MT_LPON(0x01c) +#define MT_LPON_BTEIR MT_LPON(0x020)#define MT_LPON_BTEIR_MBSS_MODE GENMASK(31, 29)
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH 2/2 mt76: mt7603: improve hardware rate switching configuration
Now that tx status reporting can figure out the first attempted rate, we can make switching from lower rates to higher rates more conservative. This reduces retries under bad link conditions and ensures that fallback rates get more test coverage
--- drivers/net/wireless/mediatek/mt76/mt7603/init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +10 -1
@@ -227,7 +227,16 @@ mt7603_mac_init(struct mt7603_dev *dev)mt76_rmw_field (dev,MT_LPON_BTEIR ,MT_LPON_BTEIR_MBSS_MODE ,2 );mt76_rmw_field (dev,MT_WF_RMACDR ,MT_WF_RMACDR_MBSSID_MASK ,2 ); -mt76_wr (dev,MT_AGG_ARUCR ,FIELD_PREP (MT_AGG_ARxCR_LIMIT (0 ),7 )); +mt76_wr (dev,MT_AGG_ARUCR , +FIELD_PREP (MT_AGG_ARxCR_LIMIT (0 ),7 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (1 ),2 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (2 ),2 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (3 ),2 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (4 ),1 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (5 ),1 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (6 ),1 ) | +FIELD_PREP (MT_AGG_ARxCR_LIMIT (7 ),1 )); + mt76_wr(dev, MT_AGG_ARDCR, FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(1), MT7603_RATE_RETRY - 1) |
Signature · 1 line
2.17.0
Felix Fietkau
maintainerPATCH v2 1/2 mt76: mt7603: rework and fix tx status reporting
In reply to Felix FietkauTx status reporting on mt7603 has a number of issues:
- the hardware can alter the first rate index, but it is not reported to the driver
- probing is very imprecise, because it alters the per-client rate set, but only considers info->status.rates for rate selection of a single probe packet
- short/long GI selection has limitations, which are not accurately reported to mac80211
- if rates are changed while packets are in flight, tx status reports for the old rate set might be processed based on the new selection
This led to very suboptimal rate selection with minstrel_ht.
This patch completely reworks tx status reporting to get rid of these limitations:
- Store the previous and current rate set in the driver + the TSF value at the time of the switch.
- Use the tx status TSF value to determine which rate set needs to be used as reference.
- Report only short or long GI rates for a single status event, not a mix.
- The hardware reports the last used rate index. Use it along with the retry count to figure out what rate was used for the first attempt.
- Use the same retry count value for all rate slots to make this calculation work.
- Derive the probe rate from the current rateset instead of the skb cb
- Do not wait for a status report for the probe frame before removing the probe rate from the rate table. Do it immediately after it was referenced in a tx status report.
- Use the first half of the first rate retry budget for the probe rate in order to avoid using too many retries on that rate
With this patch, throughput under bad link conditions is improved significantly, and there is a lot less rate fluctuation going on.
---
v2: use READ_ONCE instead of ACCESS_ONCE
.../net/wireless/mediatek/mt76/mt7603/init.c | 5 +- .../net/wireless/mediatek/mt76/mt7603/mac.c | 127 +++++++++++++----- .../wireless/mediatek/mt76/mt7603/mt7603.h | 11 +- .../net/wireless/mediatek/mt76/mt7603/regs.h | 6 + 4 files changed, 108 insertions(+), 41 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +2 -3
@@ -229,9 +229,8 @@ mt7603_mac_init(struct mt7603_dev *dev)mt76_wr (dev,MT_AGG_ARUCR ,FIELD_PREP (MT_AGG_ARxCR_LIMIT (0 ),7 )); mt76_wr(dev, MT_AGG_ARDCR, - FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), 0) | - FIELD_PREP(MT_AGG_ARxCR_LIMIT(1), - max_t(int, 0, MT7603_RATE_RETRY - 2)) | + FIELD_PREP(MT_AGG_ARxCR_LIMIT(0), MT7603_RATE_RETRY - 1) | + FIELD_PREP(MT_AGG_ARxCR_LIMIT(1), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(2), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(3), MT7603_RATE_RETRY - 1) | FIELD_PREP(MT_AGG_ARxCR_LIMIT(4), MT7603_RATE_RETRY - 1) |
drivers/net/wireless/mediatek/mt76/mt7603/mac.c +90 -37
214 lines not on this page · raw message
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +10 -1
@@ -51,6 +51,11 @@ enum mt7603_bw { MT_BW_80, }; +struct mt7603_rate_set { +struct ieee80211_tx_rate probe_rate; +struct ieee80211_tx_rate rates[4 ]; +}; +struct mt7603_sta {struct mt76_wcid wcid;/* must be first */
@@ -58,7 +63,11 @@ struct mt7603_sta {struct sk_buff_head psq; -struct ieee80211_tx_rate rates[8 ]; +struct ieee80211_tx_rate rates[4 ]; + +struct mt7603_rate_set rateset[2 ]; +u32 rate_set_tsf; +u8 rate_count;u8 n_rates;
drivers/net/wireless/mediatek/mt76/mt7603/regs.h +6 -0
@@ -480,6 +480,12 @@ enum {#define MT_LPON_BASE 0x24000#define MT_LPON (n) (MT_LPON_BASE + (n)) +#define MT_LPON_T0CR MT_LPON(0x010) +#define MT_LPON_T0CR_MODE GENMASK(1, 0) + +#define MT_LPON_UTTR0 MT_LPON(0x018) +#define MT_LPON_UTTR1 MT_LPON(0x01c) +#define MT_LPON_BTEIR MT_LPON(0x020)#define MT_LPON_BTEIR_MBSS_MODE GENMASK(31, 29)
Signature · 1 line
2.17.0