mt76: mt7915: fix mib stats counter reporting to mac80211

BugLink: https://bugs.launchpad.net/bugs/1929455
[ Upstream commit 2b35050a321865859fd2f12a3c18ed7be27858c9 ]

In order to properly report MIB counters to mac80211, resets stats in
mt7915_get_stats routine() and hold mt76 mutex accessing MIB counters.
Sum up MIB counters in mt7915_mac_update_mib_stats routine.

Fixes: e57b7901469f ("mt76: add mac80211 driver for MT7915 PCIe-based chipsets")
Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 8a083304ab031558d1926e69b497aebf6cf345a5..dc2b8c72e7f0cf96c069f1f3c1f21f3feb40c02a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1598,39 +1598,30 @@ mt7915_mac_update_mib_stats(struct mt7915_phy *phy)
        bool ext_phy = phy != &dev->phy;
        int i, aggr0, aggr1;
 
-       memset(mib, 0, sizeof(*mib));
-
-       mib->fcs_err_cnt = mt76_get_field(dev, MT_MIB_SDR3(ext_phy),
-                                         MT_MIB_SDR3_FCS_ERR_MASK);
+       mib->fcs_err_cnt += mt76_get_field(dev, MT_MIB_SDR3(ext_phy),
+                                          MT_MIB_SDR3_FCS_ERR_MASK);
 
        aggr0 = ext_phy ? ARRAY_SIZE(dev->mt76.aggr_stats) / 2 : 0;
        for (i = 0, aggr1 = aggr0 + 4; i < 4; i++) {
-               u32 val, val2;
+               u32 val;
 
                val = mt76_rr(dev, MT_MIB_MB_SDR1(ext_phy, i));
-
-               val2 = FIELD_GET(MT_MIB_ACK_FAIL_COUNT_MASK, val);
-               if (val2 > mib->ack_fail_cnt)
-                       mib->ack_fail_cnt = val2;
-
-               val2 = FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);
-               if (val2 > mib->ba_miss_cnt)
-                       mib->ba_miss_cnt = val2;
+               mib->ba_miss_cnt += FIELD_GET(MT_MIB_BA_MISS_COUNT_MASK, val);
+               mib->ack_fail_cnt +=
+                       FIELD_GET(MT_MIB_ACK_FAIL_COUNT_MASK, val);
 
                val = mt76_rr(dev, MT_MIB_MB_SDR0(ext_phy, i));
-               val2 = FIELD_GET(MT_MIB_RTS_RETRIES_COUNT_MASK, val);
-               if (val2 > mib->rts_retries_cnt) {
-                       mib->rts_cnt = FIELD_GET(MT_MIB_RTS_COUNT_MASK, val);
-                       mib->rts_retries_cnt = val2;
-               }
+               mib->rts_cnt += FIELD_GET(MT_MIB_RTS_COUNT_MASK, val);
+               mib->rts_retries_cnt +=
+                       FIELD_GET(MT_MIB_RTS_RETRIES_COUNT_MASK, val);
 
                val = mt76_rr(dev, MT_TX_AGG_CNT(ext_phy, i));
-               val2 = mt76_rr(dev, MT_TX_AGG_CNT2(ext_phy, i));
-
                dev->mt76.aggr_stats[aggr0++] += val & 0xffff;
                dev->mt76.aggr_stats[aggr0++] += val >> 16;
-               dev->mt76.aggr_stats[aggr1++] += val2 & 0xffff;
-               dev->mt76.aggr_stats[aggr1++] += val2 >> 16;
+
+               val = mt76_rr(dev, MT_TX_AGG_CNT2(ext_phy, i));
+               dev->mt76.aggr_stats[aggr1++] += val & 0xffff;
+               dev->mt76.aggr_stats[aggr1++] += val >> 16;
        }
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 0c82aa2ef219d20cd094517ecfc404a2a861423b..2fa511ace45c994a3668c30cf94b566b0e1bf9e0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -711,13 +711,19 @@ mt7915_get_stats(struct ieee80211_hw *hw,
                 struct ieee80211_low_level_stats *stats)
 {
        struct mt7915_phy *phy = mt7915_hw_phy(hw);
+       struct mt7915_dev *dev = mt7915_hw_dev(hw);
        struct mib_stats *mib = &phy->mib;
 
+       mutex_lock(&dev->mt76.mutex);
        stats->dot11RTSSuccessCount = mib->rts_cnt;
        stats->dot11RTSFailureCount = mib->rts_retries_cnt;
        stats->dot11FCSErrorCount = mib->fcs_err_cnt;
        stats->dot11ACKFailureCount = mib->ack_fail_cnt;
 
+       memset(mib, 0, sizeof(*mib));
+
+       mutex_unlock(&dev->mt76.mutex);
+
        return 0;
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
index 94bed8a3a050a13fd9ebbdc8b50074d0393dcde9..fe88ff24f24189af7e62be090337146680622b8c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h
@@ -100,11 +100,11 @@ struct mt7915_vif {
 };
 
 struct mib_stats {
-       u16 ack_fail_cnt;
-       u16 fcs_err_cnt;
-       u16 rts_cnt;
-       u16 rts_retries_cnt;
-       u16 ba_miss_cnt;
+       u32 ack_fail_cnt;
+       u32 fcs_err_cnt;
+       u32 rts_cnt;
+       u32 rts_retries_cnt;
+       u32 ba_miss_cnt;
 };
 
 struct mt7915_phy {