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

mt76x0: pci: add get_survey support 



Move mt76x02_update_channel routine in mt76x02-lib module in
order to be reused by mt76x0 driver adding get_survey support

Signed-off-by: default avatarLorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent b8defea4

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

+2 −0
Original line number Diff line number Diff line
@@ -137,6 +137,8 @@ void mt76x0_mac_work(struct work_struct *work) 
	u32 sum, n;

	int i, j, k;



	mt76x02_update_channel(&dev->mt76);



	/* Note: using MCU_RANDOM_READ is actually slower then reading all the

	 *	 registers by hand.  MCU takes ca. 20ms to complete read of 24

	 *	 registers while reading them one by one will takes roughly

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

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ mt76x0_set_channel(struct mt76x02_dev *dev, struct cfg80211_chan_def *chandef) 


	mt76_set_channel(&dev->mt76);

	ret = mt76x0_phy_set_channel(dev, chandef);



	/* channel cycle counters read-and-clear */

	mt76_rr(dev, MT_CH_IDLE);

	mt76_rr(dev, MT_CH_BUSY);



	mt76_txq_schedule_all(&dev->mt76);



	return ret;

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ static const struct ieee80211_ops mt76x0e_ops = { 
	.ampdu_action = mt76x02_ampdu_action,

	.sta_rate_tbl_update = mt76x02_sta_rate_tbl_update,

	.wake_tx_queue = mt76_wake_tx_queue,

	.get_survey = mt76_get_survey,

};



static int mt76x0e_register_device(struct mt76x02_dev *dev)
@@ -135,6 +136,7 @@ mt76x0e_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
{

	static const struct mt76_driver_ops drv_ops = {

		.txwi_size = sizeof(struct mt76x02_txwi),

		.update_survey = mt76x02_update_channel,

		.tx_prepare_skb = mt76x02_tx_prepare_skb,

		.tx_complete_skb = mt76x02_tx_complete_skb,

		.rx_skb = mt76x02_queue_rx_skb,

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

+18 −0
Original line number Diff line number Diff line
@@ -735,3 +735,21 @@ void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q, 
		dev_kfree_skb_any(e->skb);

}

EXPORT_SYMBOL_GPL(mt76x02_tx_complete_skb);



void mt76x02_update_channel(struct mt76_dev *mdev)

{

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

	struct mt76_channel_state *state;

	u32 active, busy;



	state = mt76_channel_state(&dev->mt76, dev->mt76.chandef.chan);



	busy = mt76_rr(dev, MT_CH_BUSY);

	active = busy + mt76_rr(dev, MT_CH_IDLE);



	spin_lock_bh(&dev->mt76.cc_lock);

	state->cc_busy += busy;

	state->cc_active += active;

	spin_unlock_bh(&dev->mt76.cc_lock);

}

EXPORT_SYMBOL_GPL(mt76x02_update_channel);

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

+1 −0
Original line number Diff line number Diff line
@@ -226,4 +226,5 @@ void mt76x02_mac_write_txwi(struct mt76x02_dev *dev, struct mt76x02_txwi *txwi, 
void mt76x02_mac_poll_tx_status(struct mt76x02_dev *dev, bool irq);

void mt76x02_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue *q,

			     struct mt76_queue_entry *e, bool flush);

void mt76x02_update_channel(struct mt76_dev *mdev);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE