mt76: fix MBSS index condition in DBDC mode

MT7915_MAX_INTERFACES is per-band declaration in MT7915/MT7986/MT7916.
Enlarge vif_mask to 64 bits wide, including the bit operation.

Reviewed-by: Shayne Chen <shayne.chen@mediatek.com>
Signed-off-by: Evelyn Tsai <evelyn.tsai@mediatek.com>
Signed-off-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 522c523d5c4164d58aa8de36faa90a81cef970ca..62131010a0bb0ba9cceea94e58f1e3d19a5b8e6b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -727,7 +727,7 @@ struct mt76_dev {
        u32 wcid_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
        u32 wcid_phy_mask[DIV_ROUND_UP(MT76_N_WCIDS, 32)];
 
-       u32 vif_mask;
+       u64 vif_mask;
 
        struct mt76_wcid global_wcid;
        struct mt76_wcid __rcu *wcid[MT76_N_WCIDS];

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index 1d098e9799ddc2feebfa5a49df7c6f3b338291ad..91425b454cae7e33277e323c84022d15324180c7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -44,7 +44,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
        mutex_lock(&dev->mt76.mutex);
 
-       mvif->idx = ffs(~dev->mt76.vif_mask) - 1;
+       mvif->idx = __ffs64(~dev->mt76.vif_mask);
        if (mvif->idx >= MT7603_MAX_INTERFACES) {
                ret = -ENOSPC;
                goto out;
@@ -65,7 +65,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        }
 
        idx = MT7603_WTBL_RESERVED - 1 - mvif->idx;
-       dev->mt76.vif_mask |= BIT(mvif->idx);
+       dev->mt76.vif_mask |= BIT_ULL(mvif->idx);
        INIT_LIST_HEAD(&mvif->sta.poll_list);
        mvif->sta.wcid.idx = idx;
        mvif->sta.wcid.hw_key_idx = -1;
@@ -106,7 +106,7 @@ mt7603_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
        spin_unlock_bh(&dev->sta_poll_lock);
 
        mutex_lock(&dev->mt76.mutex);
-       dev->mt76.vif_mask &= ~BIT(mvif->idx);
+       dev->mt76.vif_mask &= ~BIT_ULL(mvif->idx);
        mutex_unlock(&dev->mt76.mutex);
 
        mt76_packet_id_flush(&dev->mt76, &mvif->sta.wcid);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 6b8e3e7ae4a26239363ab89290e0031838d29b5f..a9c9b97d173e037d6cc48e0e2f323e9f84a4f99d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -194,7 +194,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
            is_zero_ether_addr(vif->addr))
                phy->monitor_vif = vif;
 
-       mvif->mt76.idx = ffs(~dev->mt76.vif_mask) - 1;
+       mvif->mt76.idx = __ffs64(~dev->mt76.vif_mask);
        if (mvif->mt76.idx >= MT7615_MAX_INTERFACES) {
                ret = -ENOSPC;
                goto out;
@@ -212,7 +212,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
        if (ext_phy)
                mvif->mt76.wmm_idx += 2;
 
-       dev->mt76.vif_mask |= BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask |= BIT_ULL(mvif->mt76.idx);
        dev->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
        phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
 
@@ -268,7 +268,7 @@ static void mt7615_remove_interface(struct ieee80211_hw *hw,
 
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
 
-       dev->mt76.vif_mask &= ~BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask &= ~BIT_ULL(mvif->mt76.idx);
        dev->omac_mask &= ~BIT_ULL(mvif->mt76.omac_idx);
        phy->omac_mask &= ~BIT_ULL(mvif->mt76.omac_idx);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
index be1d27de993ae0b031df40013697a060a2834043..5bd0a0bae68874b0d03c2e1934cb20a84c078cdc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c
@@ -328,11 +328,11 @@ mt76x02_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
                idx += 8;
 
        /* vif is already set or idx is 8 for AP/Mesh/... */
-       if (dev->mt76.vif_mask & BIT(idx) ||
+       if (dev->mt76.vif_mask & BIT_ULL(idx) ||
            (vif->type != NL80211_IFTYPE_STATION && idx > 7))
                return -EBUSY;
 
-       dev->mt76.vif_mask |= BIT(idx);
+       dev->mt76.vif_mask |= BIT_ULL(idx);
 
        mt76x02_vif_init(dev, vif, idx);
        return 0;
@@ -345,7 +345,7 @@ void mt76x02_remove_interface(struct ieee80211_hw *hw,
        struct mt76x02_dev *dev = hw->priv;
        struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv;
 
-       dev->mt76.vif_mask &= ~BIT(mvif->idx);
+       dev->mt76.vif_mask &= ~BIT_ULL(mvif->idx);
        rcu_assign_pointer(dev->mt76.wcid[mvif->group_wcid.idx], NULL);
        mt76_packet_id_flush(&dev->mt76, &mvif->group_wcid);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index 187cf4ccd36e1814361fbcbf3e4d626b38964044..865694c755cf2f45182338246b23f6a65ada4c75 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -204,8 +204,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
            is_zero_ether_addr(vif->addr))
                phy->monitor_vif = vif;
 
-       mvif->mt76.idx = ffs(~dev->mt76.vif_mask) - 1;
-       if (mvif->mt76.idx >= MT7915_MAX_INTERFACES) {
+       mvif->mt76.idx = __ffs64(~dev->mt76.vif_mask);
+       if (mvif->mt76.idx >= (MT7915_MAX_INTERFACES << dev->dbdc_support)) {
                ret = -ENOSPC;
                goto out;
        }
@@ -227,7 +227,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        if (ret)
                goto out;
 
-       dev->mt76.vif_mask |= BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask |= BIT_ULL(mvif->mt76.idx);
        phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
 
        idx = MT7915_WTBL_RESERVED - mvif->mt76.idx;
@@ -290,7 +290,7 @@ static void mt7915_remove_interface(struct ieee80211_hw *hw,
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
 
        mutex_lock(&dev->mt76.mutex);
-       dev->mt76.vif_mask &= ~BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask &= ~BIT_ULL(mvif->mt76.idx);
        phy->omac_mask &= ~BIT_ULL(mvif->mt76.omac_idx);
        mutex_unlock(&dev->mt76.mutex);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 2173c3e9723f31db5cc5656948d76e9bec0b2c38..775524f369117b6c0c0d4c93cd0503dd2ac2a333 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -294,7 +294,7 @@ static int mt7921_add_interface(struct ieee80211_hw *hw,
 
        mt7921_mutex_acquire(dev);
 
-       mvif->mt76.idx = ffs(~dev->mt76.vif_mask) - 1;
+       mvif->mt76.idx = __ffs64(~dev->mt76.vif_mask);
        if (mvif->mt76.idx >= MT7921_MAX_INTERFACES) {
                ret = -ENOSPC;
                goto out;
@@ -310,7 +310,7 @@ static int mt7921_add_interface(struct ieee80211_hw *hw,
        if (ret)
                goto out;
 
-       dev->mt76.vif_mask |= BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask |= BIT_ULL(mvif->mt76.idx);
        phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
 
        idx = MT7921_WTBL_RESERVED - mvif->mt76.idx;
@@ -354,7 +354,7 @@ static void mt7921_remove_interface(struct ieee80211_hw *hw,
 
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
 
-       dev->mt76.vif_mask &= ~BIT(mvif->mt76.idx);
+       dev->mt76.vif_mask &= ~BIT_ULL(mvif->mt76.idx);
        phy->omac_mask &= ~BIT_ULL(mvif->mt76.omac_idx);
        mt7921_mutex_release(dev);