* [PATCH 1/4] mt76: mt7615: fix using VHT STBC rates
@ 2019-07-12 6:20 Felix Fietkau
2019-07-12 6:20 ` [PATCH 2/4] mt76: mt7615: fix PS buffering of action frames Felix Fietkau
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Felix Fietkau @ 2019-07-12 6:20 UTC (permalink / raw)
To: linux-wireless
The hardware expects MT_TX_RATE_NSS to be filled with the number of
space/time streams. For non-STBC rates, this is equal to nss.
For 1-stream STBC, this needs to be set to 2.
This is relevant for VHT rates only, on HT, the value is derived from MCS
internally.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
.../net/wireless/mediatek/mt76/mt7615/mac.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 5bfb4594b8ee..6c21b2df69c4 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -254,7 +254,7 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev,
bool stbc, u8 *bw)
{
u8 phy, nss, rate_idx;
- u16 rateval;
+ u16 rateval = 0;
*bw = 0;
@@ -292,12 +292,14 @@ mt7615_mac_tx_rate_val(struct mt7615_dev *dev,
rate_idx = val & 0xff;
}
- rateval = (FIELD_PREP(MT_TX_RATE_IDX, rate_idx) |
- FIELD_PREP(MT_TX_RATE_MODE, phy) |
- FIELD_PREP(MT_TX_RATE_NSS, nss - 1));
-
- if (stbc && nss == 1)
+ if (stbc && nss == 1) {
+ nss++;
rateval |= MT_TX_RATE_STBC;
+ }
+
+ rateval |= (FIELD_PREP(MT_TX_RATE_IDX, rate_idx) |
+ FIELD_PREP(MT_TX_RATE_MODE, phy) |
+ FIELD_PREP(MT_TX_RATE_NSS, nss - 1));
return rateval;
}
@@ -771,6 +773,10 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,
break;
case MT_PHY_TYPE_VHT:
final_nss = FIELD_GET(MT_TX_RATE_NSS, final_rate);
+
+ if ((final_rate & MT_TX_RATE_STBC) && final_nss)
+ final_nss--;
+
final_rate_flags |= IEEE80211_TX_RC_VHT_MCS;
final_rate = (final_rate & MT_TX_RATE_IDX) | (final_nss << 4);
break;
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/4] mt76: mt7615: fix PS buffering of action frames
2019-07-12 6:20 [PATCH 1/4] mt76: mt7615: fix using VHT STBC rates Felix Fietkau
@ 2019-07-12 6:20 ` Felix Fietkau
2019-07-12 6:20 ` [PATCH 3/4] mt76: mt7615: fix invalid fallback rates Felix Fietkau
2019-07-12 6:20 ` [PATCH 4/4] mt76: mt7603: " Felix Fietkau
2 siblings, 0 replies; 4+ messages in thread
From: Felix Fietkau @ 2019-07-12 6:20 UTC (permalink / raw)
To: linux-wireless
Bufferable management frames need to be put in the data queue, otherwise
they will not be buffered when the receiver is asleep.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 6c21b2df69c4..fc98dabed594 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -334,7 +334,7 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi,
fc_type = (le16_to_cpu(fc) & IEEE80211_FCTL_FTYPE) >> 2;
fc_stype = (le16_to_cpu(fc) & IEEE80211_FCTL_STYPE) >> 4;
- if (ieee80211_is_data(fc)) {
+ if (ieee80211_is_data(fc) || ieee80211_is_bufferable_mmpdu(fc)) {
q_idx = skb_get_queue_mapping(skb);
p_fmt = MT_TX_TYPE_CT;
} else if (ieee80211_is_beacon(fc)) {
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/4] mt76: mt7615: fix invalid fallback rates
2019-07-12 6:20 [PATCH 1/4] mt76: mt7615: fix using VHT STBC rates Felix Fietkau
2019-07-12 6:20 ` [PATCH 2/4] mt76: mt7615: fix PS buffering of action frames Felix Fietkau
@ 2019-07-12 6:20 ` Felix Fietkau
2019-07-12 6:20 ` [PATCH 4/4] mt76: mt7603: " Felix Fietkau
2 siblings, 0 replies; 4+ messages in thread
From: Felix Fietkau @ 2019-07-12 6:20 UTC (permalink / raw)
To: linux-wireless
Only decrement the rate index on duplicate rates if it is not already 0
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index fc98dabed594..b3e8ee06a783 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -503,6 +503,9 @@ void mt7615_mac_set_rates(struct mt7615_dev *dev, struct mt7615_sta *sta,
IEEE80211_TX_RC_160_MHZ_WIDTH))
continue;
+ if (!rates[i].idx)
+ continue;
+
rates[i].idx--;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 4/4] mt76: mt7603: fix invalid fallback rates
2019-07-12 6:20 [PATCH 1/4] mt76: mt7615: fix using VHT STBC rates Felix Fietkau
2019-07-12 6:20 ` [PATCH 2/4] mt76: mt7615: fix PS buffering of action frames Felix Fietkau
2019-07-12 6:20 ` [PATCH 3/4] mt76: mt7615: fix invalid fallback rates Felix Fietkau
@ 2019-07-12 6:20 ` Felix Fietkau
2 siblings, 0 replies; 4+ messages in thread
From: Felix Fietkau @ 2019-07-12 6:20 UTC (permalink / raw)
To: linux-wireless
Only decrement the rate index on duplicate rates if it is not already 0
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 40db1cbc832d..81fb4276e742 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -639,6 +639,9 @@ void mt7603_wtbl_set_rates(struct mt7603_dev *dev, struct mt7603_sta *sta,
IEEE80211_TX_RC_40_MHZ_WIDTH)
continue;
+ if (!rates[i].idx)
+ continue;
+
rates[i].idx--;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-12 6:20 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-12 6:20 [PATCH 1/4] mt76: mt7615: fix using VHT STBC rates Felix Fietkau
2019-07-12 6:20 ` [PATCH 2/4] mt76: mt7615: fix PS buffering of action frames Felix Fietkau
2019-07-12 6:20 ` [PATCH 3/4] mt76: mt7615: fix invalid fallback rates Felix Fietkau
2019-07-12 6:20 ` [PATCH 4/4] mt76: mt7603: " Felix Fietkau
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).