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

wifi: mt76: mt7921: rely on shared sta_poll_list and sta_poll_lock 



Rely on sta_poll_list and sta_poll_lock fields in mt76_dev structure
and get rid of private copies.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent ea0f3867

drivers/net/wireless/mediatek/mt76/mt7921/init.c

+0 −2
Original line number Diff line number Diff line
@@ -456,8 +456,6 @@ int mt7921_register_device(struct mt7921_dev *dev) 
#endif

	skb_queue_head_init(&dev->phy.scan_event_list);

	skb_queue_head_init(&dev->coredump.msg_list);

	INIT_LIST_HEAD(&dev->sta_poll_list);

	spin_lock_init(&dev->sta_poll_lock);



	INIT_WORK(&dev->reset_work, mt7921_mac_reset_work);

	INIT_WORK(&dev->init_work, mt7921_init_work);

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+17 −15
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev) 
	s8 rssi[4];

	int i;



	spin_lock_bh(&dev->sta_poll_lock);

	list_splice_init(&dev->sta_poll_list, &sta_poll_list);

	spin_unlock_bh(&dev->sta_poll_lock);

	spin_lock_bh(&dev->mt76.sta_poll_lock);

	list_splice_init(&dev->mt76.sta_poll_list, &sta_poll_list);

	spin_unlock_bh(&dev->mt76.sta_poll_lock);



	while (true) {

		bool clear = false;
@@ -78,15 +78,15 @@ static void mt7921_mac_sta_poll(struct mt7921_dev *dev) 
		u16 idx;

		u8 bw;



		spin_lock_bh(&dev->sta_poll_lock);

		spin_lock_bh(&dev->mt76.sta_poll_lock);

		if (list_empty(&sta_poll_list)) {

			spin_unlock_bh(&dev->sta_poll_lock);

			spin_unlock_bh(&dev->mt76.sta_poll_lock);

			break;

		}

		msta = list_first_entry(&sta_poll_list,

					struct mt7921_sta, poll_list);

		list_del_init(&msta->poll_list);

		spin_unlock_bh(&dev->sta_poll_lock);

		spin_unlock_bh(&dev->mt76.sta_poll_lock);



		idx = msta->wcid.idx;

		addr = mt7921_mac_wtbl_lmac_addr(idx, MT_WTBL_AC0_CTT_OFFSET);
@@ -280,10 +280,11 @@ mt7921_mac_fill_rx(struct mt7921_dev *dev, struct sk_buff *skb) 


	if (status->wcid) {

		msta = container_of(status->wcid, struct mt7921_sta, wcid);

		spin_lock_bh(&dev->sta_poll_lock);

		spin_lock_bh(&dev->mt76.sta_poll_lock);

		if (list_empty(&msta->poll_list))

			list_add_tail(&msta->poll_list, &dev->sta_poll_list);

		spin_unlock_bh(&dev->sta_poll_lock);

			list_add_tail(&msta->poll_list,

				      &dev->mt76.sta_poll_list);

		spin_unlock_bh(&dev->mt76.sta_poll_lock);

	}



	mt7921_get_status_freq_info(dev, mphy, status, chfreq);
@@ -566,10 +567,10 @@ void mt7921_mac_add_txs(struct mt7921_dev *dev, void *data) 
	if (!wcid->sta)

		goto out;



	spin_lock_bh(&dev->sta_poll_lock);

	spin_lock_bh(&dev->mt76.sta_poll_lock);

	if (list_empty(&msta->poll_list))

		list_add_tail(&msta->poll_list, &dev->sta_poll_list);

	spin_unlock_bh(&dev->sta_poll_lock);

		list_add_tail(&msta->poll_list, &dev->mt76.sta_poll_list);

	spin_unlock_bh(&dev->mt76.sta_poll_lock);



out:

	rcu_read_unlock();
@@ -647,10 +648,11 @@ static void mt7921_mac_tx_free(struct mt7921_dev *dev, void *data, int len) 
				continue;



			msta = container_of(wcid, struct mt7921_sta, wcid);

			spin_lock_bh(&dev->sta_poll_lock);

			spin_lock_bh(&mdev->sta_poll_lock);

			if (list_empty(&msta->poll_list))

				list_add_tail(&msta->poll_list, &dev->sta_poll_list);

			spin_unlock_bh(&dev->sta_poll_lock);

				list_add_tail(&msta->poll_list,

					      &mdev->sta_poll_list);

			spin_unlock_bh(&mdev->sta_poll_lock);

			continue;

		}

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

+4 −4
Original line number Diff line number Diff line
@@ -357,10 +357,10 @@ static void mt7921_remove_interface(struct ieee80211_hw *hw, 
	phy->omac_mask &= ~BIT_ULL(mvif->mt76.omac_idx);

	mt7921_mutex_release(dev);



	spin_lock_bh(&dev->sta_poll_lock);

	spin_lock_bh(&dev->mt76.sta_poll_lock);

	if (!list_empty(&msta->poll_list))

		list_del_init(&msta->poll_list);

	spin_unlock_bh(&dev->sta_poll_lock);

	spin_unlock_bh(&dev->mt76.sta_poll_lock);



	mt76_packet_id_flush(&dev->mt76, &msta->wcid);

}
@@ -842,10 +842,10 @@ void mt7921_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
						    mvif->ctx);

	}



	spin_lock_bh(&dev->sta_poll_lock);

	spin_lock_bh(&dev->mt76.sta_poll_lock);

	if (!list_empty(&msta->poll_list))

		list_del_init(&msta->poll_list);

	spin_unlock_bh(&dev->sta_poll_lock);

	spin_unlock_bh(&dev->mt76.sta_poll_lock);



	mt76_connac_power_save_sched(&dev->mphy, &dev->pm);

}

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

+0 −3
Original line number Diff line number Diff line
@@ -274,9 +274,6 @@ struct mt7921_dev { 
	bool hw_init_done:1;

	bool fw_assert:1;



	struct list_head sta_poll_list;

	spinlock_t sta_poll_lock;



	struct work_struct init_work;



	u8 fw_debug;