]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
mt76: mt7921: introduce beacon_loss mcu event
authorSean Wang <sean.wang@mediatek.com>
Wed, 27 Jan 2021 19:33:48 +0000 (03:33 +0800)
committerFelix Fietkau <nbd@nbd.name>
Fri, 29 Jan 2021 17:09:59 +0000 (18:09 +0100)
If device has enabled beacon hw filter rx beacons are not reported to
the host. Introduce beacon_loss mcu event to trigger mac80211 mlme
connection state machine in this configuration.
IEEE80211_VIF_BEACON_FILTER has not set in vif flags since hw beacon
filter is not enabled yet

Co-developed-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Co-developed-by: Soul Huang <Soul.Huang@mediatek.com>
Signed-off-by: Soul Huang <Soul.Huang@mediatek.com>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
drivers/net/wireless/mediatek/mt76/mt7921/mcu.h

index 768456c7aa7ffee7f71ddbe7496ac8a4ca49f1c7..02fde1c63ecf93a82ef5fde3dc10101548e4dda0 100644 (file)
@@ -543,6 +543,40 @@ mt7921_mcu_scan_event(struct mt7921_dev *dev, struct sk_buff *skb)
                                     MT7921_HW_SCAN_TIMEOUT);
 }
 
+static void
+mt7921_mcu_beacon_loss_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)
+{
+       struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;
+       struct mt7921_beacon_loss_event *event = priv;
+
+       if (mvif->mt76.idx != event->bss_idx)
+               return;
+
+       if (!(vif->driver_flags & IEEE80211_VIF_BEACON_FILTER))
+               return;
+
+       ieee80211_beacon_loss(vif);
+}
+
+static void
+mt7921_mcu_beacon_loss_event(struct mt7921_dev *dev, struct sk_buff *skb)
+{
+       struct mt7921_beacon_loss_event *event;
+       struct mt76_phy *mphy;
+       u8 band_idx = 0; /* DBDC support */
+
+       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       event = (struct mt7921_beacon_loss_event *)skb->data;
+       if (band_idx && dev->mt76.phy2)
+               mphy = dev->mt76.phy2;
+       else
+               mphy = &dev->mt76.phy;
+
+       ieee80211_iterate_active_interfaces_atomic(mphy->hw,
+                                       IEEE80211_IFACE_ITER_RESUME_ALL,
+                                       mt7921_mcu_beacon_loss_iter, event);
+}
+
 static void
 mt7921_mcu_bss_event(struct mt7921_dev *dev, struct sk_buff *skb)
 {
@@ -593,6 +627,7 @@ mt7921_mcu_rx_unsolicited_event(struct mt7921_dev *dev, struct sk_buff *skb)
 
        switch (rxd->eid) {
        case MCU_EVENT_BSS_BEACON_LOSS:
+               mt7921_mcu_beacon_loss_event(dev, skb);
                break;
        case MCU_EVENT_SCHED_SCAN_DONE:
        case MCU_EVENT_SCAN_DONE:
index de3a9aabec0434b8a4c38dac1620088f9b0195ef..bf2e643cd8702e071b9aa63e9301d4c082682372 100644 (file)
@@ -784,6 +784,12 @@ struct mt7921_bss_qos_tlv {
        u8 pad[3];
 } __packed;
 
+struct mt7921_beacon_loss_event {
+       u8 bss_idx;
+       u8 reason;
+       u8 pad[2];
+} __packed;
+
 struct mt7921_mcu_scan_ssid {
        __le32 ssid_len;
        u8 ssid[IEEE80211_MAX_SSID_LEN];