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

wifi: mt76: mt7996: Add mt7996_sta_state routine 



Introduce mt7996_sta_state routine in order to initialize wcid structure
in mt7996 codebase. This is a preliminary patch to enable MLO support in
MT7996 driver.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20250311-mt7996-mlo-v2-6-31df6972519b@kernel.org


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

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

+3 −2
Original line number Diff line number Diff line
@@ -816,8 +816,8 @@ void mt76_free_device(struct mt76_dev *dev) 
}

EXPORT_SYMBOL_GPL(mt76_free_device);



static struct mt76_phy *

mt76_vif_phy(struct ieee80211_hw *hw, struct ieee80211_vif *vif)

struct mt76_phy *mt76_vif_phy(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif)

{

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

	struct mt76_chanctx *ctx;
@@ -831,6 +831,7 @@ mt76_vif_phy(struct ieee80211_hw *hw, struct ieee80211_vif *vif) 
	ctx = (struct mt76_chanctx *)mlink->ctx->drv_priv;

	return ctx->phy;

}

EXPORT_SYMBOL_GPL(mt76_vif_phy);



static void mt76_rx_release_amsdu(struct mt76_phy *phy, enum mt76_rxq_id q)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -1228,6 +1228,8 @@ struct mt76_phy *mt76_alloc_phy(struct mt76_dev *dev, unsigned int size, 
				u8 band_idx);

int mt76_register_phy(struct mt76_phy *phy, bool vht,

		      struct ieee80211_rate *rates, int n_rates);

struct mt76_phy *mt76_vif_phy(struct ieee80211_hw *hw,

			      struct ieee80211_vif *vif);



struct dentry *mt76_register_debugfs_fops(struct mt76_phy *phy,

					  const struct file_operations *ops);

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

+86 −14
Original line number Diff line number Diff line
@@ -815,20 +815,26 @@ mt7996_channel_switch_beacon(struct ieee80211_hw *hw, 
	mutex_unlock(&dev->mt76.mutex);

}



int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,

static int

mt7996_mac_sta_add(struct mt76_phy *mphy, struct ieee80211_vif *vif,

		   struct ieee80211_sta *sta)

{

	struct mt76_dev *mdev = mphy->dev;

	struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);

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

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

	struct mt7996_sta_link *msta_link = &msta->deflink;

	struct mt7996_vif_link *link = &mvif->deflink;

	u8 band_idx = link->phy->mt76->band_idx;

	int idx;

	u8 band_idx = mphy->band_idx;

	int i, idx, ret = 0;



	idx = mt76_wcid_alloc(dev->mt76.wcid_mask, MT7996_WTBL_STA);

	if (idx < 0)

		return -ENOSPC;

	mutex_lock(&mdev->mutex);



	idx = mt76_wcid_alloc(mdev->wcid_mask, MT7996_WTBL_STA);

	if (idx < 0) {

		ret = -ENOSPC;

		goto unlock;

	}



	msta->vif = mvif;

	INIT_LIST_HEAD(&msta_link->rc_list);
@@ -838,20 +844,37 @@ int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	msta_link->wcid.idx = idx;

	msta_link->wcid.phy_idx = band_idx;



	for (i = 0; i < ARRAY_SIZE(sta->txq); i++) {

		struct mt76_txq *mtxq;



		if (!sta->txq[i])

			continue;



		mtxq = (struct mt76_txq *)sta->txq[i]->drv_priv;

		mtxq->wcid = idx;

	}



	ewma_avg_signal_init(&msta_link->avg_ack_signal);

	ewma_signal_init(&msta_link->wcid.rssi);



	mt7996_mac_wtbl_update(dev, idx,

			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);

	mt7996_mcu_add_sta(dev, vif, &link->mt76, sta, CONN_STATE_DISCONNECT,

			   true);



	return 0;

	rcu_assign_pointer(mdev->wcid[idx], &msta_link->wcid);

	mt76_wcid_init(&msta_link->wcid, band_idx);

	mphy->num_sta++;

unlock:

	mutex_unlock(&mdev->mutex);



	return ret;

}



int mt7996_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,

static int

mt7996_mac_sta_event(struct mt7996_dev *dev, struct ieee80211_vif *vif,

		     struct ieee80211_sta *sta, enum mt76_sta_event ev)

{

	struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);

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

	struct mt7996_sta_link *msta_link = &msta->deflink;

	struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv;
@@ -893,12 +916,20 @@ int mt7996_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	return 0;

}



void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

static void

mt7996_mac_sta_remove(struct mt76_phy *mphy, struct ieee80211_vif *vif,

		      struct ieee80211_sta *sta)

{

	struct mt76_dev *mdev = mphy->dev;

	struct mt7996_dev *dev = container_of(mdev, struct mt7996_dev, mt76);

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

	struct mt7996_sta_link *msta_link = &msta->deflink;

	int i, idx = msta_link->wcid.idx;



	mutex_lock(&mdev->mutex);



	for (i = 0; i < ARRAY_SIZE(msta_link->wcid.aggr); i++)

		mt76_rx_aggr_stop(mdev, &msta_link->wcid, i);



	mt7996_mac_wtbl_update(dev, msta_link->wcid.idx,

			       MT_WTBL_UPDATE_ADM_COUNT_CLEAR);
@@ -909,6 +940,47 @@ void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
	if (!list_empty(&msta_link->rc_list))

		list_del_init(&msta_link->rc_list);

	spin_unlock_bh(&mdev->sta_poll_lock);



	mt76_wcid_cleanup(mdev, &msta_link->wcid);

	mt76_wcid_mask_clear(mdev->wcid_mask, idx);

	mphy->num_sta--;



	mutex_unlock(&mdev->mutex);

}



static int

mt7996_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		 struct ieee80211_sta *sta, enum ieee80211_sta_state old_state,

		 enum ieee80211_sta_state new_state)

{

	struct mt76_phy *mphy = mt76_vif_phy(hw, vif);

	struct mt7996_dev *dev = mt7996_hw_dev(hw);

	enum mt76_sta_event ev;



	if (!mphy)

		return -EINVAL;



	if (old_state == IEEE80211_STA_NOTEXIST &&

	    new_state == IEEE80211_STA_NONE)

		return mt7996_mac_sta_add(mphy, vif, sta);



	if (old_state == IEEE80211_STA_NONE &&

	    new_state == IEEE80211_STA_NOTEXIST)

		mt7996_mac_sta_remove(mphy, vif, sta);



	if (old_state == IEEE80211_STA_AUTH &&

	    new_state == IEEE80211_STA_ASSOC)

		ev = MT76_STA_EVENT_ASSOC;

	else if (old_state == IEEE80211_STA_ASSOC &&

		 new_state == IEEE80211_STA_AUTHORIZED)

		ev = MT76_STA_EVENT_AUTHORIZE;

	else if (old_state == IEEE80211_STA_ASSOC &&

		 new_state == IEEE80211_STA_AUTH)

		ev = MT76_STA_EVENT_DISASSOC;

	else

		return 0;



	return mt7996_mac_sta_event(dev, vif, sta, ev);

}



static void mt7996_tx(struct ieee80211_hw *hw,
@@ -1720,7 +1792,7 @@ const struct ieee80211_ops mt7996_ops = { 
	.configure_filter = mt7996_configure_filter,

	.vif_cfg_changed = mt7996_vif_cfg_changed,

	.link_info_changed = mt7996_link_info_changed,

	.sta_state = mt76_sta_state,

	.sta_state = mt7996_sta_state,

	.sta_pre_rcu_remove = mt76_sta_pre_rcu_remove,

	.link_sta_rc_update = mt7996_sta_rc_update,

	.set_key = mt7996_set_key,

drivers/net/wireless/mediatek/mt76/mt7996/mmio.c

+0 −3
Original line number Diff line number Diff line
@@ -618,9 +618,6 @@ struct mt7996_dev *mt7996_mmio_probe(struct device *pdev, 
		.rx_skb = mt7996_queue_rx_skb,

		.rx_check = mt7996_rx_check,

		.rx_poll_complete = mt7996_rx_poll_complete,

		.sta_add = mt7996_mac_sta_add,

		.sta_event = mt7996_mac_sta_event,

		.sta_remove = mt7996_mac_sta_remove,

		.update_survey = mt7996_update_channel,

		.set_channel = mt7996_set_channel,

		.vif_link_add = mt7996_vif_link_add,

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

+0 −6
Original line number Diff line number Diff line
@@ -696,12 +696,6 @@ void mt7996_mac_write_txwi(struct mt7996_dev *dev, __le32 *txwi, 
			   struct ieee80211_key_conf *key, int pid,

			   enum mt76_txq_id qid, u32 changed);

void mt7996_mac_set_coverage_class(struct mt7996_phy *phy);

int mt7996_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,

		       struct ieee80211_sta *sta);

int mt7996_mac_sta_event(struct mt76_dev *mdev, struct ieee80211_vif *vif,

			 struct ieee80211_sta *sta, enum mt76_sta_event ev);

void mt7996_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta);

void mt7996_mac_work(struct work_struct *work);

void mt7996_mac_reset_work(struct work_struct *work);

void mt7996_mac_dump_work(struct work_struct *work);