Commit f89f297a authored by Ryder Lee's avatar Ryder Lee Committed by Felix Fietkau
Browse files

mt76: mt7915: fix txbf starec TLV issues 



With this patch we can append txbf starec TLVs. This is an intermediate
patch to improve HE MUMIMO performances.

Signed-off-by: default avatarRyder Lee <ryder.lee@mediatek.com>
Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 22dffbdd

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

+68 −71
Original line number Diff line number Diff line
@@ -1769,6 +1769,45 @@ int mt7915_mcu_add_smps(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
				     MCU_EXT_CMD(STA_REC_UPDATE), true);

}



static inline bool

mt7915_is_ebf_supported(struct mt7915_phy *phy, struct ieee80211_vif *vif,

			struct ieee80211_sta *sta, bool bfee)

{

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

	int tx_ant = hweight8(phy->mt76->chainmask) - 1;



	if (vif->type != NL80211_IFTYPE_STATION &&

	    vif->type != NL80211_IFTYPE_AP)

		return false;



	if (!bfee && tx_ant < 2)

		return false;



	if (sta->he_cap.has_he) {

		struct ieee80211_he_cap_elem *pe = &sta->he_cap.he_cap_elem;



		if (bfee)

			return mvif->cap.he_su_ebfee &&

			       HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);

		else

			return mvif->cap.he_su_ebfer &&

			       HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);

	}



	if (sta->vht_cap.vht_supported) {

		u32 cap = sta->vht_cap.cap;



		if (bfee)

			return mvif->cap.vht_su_ebfee &&

			       (cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);

		else

			return mvif->cap.vht_su_ebfer &&

			       (cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);

	}



	return false;

}



static void

mt7915_mcu_sta_sounding_rate(struct sta_rec_bf *bf)

{
@@ -1900,10 +1939,12 @@ mt7915_mcu_sta_bfer_he(struct ieee80211_sta *sta, struct ieee80211_vif *vif, 
}



static void

mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,

			struct ieee80211_vif *vif, struct mt7915_phy *phy,

			bool enable, bool explicit)

mt7915_mcu_sta_bfer_tlv(struct mt7915_dev *dev, struct sk_buff *skb,

			struct ieee80211_vif *vif, struct ieee80211_sta *sta)

{

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

	struct mt7915_phy *phy =

		mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;

	int tx_ant = hweight8(phy->mt76->chainmask) - 1;

	struct sta_rec_bf *bf;

	struct tlv *tlv;
@@ -1913,25 +1954,23 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
		{2, 4, 4, 0},	/* 3x1, 3x2, 3x3, 3x4 */

		{3, 5, 6, 0}	/* 4x1, 4x2, 4x3, 4x4 */

	};

	bool ebf;



#define MT_BFER_FREE		cpu_to_le16(GENMASK(15, 0))

	ebf = mt7915_is_ebf_supported(phy, vif, sta, false);

	if (!ebf && !dev->ibf)

		return;



	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BF, sizeof(*bf));

	bf = (struct sta_rec_bf *)tlv;



	if (!enable) {

		bf->pfmu = MT_BFER_FREE;

		return;

	}



	/* he: eBF only, in accordance with spec

	 * vht: support eBF and iBF

	 * ht: iBF only, since mac80211 lacks of eBF support

	 */

	if (sta->he_cap.has_he && explicit)

	if (sta->he_cap.has_he && ebf)

		mt7915_mcu_sta_bfer_he(sta, vif, phy, bf);

	else if (sta->vht_cap.vht_supported)

		mt7915_mcu_sta_bfer_vht(sta, phy, bf, explicit);

		mt7915_mcu_sta_bfer_vht(sta, phy, bf, ebf);

	else if (sta->ht_cap.ht_supported)

		mt7915_mcu_sta_bfer_ht(sta, phy, bf);

	else
@@ -1941,12 +1980,12 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
	bf->ibf_dbw = sta->bandwidth;

	bf->ibf_nrow = tx_ant;



	if (!explicit && sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)

	if (!ebf && sta->bandwidth <= IEEE80211_STA_RX_BW_40 && !bf->nc)

		bf->ibf_timeout = 0x48;

	else

		bf->ibf_timeout = 0x18;



	if (explicit && bf->nr != tx_ant)

	if (ebf && bf->nr != tx_ant)

		bf->mem_20m = matrix[tx_ant][bf->nc];

	else

		bf->mem_20m = matrix[bf->nr][bf->nc];
@@ -1966,14 +2005,20 @@ mt7915_mcu_sta_bfer_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
}



static void

mt7915_mcu_sta_bfee_tlv(struct sk_buff *skb, struct ieee80211_sta *sta,

			struct mt7915_phy *phy)

mt7915_mcu_sta_bfee_tlv(struct mt7915_dev *dev, struct sk_buff *skb,

			struct ieee80211_vif *vif, struct ieee80211_sta *sta)

{

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

	struct mt7915_phy *phy =

		mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;

	int tx_ant = hweight8(phy->mt76->chainmask) - 1;

	struct sta_rec_bfee *bfee;

	struct tlv *tlv;

	u8 nr = 0;



	if (!mt7915_is_ebf_supported(phy, vif, sta, true))

		return;



	tlv = mt7915_mcu_add_tlv(skb, STA_REC_BFEE, sizeof(*bfee));

	bfee = (struct sta_rec_bfee *)tlv;
@@ -1999,68 +2044,20 @@ mt7915_mcu_add_txbf(struct mt7915_dev *dev, struct ieee80211_vif *vif, 
{

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

	struct mt7915_sta *msta = (struct mt7915_sta *)sta->drv_priv;

	struct mt7915_phy *phy;

	struct sk_buff *skb;

	int r, len;

	bool ebfee = false, ebfer = false;



	if (vif->type != NL80211_IFTYPE_STATION &&

	    vif->type != NL80211_IFTYPE_AP)

		return 0;



	phy = mvif->band_idx ? mt7915_ext_phy(dev) : &dev->phy;



	if (sta->he_cap.has_he) {

		struct ieee80211_he_cap_elem *pe = &sta->he_cap.he_cap_elem;



		ebfee = mvif->cap.he_su_ebfee &&

			HE_PHY(CAP3_SU_BEAMFORMER, pe->phy_cap_info[3]);

		ebfer = mvif->cap.he_su_ebfer &&

			HE_PHY(CAP4_SU_BEAMFORMEE, pe->phy_cap_info[4]);

	} else if (sta->vht_cap.vht_supported) {

		u32 cap = sta->vht_cap.cap;



		ebfee = mvif->cap.vht_su_ebfee &&

			(cap & IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE);

		ebfer = mvif->cap.vht_su_ebfer &&

			(cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE);

	}



	/* must keep each tag independent */



	/* starec bf */

	if (ebfer || dev->ibf) {

		len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bf);



		skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);

	skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta,

				       MT7915_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



		mt7915_mcu_sta_bfer_tlv(skb, sta, vif, phy, enable, ebfer);



		r = mt76_mcu_skb_send_msg(&dev->mt76, skb,

					  MCU_EXT_CMD(STA_REC_UPDATE), true);

		if (r)

			return r;

	}



	/* starec bf */

	mt7915_mcu_sta_bfer_tlv(dev, skb, vif, sta);

	/* starec bfee */

	if (ebfee) {

		len = sizeof(struct sta_req_hdr) + sizeof(struct sta_rec_bfee);

	mt7915_mcu_sta_bfee_tlv(dev, skb, vif, sta);



		skb = mt7915_mcu_alloc_sta_req(dev, mvif, msta, len);

		if (IS_ERR(skb))

			return PTR_ERR(skb);



		mt7915_mcu_sta_bfee_tlv(skb, sta, phy);



		r = mt76_mcu_skb_send_msg(&dev->mt76, skb,

	return mt76_mcu_skb_send_msg(&dev->mt76, skb,

				     MCU_EXT_CMD(STA_REC_UPDATE), true);

		if (r)

			return r;

	}



	return 0;

}



static void

drivers/net/wireless/mediatek/mt76/mt7915/mcu.h

+3 −1
Original line number Diff line number Diff line
@@ -1007,7 +1007,7 @@ struct sta_rec_bf { 
	bool codebook75_mu;



	u8 he_ltf;

	u8 rsv[2];

	u8 rsv[3];

} __packed;



struct sta_rec_bfee {
@@ -1108,12 +1108,14 @@ enum { 


#define MT7915_STA_UPDATE_MAX_SIZE	(sizeof(struct sta_req_hdr) +	\

					 sizeof(struct sta_rec_basic) +	\

					 sizeof(struct sta_rec_bf) +	\

					 sizeof(struct sta_rec_ht) +	\

					 sizeof(struct sta_rec_he) +	\

					 sizeof(struct sta_rec_ba) +	\

					 sizeof(struct sta_rec_vht) +	\

					 sizeof(struct sta_rec_uapsd) + \

					 sizeof(struct sta_rec_amsdu) +	\

					 sizeof(struct sta_rec_bfee) +	\

					 sizeof(struct tlv) +		\

					 MT7915_WTBL_UPDATE_MAX_SIZE)