Commit a0facfc8 authored by Shayne Chen's avatar Shayne Chen Committed by Felix Fietkau
Browse files

wifi: mt76: connac: rework connac helpers 



Rework connac helpers related to rate and phymode.
This is a preliminary patch to add MLO support for mt7996 chipsets.

Co-developed-by: default avatarBo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: default avatarBo Jiao <Bo.Jiao@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Link: https://patch.msgid.link/20250102163508.52945-21-nbd@nbd.name


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 4b98d4ae

drivers/net/wireless/mediatek/mt76/mt76_connac.h

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
				 struct ieee80211_key_conf *key, int pid,

				 enum mt76_txq_id qid, u32 changed);

u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *conf,

				 bool beacon, bool mcast);

bool mt76_connac2_mac_fill_txs(struct mt76_dev *dev, struct mt76_wcid *wcid,

			       __le32 *txs_data);

drivers/net/wireless/mediatek/mt76/mt76_connac_mac.c

+8 −8
Original line number Diff line number Diff line
@@ -291,28 +291,28 @@ EXPORT_SYMBOL_GPL(mt76_connac_init_tx_queues); 
})



u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy,

				 struct ieee80211_vif *vif,

				 struct ieee80211_bss_conf *conf,

				 bool beacon, bool mcast)

{

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

	struct mt76_vif_link *mvif = mt76_vif_conf_link(mphy->dev, conf->vif, conf);

	struct cfg80211_chan_def *chandef = mvif->ctx ?

					    &mvif->ctx->def : &mphy->chandef;

	u8 nss = 0, mode = 0, band = chandef->chan->band;

	int rateidx = 0, mcast_rate;

	int offset = 0;



	if (!vif)

	if (!conf)

		goto legacy;



	if (is_mt7921(mphy->dev)) {

		rateidx = ffs(vif->bss_conf.basic_rates) - 1;

		rateidx = ffs(conf->basic_rates) - 1;

		goto legacy;

	}



	if (beacon) {

		struct cfg80211_bitrate_mask *mask;



		mask = &vif->bss_conf.beacon_tx_rate;

		mask = &conf->beacon_tx_rate;



		__bitrate_mask_check(he_mcs, HE_SU);

		__bitrate_mask_check(vht_mcs, VHT);
@@ -324,11 +324,11 @@ u16 mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy, 
		}

	}



	mcast_rate = vif->bss_conf.mcast_rate[band];

	mcast_rate = conf->mcast_rate[band];

	if (mcast && mcast_rate > 0)

		rateidx = mcast_rate - 1;

	else

		rateidx = ffs(vif->bss_conf.basic_rates) - 1;

		rateidx = ffs(conf->basic_rates) - 1;



legacy:

	if (band != NL80211_BAND_2GHZ)
@@ -581,7 +581,7 @@ void mt76_connac2_mac_write_txwi(struct mt76_dev *dev, __le32 *txwi, 
		struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

		bool multicast = ieee80211_is_data(hdr->frame_control) &&

				 is_multicast_ether_addr(hdr->addr1);

		u16 rate = mt76_connac2_mac_tx_rate_val(mphy, vif, beacon,

		u16 rate = mt76_connac2_mac_tx_rate_val(mphy, &vif->bss_conf, beacon,

							multicast);

		u32 val = MT_TXD6_FIXED_BW;

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c

+3 −3
Original line number Diff line number Diff line
@@ -1371,7 +1371,7 @@ u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif, 
}

EXPORT_SYMBOL_GPL(mt76_connac_get_phy_mode);



u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,

u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,

				enum nl80211_band band)

{

	const struct ieee80211_sta_eht_cap *eht_cap;
@@ -1382,9 +1382,9 @@ u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif, 
		mode |= PHY_MODE_AX_6G;



	sband = phy->hw->wiphy->bands[band];

	eht_cap = ieee80211_get_eht_iftype_cap(sband, vif->type);

	eht_cap = ieee80211_get_eht_iftype_cap(sband, conf->vif->type);



	if (!eht_cap || !eht_cap->has_eht || !vif->bss_conf.eht_support)

	if (!eht_cap || !eht_cap->has_eht || !conf->eht_support)

		return mode;



	switch (band) {

drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h

+1 −1
Original line number Diff line number Diff line
@@ -2018,7 +2018,7 @@ mt76_connac_get_eht_phy_cap(struct mt76_phy *phy, struct ieee80211_vif *vif); 
u8 mt76_connac_get_phy_mode(struct mt76_phy *phy, struct ieee80211_vif *vif,

			    enum nl80211_band band,

			    struct ieee80211_link_sta *sta);

u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_vif *vif,

u8 mt76_connac_get_phy_mode_ext(struct mt76_phy *phy, struct ieee80211_bss_conf *conf,

				enum nl80211_band band);



int mt76_connac_mcu_add_key(struct mt76_dev *dev, struct ieee80211_vif *vif,

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

+1 −1
Original line number Diff line number Diff line
@@ -805,7 +805,7 @@ mt7925_get_rates_table(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	u16 rate;

	u8 i, idx, ht;



	rate = mt76_connac2_mac_tx_rate_val(mphy, vif, beacon, mcast);

	rate = mt76_connac2_mac_tx_rate_val(mphy, &vif->bss_conf, beacon, mcast);

	ht = FIELD_GET(MT_TX_RATE_MODE, rate) > MT_PHY_TYPE_OFDM;



	if (beacon && ht) {