mt76: mt7921: fix up the monitor mode

Properly set up the monitor mode the firmware can support to fix up
RTS/CTS and beacon frames cannot be captured and forwarded to the host.

Tested-by: Deren Wu <deren.wu@mediatek.com>
Tested-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 384c3eab1c8ace936fbd71c7bdf047ec80660d23..e5857d2cf78c3adc0e73e72b1b1b4020e94b8dc7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -993,6 +993,7 @@ enum {
        MCU_UNI_CMD_SUSPEND = 0x05,
        MCU_UNI_CMD_OFFLOAD = 0x06,
        MCU_UNI_CMD_HIF_CTRL = 0x07,
+       MCU_UNI_CMD_SNIFFER = 0x24,
 };
 
 enum {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
index b6e836a4fad70be14d51fe195b143e12f455ac44..ce4c38b436ec1fd0b74309e7f10a189dffad9fde 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c
@@ -479,6 +479,16 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
        mt7921_mcu_set_beacon_filter(dev, vif, dev->pm.enable);
 }
 
+static void
+mt7921_sniffer_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+       struct mt7921_dev *dev = priv;
+       struct ieee80211_hw *hw = mt76_hw(dev);
+       bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
+
+       mt7921_mcu_set_sniffer(dev, vif, enabled);
+}
+
 void mt7921_set_runtime_pm(struct mt7921_dev *dev)
 {
        struct ieee80211_hw *hw = dev->mphy.hw;
@@ -516,16 +526,10 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed)
        }
 
        if (changed & IEEE80211_CONF_CHANGE_MONITOR) {
-               bool enabled = !!(hw->conf.flags & IEEE80211_CONF_MONITOR);
-
-               if (!enabled)
-                       phy->rxfilter |= MT_WF_RFCR_DROP_OTHER_UC;
-               else
-                       phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;
-
-               mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,
-                              enabled);
-               mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);
+               ieee80211_iterate_active_interfaces(hw,
+                                                   IEEE80211_IFACE_ITER_RESUME_ALL,
+                                                   mt7921_sniffer_interface_iter, dev);
+               dev->mt76.rxfilter = mt76_rr(dev, MT_WF_RFCR(0));
                mt7921_set_runtime_pm(dev);
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index e7adcba7a8bfe2d402dd0e8673fe5c7c1b743707..5ef8b24f0ab36aa70eb46b5dc409eebbb757189a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -1135,3 +1135,33 @@ int mt7921_get_txpwr_info(struct mt7921_dev *dev, struct mt7921_txpwr *txpwr)
 
        return 0;
 }
+
+int mt7921_mcu_set_sniffer(struct mt7921_dev *dev, struct ieee80211_vif *vif,
+                          bool enable)
+{
+       struct mt76_vif *mvif = (struct mt76_vif *)vif->drv_priv;
+       struct {
+               struct {
+                       u8 band_idx;
+                       u8 pad[3];
+               } __packed hdr;
+               struct sniffer_enable_tlv {
+                       __le16 tag;
+                       __le16 len;
+                       u8 enable;
+                       u8 pad[3];
+               } __packed enable;
+       } req = {
+               .hdr = {
+                       .band_idx = mvif->band_idx,
+               },
+               .enable = {
+                       .tag = cpu_to_le16(0),
+                       .len = cpu_to_le16(sizeof(struct sniffer_enable_tlv)),
+                       .enable = enable,
+               },
+       };
+
+       return mt76_mcu_send_msg(&dev->mt76, MCU_UNI_CMD(SNIFFER), &req, sizeof(req),
+                                true);
+}

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index 9edc83f061390ad905c6d7154c49039837314842..9575d571b4259a5c6b422d0c518dbd9ac2ffe209 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -452,4 +452,6 @@ void mt7921s_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);
 bool mt7921s_tx_status_data(struct mt76_dev *mdev, u8 *update);
 void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data);
 void mt7921_set_runtime_pm(struct mt7921_dev *dev);
+int mt7921_mcu_set_sniffer(struct mt7921_dev *dev, struct ieee80211_vif *vif,
+                          bool enable);
 #endif