Commit de29d0af authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7921: remove leftovers from dbdc configuration 



Remove leftovers from dbdc configuration since mt7921
does not support it.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0c1ce988

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

+11 −17
Original line number Diff line number Diff line
@@ -459,7 +459,6 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed) 
{

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);

	bool band = phy != &dev->phy;

	int ret;



	if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
@@ -480,9 +479,9 @@ static int mt7921_config(struct ieee80211_hw *hw, u32 changed) 
		else

			phy->rxfilter &= ~MT_WF_RFCR_DROP_OTHER_UC;



		mt76_rmw_field(dev, MT_DMA_DCR0(band), MT_DMA_DCR0_RXD_G5_EN,

		mt76_rmw_field(dev, MT_DMA_DCR0(0), MT_DMA_DCR0_RXD_G5_EN,

			       enabled);

		mt76_wr(dev, MT_WF_RFCR(band), phy->rxfilter);

		mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);

	}



	mt7921_mutex_release(dev);
@@ -511,7 +510,6 @@ static void mt7921_configure_filter(struct ieee80211_hw *hw, 
{

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);

	bool band = phy != &dev->phy;

	u32 ctl_flags = MT_WF_RFCR1_DROP_ACK |

			MT_WF_RFCR1_DROP_BF_POLL |

			MT_WF_RFCR1_DROP_BA |
@@ -551,12 +549,12 @@ static void mt7921_configure_filter(struct ieee80211_hw *hw, 
			     MT_WF_RFCR_DROP_NDPA);



	*total_flags = flags;

	mt76_wr(dev, MT_WF_RFCR(band), phy->rxfilter);

	mt76_wr(dev, MT_WF_RFCR(0), phy->rxfilter);



	if (*total_flags & FIF_CONTROL)

		mt76_clear(dev, MT_WF_RFCR1(band), ctl_flags);

		mt76_clear(dev, MT_WF_RFCR1(0), ctl_flags);

	else

		mt76_set(dev, MT_WF_RFCR1(band), ctl_flags);

		mt76_set(dev, MT_WF_RFCR1(0), ctl_flags);



	mt7921_mutex_release(dev);

}
@@ -866,9 +864,7 @@ mt7921_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
{

	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);

	u8 omac_idx = mvif->mt76.omac_idx;

	bool band = phy != &dev->phy;

	union {

		u64 t64;

		u32 t32[2];
@@ -879,9 +875,9 @@ mt7921_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 


	n = omac_idx > HW_BSSID_MAX ? HW_BSSID_0 : omac_idx;

	/* TSF software read */

	mt76_set(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_MODE);

	tsf.t32[0] = mt76_rr(dev, MT_LPON_UTTR0(band));

	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1(band));

	mt76_set(dev, MT_LPON_TCR(0, n), MT_LPON_TCR_SW_MODE);

	tsf.t32[0] = mt76_rr(dev, MT_LPON_UTTR0(0));

	tsf.t32[1] = mt76_rr(dev, MT_LPON_UTTR1(0));



	mt7921_mutex_release(dev);
@@ -894,9 +890,7 @@ mt7921_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
{

	struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;

	struct mt7921_dev *dev = mt7921_hw_dev(hw);

	struct mt7921_phy *phy = mt7921_hw_phy(hw);

	u8 omac_idx = mvif->mt76.omac_idx;

	bool band = phy != &dev->phy;

	union {

		u64 t64;

		u32 t32[2];
@@ -906,10 +900,10 @@ mt7921_set_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	mt7921_mutex_acquire(dev);



	n = omac_idx > HW_BSSID_MAX ? HW_BSSID_0 : omac_idx;

	mt76_wr(dev, MT_LPON_UTTR0(band), tsf.t32[0]);

	mt76_wr(dev, MT_LPON_UTTR1(band), tsf.t32[1]);

	mt76_wr(dev, MT_LPON_UTTR0(0), tsf.t32[0]);

	mt76_wr(dev, MT_LPON_UTTR1(0), tsf.t32[1]);

	/* TSF software overwrite */

	mt76_set(dev, MT_LPON_TCR(band, n), MT_LPON_TCR_SW_WRITE);

	mt76_set(dev, MT_LPON_TCR(0, n), MT_LPON_TCR_SW_WRITE);



	mt7921_mutex_release(dev);

}