wifi: mt76: remove dev->wcid_phy_mask

Explicitly check wcid->phy_idx instead. Reduces allocated data size.

Link: https://patch.msgid.link/20250102163508.52945-8-nbd@nbd.name
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 9549510057fa2ed68b0ee43e40d4f827ad233362..9173438f963e985ee298d7dad5e9861e7cb3e569 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1505,8 +1505,6 @@ mt76_sta_add(struct mt76_phy *phy, struct ieee80211_vif *vif,
        }
 
        ewma_signal_init(&wcid->rssi);
-       if (phy->band_idx == MT_BAND1)
-               mt76_wcid_mask_set(dev->wcid_phy_mask, wcid->idx);
        rcu_assign_pointer(dev->wcid[wcid->idx], wcid);
        phy->num_sta++;
 
@@ -1533,7 +1531,6 @@ void __mt76_sta_remove(struct mt76_phy *phy, struct ieee80211_vif *vif,
        mt76_wcid_cleanup(dev, wcid);
 
        mt76_wcid_mask_clear(dev->wcid_mask, idx);
-       mt76_wcid_mask_clear(dev->wcid_phy_mask, idx);
        phy->num_sta--;
 }
 EXPORT_SYMBOL_GPL(__mt76_sta_remove);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 307e6255f19934f08bce2879e4cfe3f4bb697d18..85b2f21acd703859ed93329eae52d82c7de92ba5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -909,7 +909,6 @@ struct mt76_dev {
        spinlock_t status_lock;
 
        u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
-       u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
 
        u64 vif_mask;
 
@@ -1474,7 +1473,7 @@ void __mt76_sta_remove(struct mt76_phy *phy, struct ieee80211_vif *vif,
 void mt76_sta_pre_rcu_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                             struct ieee80211_sta *sta);
 
-int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy);
+int mt76_get_min_avg_rssi(struct mt76_dev *dev, u8 phy_idx);
 
 int mt76_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                     unsigned int link_id, int *dbm);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index dafa4b05f623fa66ddd5c2c2aa5423708605843e..a259f4dd95401c6575e017cdf7f8e46d21187907 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1788,7 +1788,7 @@ mt7603_false_cca_check(struct mt7603_dev *dev)
 
        mt7603_cca_stats_reset(dev);
 
-       min_signal = mt76_get_min_avg_rssi(&dev->mt76, false);
+       min_signal = mt76_get_min_avg_rssi(&dev->mt76, 0);
        if (!min_signal) {
                dev->sensitivity = 0;
                dev->last_cca_adj = jiffies;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
index d543ef3de65bec0327cd8f9146630f2ce64d1465..ec554a0592161ca35cc756674d2bc7d19b03d4d3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/phy.c
@@ -1071,7 +1071,7 @@ mt76x0_phy_update_channel_gain(struct mt76x02_dev *dev)
        u8 gain_delta;
        int low_gain;
 
-       dev->cal.avg_rssi_all = mt76_get_min_avg_rssi(&dev->mt76, false);
+       dev->cal.avg_rssi_all = mt76_get_min_avg_rssi(&dev->mt76, 0);
        if (!dev->cal.avg_rssi_all)
                dev->cal.avg_rssi_all = -75;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
index f84517d932dccb687b2f05644267ab6d3e1b6a9c..e2b4cf30dc44f298a0ae6d71f0fa77eed2d4ae2e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/phy.c
@@ -280,7 +280,7 @@ void mt76x2_phy_update_channel_gain(struct mt76x02_dev *dev)
        int low_gain;
        u32 val;
 
-       dev->cal.avg_rssi_all = mt76_get_min_avg_rssi(&dev->mt76, false);
+       dev->cal.avg_rssi_all = mt76_get_min_avg_rssi(&dev->mt76, 0);
        if (!dev->cal.avg_rssi_all)
                dev->cal.avg_rssi_all = -75;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index 58b0aaf5f0fde62091089534a919316afc44de5f..4aec10e941780bdf8161b0d7144d30c1960dd7f4 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -1188,7 +1188,6 @@ mt7925_mac_sta_remove_links(struct mt792x_dev *dev, struct ieee80211_vif *vif,
                if (link_sta != mlink->pri_link) {
                        mt76_wcid_cleanup(mdev, wcid);
                        mt76_wcid_mask_clear(mdev->wcid_mask, wcid->idx);
-                       mt76_wcid_mask_clear(mdev->wcid_phy_mask, wcid->idx);
                }
 
                if (msta->deflink_id == link_id)

diff --git a/drivers/net/wireless/mediatek/mt76/util.c b/drivers/net/wireless/mediatek/mt76/util.c
index d6c01a2dd1988c5a9ef50bc96ceb0e30b453302d..95b3dc96e4c45c53c35fc4bcb1305b54bd05e0c5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/util.c
+++ b/drivers/net/wireless/mediatek/mt76/util.c
@@ -64,7 +64,7 @@ int mt76_wcid_alloc(u32 *mask, int size)
 }
 EXPORT_SYMBOL_GPL(mt76_wcid_alloc);
 
-int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy)
+int mt76_get_min_avg_rssi(struct mt76_dev *dev, u8 phy_idx)
 {
        struct mt76_wcid *wcid;
        int i, j, min_rssi = 0;
@@ -75,20 +75,16 @@ int mt76_get_min_avg_rssi(struct mt76_dev *dev, bool ext_phy)
 
        for (i = 0; i < ARRAY_SIZE(dev->wcid_mask); i++) {
                u32 mask = dev->wcid_mask[i];
-               u32 phy_mask = dev->wcid_phy_mask[i];
 
                if (!mask)
                        continue;
 
-               for (j = i * 32; mask; j++, mask >>= 1, phy_mask >>= 1) {
+               for (j = i * 32; mask; j++, mask >>= 1) {
                        if (!(mask & 1))
                                continue;
 
-                       if (!!(phy_mask & 1) != ext_phy)
-                               continue;
-
                        wcid = rcu_dereference(dev->wcid[j]);
-                       if (!wcid)
+                       if (!wcid || wcid->phy_idx != phy_idx)
                                continue;
 
                        spin_lock(&dev->rx_lock);