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

mt76: mt7915: rework mt7915_mcu_sta_muru_tlv() 



Re-order and modify conditions for MU DL/UL and ofdma DL fields, and
also clean up some unnecessary zero settings.

Signed-off-by: default avatarShayne Chen <shayne.chen@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent bbf77f6c

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

+21 −21
Original line number Diff line number Diff line
@@ -1520,22 +1520,37 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
	struct sta_rec_muru *muru;

	struct tlv *tlv;



	if (!sta->vht_cap.vht_supported && !sta->he_cap.has_he)

	if (vif->type != NL80211_IFTYPE_STATION &&

	    vif->type != NL80211_IFTYPE_AP)

		return;



	if (!sta->vht_cap.vht_supported)

		return;



	tlv = mt7915_mcu_add_tlv(skb, STA_REC_MURU, sizeof(*muru));



	muru = (struct sta_rec_muru *)tlv;

	muru->cfg.ofdma_dl_en = true;



	/* A non-AP HE station must support MU beamformee */

	muru->cfg.mimo_dl_en = (vif->type == NL80211_IFTYPE_STATION &&

				vif->bss_conf.he_support) ||

			       mvif->cap.he_mu_ebfer ||

	muru->cfg.mimo_dl_en = mvif->cap.he_mu_ebfer ||

			       mvif->cap.vht_mu_ebfer ||

			       mvif->cap.vht_mu_ebfee;



	muru->mimo_dl.vht_mu_bfee =

		!!(sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);



	if (!sta->he_cap.has_he)

		return;



	muru->mimo_dl.partial_bw_dl_mimo =

		HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem->phy_cap_info[6]);



	muru->cfg.mimo_ul_en = true;

	muru->mimo_ul.full_ul_mimo =

		HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem->phy_cap_info[2]);

	muru->mimo_ul.partial_ul_mimo =

		HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem->phy_cap_info[2]);



	muru->cfg.ofdma_dl_en = true;

	muru->ofdma_dl.punc_pream_rx =

		HE_PHY(CAP1_PREAMBLE_PUNC_RX_MASK, elem->phy_cap_info[1]);

	muru->ofdma_dl.he_20m_in_40m_2g =
@@ -1544,9 +1559,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
		HE_PHY(CAP8_20MHZ_IN_160MHZ_HE_PPDU, elem->phy_cap_info[8]);

	muru->ofdma_dl.he_80m_in_160m =

		HE_PHY(CAP8_80MHZ_IN_160MHZ_HE_PPDU, elem->phy_cap_info[8]);

	muru->ofdma_dl.lt16_sigb = 0;

	muru->ofdma_dl.rx_su_comp_sigb = 0;

	muru->ofdma_dl.rx_su_non_comp_sigb = 0;



	muru->ofdma_ul.t_frame_dur =

		HE_MAC(CAP1_TF_MAC_PAD_DUR_MASK, elem->mac_cap_info[1]);
@@ -1554,18 +1566,6 @@ mt7915_mcu_sta_muru_tlv(struct sk_buff *skb, struct ieee80211_sta *sta, 
		HE_MAC(CAP2_MU_CASCADING, elem->mac_cap_info[2]);

	muru->ofdma_ul.uo_ra =

		HE_MAC(CAP3_OFDMA_RA, elem->mac_cap_info[3]);

	muru->ofdma_ul.he_2x996_tone = 0;

	muru->ofdma_ul.rx_t_frame_11ac = 0;



	muru->mimo_dl.vht_mu_bfee =

		!!(sta->vht_cap.cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE);

	muru->mimo_dl.partial_bw_dl_mimo =

		HE_PHY(CAP6_PARTIAL_BANDWIDTH_DL_MUMIMO, elem->phy_cap_info[6]);



	muru->mimo_ul.full_ul_mimo =

		HE_PHY(CAP2_UL_MU_FULL_MU_MIMO, elem->phy_cap_info[2]);

	muru->mimo_ul.partial_ul_mimo =

		HE_PHY(CAP2_UL_MU_PARTIAL_MU_MIMO, elem->phy_cap_info[2]);

}



static void