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

mt76: move token_lock, token and token_count in mt76_dev 



Move token_lock, token and token_count data structures in mt76_dev.
This is a preliminary patch to move token management in mt76 common
module since it is shared by mt7615, mt7915 and mt7921 drivers.

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

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

+4 −0
Original line number Diff line number Diff line
@@ -659,6 +659,10 @@ struct mt76_dev { 
	struct mt76_worker tx_worker;

	struct napi_struct tx_napi;



	spinlock_t token_lock;

	struct idr token;

	int token_count;



	wait_queue_head_t tx_wait;

	struct sk_buff_head status_list;

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

+7 −7
Original line number Diff line number Diff line
@@ -1466,9 +1466,9 @@ mt7615_mac_tx_free_token(struct mt7615_dev *dev, u16 token) 


	trace_mac_tx_free(dev, token);



	spin_lock_bh(&dev->token_lock);

	txwi = idr_remove(&dev->token, token);

	spin_unlock_bh(&dev->token_lock);

	spin_lock_bh(&mdev->token_lock);

	txwi = idr_remove(&mdev->token, token);

	spin_unlock_bh(&mdev->token_lock);



	if (!txwi)

		return;
@@ -1977,8 +1977,8 @@ void mt7615_tx_token_put(struct mt7615_dev *dev) 
	struct mt76_txwi_cache *txwi;

	int id;



	spin_lock_bh(&dev->token_lock);

	idr_for_each_entry(&dev->token, txwi, id) {

	spin_lock_bh(&dev->mt76.token_lock);

	idr_for_each_entry(&dev->mt76.token, txwi, id) {

		mt7615_txp_skb_unmap(&dev->mt76, txwi);

		if (txwi->skb) {

			struct ieee80211_hw *hw;
@@ -1988,8 +1988,8 @@ void mt7615_tx_token_put(struct mt7615_dev *dev) 
		}

		mt76_put_txwi(&dev->mt76, txwi);

	}

	spin_unlock_bh(&dev->token_lock);

	idr_destroy(&dev->token);

	spin_unlock_bh(&dev->mt76.token_lock);

	idr_destroy(&dev->mt76.token);

}

EXPORT_SYMBOL_GPL(mt7615_tx_token_put);

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

+0 −3
Original line number Diff line number Diff line
@@ -263,9 +263,6 @@ struct mt7615_dev { 
	bool flash_eeprom;

	bool dbdc_support;



	spinlock_t token_lock;

	struct idr token;



	u8 fw_ver;



	struct work_struct rate_work;

drivers/net/wireless/mediatek/mt76/mt7615/pci_init.c

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ static int mt7615_init_hardware(struct mt7615_dev *dev) 
	mt76_wr(dev, MT_INT_SOURCE_CSR, ~0);



	INIT_WORK(&dev->mcu_work, mt7615_pci_init_work);

	spin_lock_init(&dev->token_lock);

	idr_init(&dev->token);

	spin_lock_init(&dev->mt76.token_lock);

	idr_init(&dev->mt76.token);



	ret = mt7615_eeprom_init(dev, addr);

	if (ret < 0)

drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c

+7 −7
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e) 
			token = le16_to_cpu(txp->hw.msdu_id[0]) &

				~MT_MSDU_ID_VALID;



		spin_lock_bh(&dev->token_lock);

		t = idr_remove(&dev->token, token);

		spin_unlock_bh(&dev->token_lock);

		spin_lock_bh(&mdev->token_lock);

		t = idr_remove(&mdev->token, token);

		spin_unlock_bh(&mdev->token_lock);

		e->skb = t ? t->skb : NULL;

	}
@@ -161,9 +161,9 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
	t = (struct mt76_txwi_cache *)(txwi + mdev->drv->txwi_size);

	t->skb = tx_info->skb;



	spin_lock_bh(&dev->token_lock);

	id = idr_alloc(&dev->token, t, 0, MT7615_TOKEN_SIZE, GFP_ATOMIC);

	spin_unlock_bh(&dev->token_lock);

	spin_lock_bh(&mdev->token_lock);

	id = idr_alloc(&mdev->token, t, 0, MT7615_TOKEN_SIZE, GFP_ATOMIC);

	spin_unlock_bh(&mdev->token_lock);

	if (id < 0)

		return id;
@@ -314,7 +314,7 @@ void mt7615_mac_reset_work(struct work_struct *work) 
		mt7615_dma_reset(dev);



		mt7615_tx_token_put(dev);

		idr_init(&dev->token);

		idr_init(&dev->mt76.token);



		mt76_wr(dev, MT_WPDMA_MEM_RNG_ERR, 0);