[PATCH wireless-next v3 3/7] wifi: rt2800: make MCS 16 fall back to MCS 8 on devices with 3 TX chains

From: Ho Jie Feng

Date: Thu Nov 12 2026 - 12:22:47 EST


MCS 15 has worse reliability than MCS 16, since 16 and above
are 3 stream rates, and 15 is the top of the 2 stream rates.
Falling back from MCS 16 to MCS 15 does not make sense, so
make the fallback to MCS 8 on all devices with 3 TX chains,
like the Ralink driver does.

The retry chain is now MCS 16 to MCS 8, skipping 7 MCS rates
in between. Reflect that in the retry calculation code. This
also fixes the retry count on RT3883, which already used this
fallback.

Test results:
before after
TX 28.2 29.1
RX 70.4 70.2

Signed-off-by: Ho Jie Feng <hjf3108@xxxxxxxxx>
---
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 10 +++++++++-
drivers/net/wireless/ralink/rt2x00/rt2x00.h | 5 +++++
drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 14 ++++++++++++--
3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 371b293bac..3be4f4cbde 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -1096,6 +1096,14 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,
*/
__set_bit(TXDONE_SUCCESS, &txdesc.flags);
txdesc.retry = ((mcs > real_mcs) ? mcs - real_mcs : 0);
+
+ /*
+ * On devices with 3 TX chains MCS16 falls back to MCS8, so a
+ * frame that was sent below MCS16 after a three stream rate
+ * skipped MCS9 to MCS15.
+ */
+ if (rt2x00_is_3t(rt2x00dev) && mcs >= 16 && real_mcs <= 8)
+ txdesc.retry -= 7;
} else {
/*
* Transmission failed. The number of retries is
@@ -6280,7 +6288,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);

- if (rt2x00_rt(rt2x00dev, RT3883)) {
+ if (rt2x00_is_3t(rt2x00dev)) {
rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_0, 0x12111008);
rt2800_register_write(rt2x00dev, TX_FBK_CFG_3S_1, 0x16151413);
}
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00.h b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
index 415ff253cb..ace06ba73d 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
@@ -1200,6 +1200,11 @@ static inline bool rt2x00_is_soc(struct rt2x00_dev *rt2x00dev)
return rt2x00_intf(rt2x00dev, RT2X00_CHIP_INTF_SOC);
}

+static inline bool rt2x00_is_3t(struct rt2x00_dev *rt2x00dev)
+{
+ return rt2x00dev->default_ant.tx_chain_num == 3;
+}
+
/* Helpers for capability flags */

static inline bool
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index 7b23da0678..7c03fd07bc 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -329,10 +329,10 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
* lowest rate was used.
*/
for (i = 0; i < retry_rates && i < IEEE80211_TX_MAX_RATES; i++) {
- tx_info->status.rates[i].idx = rate_idx - i;
+ tx_info->status.rates[i].idx = rate_idx;
tx_info->status.rates[i].flags = rate_flags;

- if (rate_idx - i == 0) {
+ if (rate_idx == 0) {
/*
* The lowest rate (index 0) was used until the
* number of max retries was reached.
@@ -340,8 +340,18 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
tx_info->status.rates[i].count = retry_rates - i;
i++;
break;
+ } else if (rate_idx == 16) {
+ /*
+ * TX_FBK_CFG_3S_0 makes MCS16 fall back to MCS8 on
+ * devices with 3 TX chains, the decrement below shifts
+ * it back to 8.
+ */
+ if (rt2x00_is_3t(rt2x00dev) &&
+ (rate_flags & IEEE80211_TX_RC_MCS))
+ rate_idx = 9;
}
tx_info->status.rates[i].count = 1;
+ rate_idx--;
}
if (i < (IEEE80211_TX_MAX_RATES - 1))
tx_info->status.rates[i].idx = -1; /* terminate */
--
2.53.0