Commit cb1353ef authored by Ming Yen Hsieh's avatar Ming Yen Hsieh Committed by Felix Fietkau
Browse files

wifi: mt76: mt7925: integrate *mlo_sta_cmd and *sta_cmd 



Integrate *mlo_sta_cmd and *sta_cmd for the MLO firmware.

Fixes: 86c051f2 ("wifi: mt76: mt7925: enabling MLO when the firmware supports it")
Cc: stable@vger.kernel.org
Co-developed-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Tested-by: default avatarCaleb Jorden <cjorden@gmail.com>
Signed-off-by: default avatarMing Yen Hsieh <mingyen.hsieh@mediatek.com>
Link: https://patch.msgid.link/20250305000851.493671-5-sean.wang@kernel.org


Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 0ebb60da

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

+4 −55
Original line number Diff line number Diff line
@@ -1814,49 +1814,6 @@ mt7925_mcu_sta_mld_tlv(struct sk_buff *skb, 
	}

}



static int

mt7925_mcu_sta_cmd(struct mt76_phy *phy,

		   struct mt76_sta_cmd_info *info)

{

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

	struct mt76_dev *dev = phy->dev;

	struct sk_buff *skb;

	int conn_state;



	skb = __mt76_connac_mcu_alloc_sta_req(dev, mvif, info->wcid,

					      MT7925_STA_UPDATE_MAX_SIZE);

	if (IS_ERR(skb))

		return PTR_ERR(skb);



	conn_state = info->enable ? CONN_STATE_PORT_SECURE :

				    CONN_STATE_DISCONNECT;

	if (info->link_sta)

		mt76_connac_mcu_sta_basic_tlv(dev, skb, info->link_conf,

					      info->link_sta,

					      conn_state, info->newly);

	if (info->link_sta && info->enable) {

		mt7925_mcu_sta_phy_tlv(skb, info->vif, info->link_sta);

		mt7925_mcu_sta_ht_tlv(skb, info->link_sta);

		mt7925_mcu_sta_vht_tlv(skb, info->link_sta);

		mt76_connac_mcu_sta_uapsd(skb, info->vif, info->link_sta->sta);

		mt7925_mcu_sta_amsdu_tlv(skb, info->vif, info->link_sta);

		mt7925_mcu_sta_he_tlv(skb, info->link_sta);

		mt7925_mcu_sta_he_6g_tlv(skb, info->link_sta);

		mt7925_mcu_sta_eht_tlv(skb, info->link_sta);

		mt7925_mcu_sta_rate_ctrl_tlv(skb, info->vif,

					     info->link_sta);

		mt7925_mcu_sta_state_v2_tlv(phy, skb, info->link_sta,

					    info->vif, info->rcpi,

					    info->state);

		mt7925_mcu_sta_mld_tlv(skb, info->vif, info->link_sta->sta);

	}



	if (info->enable)

		mt7925_mcu_sta_hdr_trans_tlv(skb, info->vif, info->link_sta);



	return mt76_mcu_skb_send_msg(dev, skb, info->cmd, true);

}



static void

mt7925_mcu_sta_remove_tlv(struct sk_buff *skb)

{
@@ -1869,7 +1826,7 @@ mt7925_mcu_sta_remove_tlv(struct sk_buff *skb) 
}



static int

mt7925_mcu_mlo_sta_cmd(struct mt76_phy *phy,

mt7925_mcu_sta_cmd(struct mt76_phy *phy,

		   struct mt76_sta_cmd_info *info)

{

	struct mt792x_vif *mvif = (struct mt792x_vif *)info->vif->drv_priv;
@@ -1884,12 +1841,10 @@ mt7925_mcu_mlo_sta_cmd(struct mt76_phy *phy, 
	if (IS_ERR(skb))

		return PTR_ERR(skb);



	if (info->enable)

	if (info->enable && info->link_sta) {

		mt76_connac_mcu_sta_basic_tlv(dev, skb, info->link_conf,

					      info->link_sta,

					      info->enable, info->newly);



	if (info->enable && info->link_sta) {

		mt7925_mcu_sta_phy_tlv(skb, info->vif, info->link_sta);

		mt7925_mcu_sta_ht_tlv(skb, info->link_sta);

		mt7925_mcu_sta_vht_tlv(skb, info->link_sta);
@@ -1940,7 +1895,6 @@ int mt7925_mcu_sta_update(struct mt792x_dev *dev, 
	};

	struct mt792x_sta *msta;

	struct mt792x_link_sta *mlink;

	int err;



	if (link_sta) {

		msta = (struct mt792x_sta *)link_sta->sta->drv_priv;
@@ -1949,12 +1903,7 @@ int mt7925_mcu_sta_update(struct mt792x_dev *dev, 
	info.wcid = link_sta ? &mlink->wcid : &mvif->sta.deflink.wcid;

	info.newly = state != MT76_STA_INFO_STATE_ASSOC;



	if (ieee80211_vif_is_mld(vif))

		err = mt7925_mcu_mlo_sta_cmd(&dev->mphy, &info);

	else

		err = mt7925_mcu_sta_cmd(&dev->mphy, &info);



	return err;

	return mt7925_mcu_sta_cmd(&dev->mphy, &info);

}



int mt7925_mcu_set_beacon_filter(struct mt792x_dev *dev,