]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mt76: mt7615: fix lmac queue debugsfs entry
authorLorenzo Bianconi <lorenzo@kernel.org>
Sat, 30 May 2020 21:51:27 +0000 (23:51 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 5 Aug 2020 07:58:47 +0000 (09:58 +0200)
[ Upstream commit d941f47caa386931c3b598ad1b43d5ddd65869aa ]

acs and wmm index are swapped in mt7615_queues_acq respect to the hw
design

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/mediatek/mt76/mt7615/debugfs.c

index b4d0795154e3dcc2dfb0fd784f23dcc26ba507cf..a2afd1a3c51ba64023e1506ba94cb8dfac8b76af 100644 (file)
@@ -206,10 +206,11 @@ mt7615_queues_acq(struct seq_file *s, void *data)
        int i;
 
        for (i = 0; i < 16; i++) {
-               int j, acs = i / 4, index = i % 4;
+               int j, wmm_idx = i % MT7615_MAX_WMM_SETS;
+               int acs = i / MT7615_MAX_WMM_SETS;
                u32 ctrl, val, qlen = 0;
 
-               val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, index));
+               val = mt76_rr(dev, MT_PLE_AC_QEMPTY(acs, wmm_idx));
                ctrl = BIT(31) | BIT(15) | (acs << 8);
 
                for (j = 0; j < 32; j++) {
@@ -217,11 +218,11 @@ mt7615_queues_acq(struct seq_file *s, void *data)
                                continue;
 
                        mt76_wr(dev, MT_PLE_FL_Q0_CTRL,
-                               ctrl | (j + (index << 5)));
+                               ctrl | (j + (wmm_idx << 5)));
                        qlen += mt76_get_field(dev, MT_PLE_FL_Q3_CTRL,
                                               GENMASK(11, 0));
                }
-               seq_printf(s, "AC%d%d: queued=%d\n", acs, index, qlen);
+               seq_printf(s, "AC%d%d: queued=%d\n", wmm_idx, acs, qlen);
        }
 
        return 0;