mt76: add phy_idx to mt76_wcid

Introduce phy_idx to mt76_wcid structure instead of ext_phy.
This is a preliminary patch to add newer chipset support.

Co-developed-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Bo Jiao <bo.jiao@mediatek.com>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 4d97fa4..0e7bd4a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -1295,10 +1295,11 @@ void mt76_rx_poll_complete(struct mt76_dev *dev, enum mt76_rxq_id q,
 EXPORT_SYMBOL_GPL(mt76_rx_poll_complete);
 
 static int
-mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,
-            struct ieee80211_sta *sta, bool ext_phy)
+mt76_sta_add(struct mt76_phy *phy, struct ieee80211_vif *vif,
+            struct ieee80211_sta *sta)
 {
        struct mt76_wcid *wcid = (struct mt76_wcid *)sta->drv_priv;
+       struct mt76_dev *dev = phy->dev;
        int ret;
        int i;
 
@@ -1319,9 +1320,9 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,
        }
 
        ewma_signal_init(&wcid->rssi);
-       if (ext_phy)
+       if (phy->band_idx == MT_BAND1)
                mt76_wcid_mask_set(dev->wcid_phy_mask, wcid->idx);
-       wcid->ext_phy = ext_phy;
+       wcid->phy_idx = phy->band_idx;
        rcu_assign_pointer(dev->wcid[wcid->idx], wcid);
 
        mt76_packet_id_init(wcid);
@@ -1366,11 +1367,10 @@ int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
 {
        struct mt76_phy *phy = hw->priv;
        struct mt76_dev *dev = phy->dev;
-       bool ext_phy = phy != &dev->phy;
 
        if (old_state == IEEE80211_STA_NOTEXIST &&
            new_state == IEEE80211_STA_NONE)
-               return mt76_sta_add(dev, vif, sta, ext_phy);
+               return mt76_sta_add(phy, vif, sta);
 
        if (old_state == IEEE80211_STA_AUTH &&
            new_state == IEEE80211_STA_ASSOC &&

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index d3b793e..21eec8c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -287,8 +287,8 @@ struct mt76_wcid {
        u8 hw_key_idx2;
 
        u8 sta:1;
-       u8 ext_phy:1;
        u8 amsdu:1;
+       u8 phy_idx:2;
 
        u8 rx_check_pn;
        u8 rx_key_pn[IEEE80211_NUM_TIDS + 1][6];

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index d0a13e7..36b42dc 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -1389,7 +1389,7 @@ static bool mt7615_fill_txs(struct mt7615_dev *dev, struct mt7615_sta *sta,
                if (sta->rate_probe) {
                        struct mt7615_phy *phy = &dev->phy;
 
-                       if (sta->wcid.ext_phy && dev->mt76.phys[MT_BAND1])
+                       if (sta->wcid.phy_idx && dev->mt76.phys[MT_BAND1])
                                phy = dev->mt76.phys[MT_BAND1]->priv;
 
                        mt7615_mac_set_rates(phy, sta, NULL, sta->rates);
@@ -1432,7 +1432,7 @@ out:
                fallthrough;
        case MT_PHY_TYPE_OFDM:
                mphy = &dev->mphy;
-               if (sta->wcid.ext_phy && dev->mt76.phys[MT_BAND1])
+               if (sta->wcid.phy_idx && dev->mt76.phys[MT_BAND1])
                        mphy = dev->mt76.phys[MT_BAND1];
 
                if (mphy->chandef.chan->band == NL80211_BAND_5GHZ)
@@ -1540,7 +1540,7 @@ static void mt7615_mac_add_txs(struct mt7615_dev *dev, void *data)
        if (wcidx >= MT7615_WTBL_STA || !sta)
                goto out;
 
-       if (wcid->ext_phy && dev->mt76.phys[MT_BAND1])
+       if (wcid->phy_idx && dev->mt76.phys[MT_BAND1])
                mphy = dev->mt76.phys[MT_BAND1];
 
        if (mt7615_fill_txs(dev, msta, &info, txs_data))

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
index 28bc76c..789271a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c
@@ -224,7 +224,7 @@ static int mt7615_add_interface(struct ieee80211_hw *hw,
 
        INIT_LIST_HEAD(&mvif->sta.poll_list);
        mvif->sta.wcid.idx = idx;
-       mvif->sta.wcid.ext_phy = mvif->mt76.band_idx;
+       mvif->sta.wcid.phy_idx = mvif->mt76.band_idx;
        mvif->sta.wcid.hw_key_idx = -1;
        mt76_packet_id_init(&mvif->sta.wcid);
 
@@ -629,7 +629,7 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        msta->vif = mvif;
        msta->wcid.sta = 1;
        msta->wcid.idx = idx;
-       msta->wcid.ext_phy = mvif->mt76.band_idx;
+       msta->wcid.phy_idx = mvif->mt76.band_idx;
 
        phy = mvif->mt76.band_idx ? mt7615_ext_phy(dev) : &dev->phy;
        err = mt76_connac_pm_wake(phy->mt76, &dev->pm);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
index fb22fff..f1d51b5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c
@@ -597,7 +597,7 @@ bool mt76_connac2_mac_add_txs_skb(struct mt76_dev *dev, struct mt76_wcid *wcid,
                fallthrough;
        case MT_PHY_TYPE_OFDM:
                mphy = &dev->phy;
-               if (wcid->ext_phy && dev->phys[MT_BAND1])
+               if (wcid->phy_idx == MT_BAND1 && dev->phys[MT_BAND1])
                        mphy = dev->phys[MT_BAND1];
 
                if (mphy->chandef.chan->band == NL80211_BAND_5GHZ)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
index b1a5aab..dbd5b29 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c
@@ -227,7 +227,7 @@ static int mt7915_add_interface(struct ieee80211_hw *hw,
        INIT_LIST_HEAD(&mvif->sta.rc_list);
        INIT_LIST_HEAD(&mvif->sta.poll_list);
        mvif->sta.wcid.idx = idx;
-       mvif->sta.wcid.ext_phy = ext_phy;
+       mvif->sta.wcid.phy_idx = ext_phy;
        mvif->sta.wcid.hw_key_idx = -1;
        mvif->sta.wcid.tx_info |= MT_WCID_TX_INFO_SET;
        mt76_packet_id_init(&mvif->sta.wcid);
@@ -660,7 +660,7 @@ int mt7915_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        msta->vif = mvif;
        msta->wcid.sta = 1;
        msta->wcid.idx = idx;
-       msta->wcid.ext_phy = ext_phy;
+       msta->wcid.phy_idx = ext_phy;
        msta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
        msta->jiffies = jiffies;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index 7628204..91671ea 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -336,7 +336,7 @@ static int mt7921_add_interface(struct ieee80211_hw *hw,
 
        INIT_LIST_HEAD(&mvif->sta.poll_list);
        mvif->sta.wcid.idx = idx;
-       mvif->sta.wcid.ext_phy = mvif->mt76.band_idx;
+       mvif->sta.wcid.phy_idx = mvif->mt76.band_idx;
        mvif->sta.wcid.hw_key_idx = -1;
        mvif->sta.wcid.tx_info |= MT_WCID_TX_INFO_SET;
        mt76_packet_id_init(&mvif->sta.wcid);
@@ -711,7 +711,7 @@ int mt7921_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        msta->vif = mvif;
        msta->wcid.sta = 1;
        msta->wcid.idx = idx;
-       msta->wcid.ext_phy = mvif->mt76.band_idx;
+       msta->wcid.phy_idx = mvif->mt76.band_idx;
        msta->wcid.tx_info |= MT_WCID_TX_INFO_SET;
        msta->last_txs = jiffies;