mt76: mt7915: add partial add_bss_info command on testmode init

This is a preliminary patch for DBDC and ipg config support
in testmode.

The wmm_idx of band1 should be configured by this command to
make band1 Tx work normally. Also, for setting ipg, FW needs a
non-empty bss_info structure to do edca parameters update.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index 91b727d..592c0db 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -669,6 +669,7 @@ mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
        switch (vif->type) {
        case NL80211_IFTYPE_MESH_POINT:
        case NL80211_IFTYPE_AP:
+       case NL80211_IFTYPE_MONITOR:
                break;
        case NL80211_IFTYPE_STATION:
                /* TODO: enable BSS_INFO_UAPSD & BSS_INFO_PM */
@@ -697,16 +698,21 @@ mt7915_mcu_bss_basic_tlv(struct sk_buff *skb, struct ieee80211_vif *vif,
        }
 
        bss = (struct bss_info_basic *)tlv;
-       memcpy(bss->bssid, vif->bss_conf.bssid, ETH_ALEN);
-       bss->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
        bss->network_type = cpu_to_le32(type);
-       bss->dtim_period = vif->bss_conf.dtim_period;
        bss->bmc_wcid_lo = to_wcid_lo(wlan_idx);
        bss->bmc_wcid_hi = to_wcid_hi(wlan_idx);
-       bss->phy_mode = mt7915_get_phy_mode(phy->dev, vif, band, NULL);
        bss->wmm_idx = mvif->wmm_idx;
        bss->active = enable;
 
+       if (vif->type != NL80211_IFTYPE_MONITOR) {
+               memcpy(bss->bssid, vif->bss_conf.bssid, ETH_ALEN);
+               bss->bcn_interval = cpu_to_le16(vif->bss_conf.beacon_int);
+               bss->dtim_period = vif->bss_conf.dtim_period;
+               bss->phy_mode = mt7915_get_phy_mode(phy->dev, vif, band, NULL);
+       } else {
+               memcpy(bss->bssid, phy->mt76->macaddr, ETH_ALEN);
+       }
+
        return 0;
 }
 
@@ -722,6 +728,7 @@ mt7915_mcu_bss_omac_tlv(struct sk_buff *skb, struct ieee80211_vif *vif)
        tlv = mt7915_mcu_add_tlv(skb, BSS_INFO_OMAC, sizeof(*omac));
 
        switch (vif->type) {
+       case NL80211_IFTYPE_MONITOR:
        case NL80211_IFTYPE_MESH_POINT:
        case NL80211_IFTYPE_AP:
                type = CONNECTION_INFRA_AP;
@@ -991,6 +998,9 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
 
        mt7915_mcu_bss_basic_tlv(skb, vif, phy, enable);
 
+       if (vif->type == NL80211_IFTYPE_MONITOR)
+               goto out;
+
        if (enable) {
                mt7915_mcu_bss_rfch_tlv(skb, vif, phy);
                mt7915_mcu_bss_bmc_tlv(skb, phy);
@@ -1004,7 +1014,7 @@ int mt7915_mcu_add_bss_info(struct mt7915_phy *phy,
                    mvif->omac_idx < REPEATER_BSSID_START)
                        mt7915_mcu_bss_ext_tlv(skb, mvif);
        }
-
+out:
        return mt76_mcu_skb_send_msg(&phy->dev->mt76, skb,
                                     MCU_EXT_CMD_BSS_INFO_UPDATE, true);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
index 9ee82e2..fe56ab1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/testmode.c
@@ -192,6 +192,8 @@ mt7915_tm_init(struct mt7915_dev *dev)
        mt7915_tm_mode_ctrl(dev, en);
        mt7915_tm_reg_backup_restore(dev, &dev->phy);
        mt7915_tm_set_trx(dev, &dev->phy, TM_MAC_TXRX, !en);
+
+       mt7915_mcu_add_bss_info(&dev->phy, dev->phy.monitor_vif, en);
 }
 
 static void