Commit 159f6dd6 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: switch to new api for hardware beacon filter 



Current firmware only supports new api for enabling hardware beacon filter.

Fixes: 1d8efc74 ("mt76: mt7921: introduce Runtime PM support")
Beacon filter cmd have to rely on the associatied access point's beacon
interval and DTIM information.

Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 782b3e86

drivers/net/wireless/mediatek/mt76/mt7921/main.c

+33 −16
Original line number Diff line number Diff line
@@ -295,15 +295,6 @@ static int mt7921_add_interface(struct ieee80211_hw *hw, 
	if (ret)

		goto out;



	if (dev->pm.enable) {

		ret = mt7921_mcu_set_bss_pm(dev, vif, true);

		if (ret)

			goto out;



		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;

		mt76_set(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);

	}



	dev->mt76.vif_mask |= BIT(mvif->mt76.idx);

	phy->omac_mask |= BIT_ULL(mvif->mt76.omac_idx);
@@ -349,13 +340,6 @@ static void mt7921_remove_interface(struct ieee80211_hw *hw, 
		phy->monitor_vif = NULL;



	mt76_connac_free_pending_tx_skbs(&dev->pm, &msta->wcid);



	if (dev->pm.enable) {

		mt7921_mcu_set_bss_pm(dev, vif, false);

		mt76_clear(dev, MT_WF_RFCR(0),

			   MT_WF_RFCR_DROP_OTHER_BEACON);

	}



	mt76_connac_mcu_uni_add_dev(&dev->mphy, vif, &mvif->sta.wcid, false);



	rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
@@ -561,6 +545,36 @@ static void mt7921_configure_filter(struct ieee80211_hw *hw, 
	mt7921_mutex_release(dev);

}



static int

mt7921_bss_bcnft_apply(struct mt7921_dev *dev, struct ieee80211_vif *vif,

		       bool assoc)

{

	int ret;



	if (!dev->pm.enable)

		return 0;



	if (assoc) {

		ret = mt7921_mcu_uni_bss_bcnft(dev, vif, true);

		if (ret)

			return ret;



		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER;

		mt76_set(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);



		return 0;

	}



	ret = mt7921_mcu_set_bss_pm(dev, vif, false);

	if (ret)

		return ret;



	vif->driver_flags &= ~IEEE80211_VIF_BEACON_FILTER;

	mt76_clear(dev, MT_WF_RFCR(0), MT_WF_RFCR_DROP_OTHER_BEACON);



	return 0;

}



static void mt7921_bss_info_changed(struct ieee80211_hw *hw,

				    struct ieee80211_vif *vif,

				    struct ieee80211_bss_conf *info,
@@ -587,6 +601,9 @@ static void mt7921_bss_info_changed(struct ieee80211_hw *hw, 
	if (changed & BSS_CHANGED_PS)

		mt7921_mcu_uni_bss_ps(dev, vif);



	if (changed & BSS_CHANGED_ASSOC)

		mt7921_bss_bcnft_apply(dev, vif, info->assoc);



	mt7921_mutex_release(dev);

}

drivers/net/wireless/mediatek/mt76/mt7921/mcu.c

+7 −1
Original line number Diff line number Diff line
@@ -1292,8 +1292,14 @@ mt7921_pm_interface_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
{

	struct mt7921_phy *phy = priv;

	struct mt7921_dev *dev = phy->dev;

	int ret;



	if (dev->pm.enable)

		ret = mt7921_mcu_uni_bss_bcnft(dev, vif, true);

	else

		ret = mt7921_mcu_set_bss_pm(dev, vif, false);



	if (mt7921_mcu_set_bss_pm(dev, vif, dev->pm.enable))

	if (ret)

		return;



	if (dev->pm.enable) {