mt76x2: fix WMM parameter configuration

Fix hw queue configuration since mt76x2 devices use a reverse queue
enumeration respect to mac80211 one:
 - 0: AC_BE
 - 1: AC_BK
 - 2: AC_VI
 - 3: AC_VO

The issue can be reproduced sending two concurrent flow using
two separate queues:
 - VO: 20Mbps UDP traffic
 - BE: TCP traffic

In this scenario the UDP traffic will be blocked by the TCP one.
Fix it configuring properly WMM hw queue parameters

Fixes: 7bc04215a66b ("mt76: add driver code for MT76x2e")
Tested-by: Gaetano Catalli <gaetano.catalli@gmail.com>
Signed-off-by: Gaetano Catalli <gaetano.catalli@gmail.com>
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Acked-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
index 0a3f729..fd1ec47 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_dma.c
@@ -55,6 +55,7 @@ mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
 
        q->regs = dev->mt76.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
        q->ndesc = n_desc;
+       q->hw_idx = idx;
 
        ret = mt76_queue_alloc(dev, q);
        if (ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_main.c b/drivers/net/wireless/mediatek/mt76/mt76x2_main.c
index 79915cb..fa70e6d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_main.c
@@ -380,9 +380,11 @@ mt76x2_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
               const struct ieee80211_tx_queue_params *params)
 {
        struct mt76x2_dev *dev = hw->priv;
-       u8 cw_min = 5, cw_max = 10;
+       u8 cw_min = 5, cw_max = 10, qid;
        u32 val;
 
+       qid = dev->mt76.q_tx[queue].hw_idx;
+
        if (params->cw_min)
                cw_min = fls(params->cw_min);
        if (params->cw_max)
@@ -392,26 +394,26 @@ mt76x2_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
              FIELD_PREP(MT_EDCA_CFG_AIFSN, params->aifs) |
              FIELD_PREP(MT_EDCA_CFG_CWMIN, cw_min) |
              FIELD_PREP(MT_EDCA_CFG_CWMAX, cw_max);
-       mt76_wr(dev, MT_EDCA_CFG_AC(queue), val);
+       mt76_wr(dev, MT_EDCA_CFG_AC(qid), val);
 
-       val = mt76_rr(dev, MT_WMM_TXOP(queue));
-       val &= ~(MT_WMM_TXOP_MASK << MT_WMM_TXOP_SHIFT(queue));
-       val |= params->txop << MT_WMM_TXOP_SHIFT(queue);
-       mt76_wr(dev, MT_WMM_TXOP(queue), val);
+       val = mt76_rr(dev, MT_WMM_TXOP(qid));
+       val &= ~(MT_WMM_TXOP_MASK << MT_WMM_TXOP_SHIFT(qid));
+       val |= params->txop << MT_WMM_TXOP_SHIFT(qid);
+       mt76_wr(dev, MT_WMM_TXOP(qid), val);
 
        val = mt76_rr(dev, MT_WMM_AIFSN);
-       val &= ~(MT_WMM_AIFSN_MASK << MT_WMM_AIFSN_SHIFT(queue));
-       val |= params->aifs << MT_WMM_AIFSN_SHIFT(queue);
+       val &= ~(MT_WMM_AIFSN_MASK << MT_WMM_AIFSN_SHIFT(qid));
+       val |= params->aifs << MT_WMM_AIFSN_SHIFT(qid);
        mt76_wr(dev, MT_WMM_AIFSN, val);
 
        val = mt76_rr(dev, MT_WMM_CWMIN);
-       val &= ~(MT_WMM_CWMIN_MASK << MT_WMM_CWMIN_SHIFT(queue));
-       val |= cw_min << MT_WMM_CWMIN_SHIFT(queue);
+       val &= ~(MT_WMM_CWMIN_MASK << MT_WMM_CWMIN_SHIFT(qid));
+       val |= cw_min << MT_WMM_CWMIN_SHIFT(qid);
        mt76_wr(dev, MT_WMM_CWMIN, val);
 
        val = mt76_rr(dev, MT_WMM_CWMAX);
-       val &= ~(MT_WMM_CWMAX_MASK << MT_WMM_CWMAX_SHIFT(queue));
-       val |= cw_max << MT_WMM_CWMAX_SHIFT(queue);
+       val &= ~(MT_WMM_CWMAX_MASK << MT_WMM_CWMAX_SHIFT(qid));
+       val |= cw_max << MT_WMM_CWMAX_SHIFT(qid);
        mt76_wr(dev, MT_WMM_CWMAX, val);
 
        return 0;