wifi: mt76: mt7925: extend mt7925_mcu_[abort, set]_roc for per-link BSS

The channel context has to be bound with the per-link BSS, thus,
we extend mt7925_mcu_[abort, set]_roc to work with the per-link BSS
configuration.

The patch we created is a prerequisite to enable the MLO function in the
driver. It is purely a refactoring patch so the functionality should
remain unchanged.

Co-developed-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Link: https://patch.msgid.link/20240613030241.5771-20-sean.wang@kernel.org
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
index aeed2c777a20981f5da881f135b61129605484b3..bba17e51a0235008f5ec6b071731f26a8c3b8391 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c
@@ -387,7 +387,7 @@ static void mt7925_roc_iter(void *priv, u8 *mac,
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        struct mt792x_phy *phy = priv;
 
-       mt7925_mcu_abort_roc(phy, mvif, phy->roc_token_id);
+       mt7925_mcu_abort_roc(phy, &mvif->bss_conf, phy->roc_token_id);
 }
 
 void mt7925_roc_work(struct work_struct *work)
@@ -408,7 +408,8 @@ void mt7925_roc_work(struct work_struct *work)
        ieee80211_remain_on_channel_expired(phy->mt76->hw);
 }
 
-static int mt7925_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif)
+static int mt7925_abort_roc(struct mt792x_phy *phy,
+                           struct mt792x_bss_conf *mconf)
 {
        int err = 0;
 
@@ -417,14 +418,14 @@ static int mt7925_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif)
 
        mt792x_mutex_acquire(phy->dev);
        if (test_and_clear_bit(MT76_STATE_ROC, &phy->mt76->state))
-               err = mt7925_mcu_abort_roc(phy, vif, phy->roc_token_id);
+               err = mt7925_mcu_abort_roc(phy, mconf, phy->roc_token_id);
        mt792x_mutex_release(phy->dev);
 
        return err;
 }
 
 static int mt7925_set_roc(struct mt792x_phy *phy,
-                         struct mt792x_vif *vif,
+                         struct mt792x_bss_conf *mconf,
                          struct ieee80211_channel *chan,
                          int duration,
                          enum mt7925_roc_req type)
@@ -436,7 +437,7 @@ static int mt7925_set_roc(struct mt792x_phy *phy,
 
        phy->roc_grant = false;
 
-       err = mt7925_mcu_set_roc(phy, vif, chan, duration, type,
+       err = mt7925_mcu_set_roc(phy, mconf, chan, duration, type,
                                 ++phy->roc_token_id);
        if (err < 0) {
                clear_bit(MT76_STATE_ROC, &phy->mt76->state);
@@ -444,7 +445,7 @@ static int mt7925_set_roc(struct mt792x_phy *phy,
        }
 
        if (!wait_event_timeout(phy->roc_wait, phy->roc_grant, 4 * HZ)) {
-               mt7925_mcu_abort_roc(phy, vif, phy->roc_token_id);
+               mt7925_mcu_abort_roc(phy, mconf, phy->roc_token_id);
                clear_bit(MT76_STATE_ROC, &phy->mt76->state);
                err = -ETIMEDOUT;
        }
@@ -464,7 +465,8 @@ static int mt7925_remain_on_channel(struct ieee80211_hw *hw,
        int err;
 
        mt792x_mutex_acquire(phy->dev);
-       err = mt7925_set_roc(phy, mvif, chan, duration, MT7925_ROC_REQ_ROC);
+       err = mt7925_set_roc(phy, &mvif->bss_conf,
+                            chan, duration, MT7925_ROC_REQ_ROC);
        mt792x_mutex_release(phy->dev);
 
        return err;
@@ -476,7 +478,7 @@ static int mt7925_cancel_remain_on_channel(struct ieee80211_hw *hw,
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
        struct mt792x_phy *phy = mt792x_hw_phy(hw);
 
-       return mt7925_abort_roc(phy, mvif);
+       return mt7925_abort_roc(phy, &mvif->bss_conf);
 }
 
 static int mt7925_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
@@ -1345,7 +1347,8 @@ static void mt7925_mgd_prepare_tx(struct ieee80211_hw *hw,
                       jiffies_to_msecs(HZ);
 
        mt792x_mutex_acquire(dev);
-       mt7925_set_roc(mvif->phy, mvif, mvif->bss_conf.mt76.ctx->def.chan, duration,
+       mt7925_set_roc(mvif->phy, &mvif->bss_conf,
+                      mvif->bss_conf.mt76.ctx->def.chan, duration,
                       MT7925_ROC_REQ_JOIN);
        mt792x_mutex_release(dev);
 }
@@ -1356,7 +1359,7 @@ static void mt7925_mgd_complete_tx(struct ieee80211_hw *hw,
 {
        struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv;
 
-       mt7925_abort_roc(mvif->phy, mvif);
+       mt7925_abort_roc(mvif->phy, &mvif->bss_conf);
 }
 
 static void mt7925_vif_cfg_changed(struct ieee80211_hw *hw,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
index 0350f0e34690b1a993e1d9ad6982e75d7b427dc1..a40ad1578212ee7e6145859bc8eacc4fd32802ae 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mcu.c
@@ -1050,7 +1050,7 @@ int mt7925_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,
        return mt76_mcu_skb_send_msg(dev, skb, mcu_cmd, true);
 }
 
-int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
+int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,
                       struct ieee80211_channel *chan, int duration,
                       enum mt7925_roc_req type, u8 token_id)
 {
@@ -1086,7 +1086,7 @@ int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
                        .tokenid = token_id,
                        .reqtype = type,
                        .maxinterval = cpu_to_le32(duration),
-                       .bss_idx = vif->bss_conf.mt76.idx,
+                       .bss_idx = mconf->mt76.idx,
                        .control_channel = chan->hw_value,
                        .bw = CMD_CBW_20MHZ,
                        .bw_from_ap = CMD_CBW_20MHZ,
@@ -1117,7 +1117,7 @@ int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
                                 &req, sizeof(req), false);
 }
 
-int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
+int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,
                         u8 token_id)
 {
        struct mt792x_dev *dev = phy->dev;
@@ -1138,7 +1138,7 @@ int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
                        .tag = cpu_to_le16(UNI_ROC_ABORT),
                        .len = cpu_to_le16(sizeof(struct roc_abort_tlv)),
                        .tokenid = token_id,
-                       .bss_idx = vif->bss_conf.mt76.idx,
+                       .bss_idx = mconf->mt76.idx,
                        .dbdcband = 0xff, /* auto*/
                },
        };

diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
index 07ea03195e4e93efd4bf958768d7058319ed055b..8ab2bb01ba733f4a3055a7fe9346eaa3751f411f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h
@@ -292,10 +292,10 @@ int mt7925_set_tx_sar_pwr(struct ieee80211_hw *hw,
 int mt7925_mcu_regval(struct mt792x_dev *dev, u32 regidx, u32 *val, bool set);
 int mt7925_mcu_set_clc(struct mt792x_dev *dev, u8 *alpha2,
                       enum environment_cap env_cap);
-int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
+int mt7925_mcu_set_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,
                       struct ieee80211_channel *chan, int duration,
                       enum mt7925_roc_req type, u8 token_id);
-int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_vif *vif,
+int mt7925_mcu_abort_roc(struct mt792x_phy *phy, struct mt792x_bss_conf *mconf,
                         u8 token_id);
 int mt7925_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,
                            int cmd, int *wait_seq);