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

mt76: move tx hw data queues in mt76_phy 



Move hw data queues in mt76_phy from mt76_dev since mt7915 supports per
phy hw queues in dbdc mode

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

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

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ int mt76_queues_read(struct seq_file *s, void *data) 
	struct mt76_dev *dev = dev_get_drvdata(s->private);

	int i;



	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++) {

		struct mt76_queue *q = dev->q_tx[i];

	for (i = 0; i < ARRAY_SIZE(dev->phy.q_tx); i++) {

		struct mt76_queue *q = dev->phy.q_tx[i];



		if (!q)

			continue;

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

+5 −2
Original line number Diff line number Diff line
@@ -661,8 +661,11 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 
	mt76_worker_disable(&dev->tx_worker);

	netif_napi_del(&dev->tx_napi);



	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)

		mt76_dma_tx_cleanup(dev, dev->q_tx[i], true);

	for (i = 0; i < ARRAY_SIZE(dev->phy.q_tx); i++) {

		mt76_dma_tx_cleanup(dev, dev->phy.q_tx[i], true);

		if (dev->phy2)

			mt76_dma_tx_cleanup(dev, dev->phy2->q_tx[i], true);

	}



	for (i = 0; i < ARRAY_SIZE(dev->q_mcu); i++)

		mt76_dma_tx_cleanup(dev, dev->q_mcu[i], true);

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

+2 −5
Original line number Diff line number Diff line
@@ -539,14 +539,11 @@ EXPORT_SYMBOL_GPL(mt76_rx); 


bool mt76_has_tx_pending(struct mt76_phy *phy)

{

	struct mt76_dev *dev = phy->dev;

	struct mt76_queue *q;

	int i, offset;



	offset = __MT_TXQ_MAX * (phy != &dev->phy);

	int i;



	for (i = 0; i < __MT_TXQ_MAX; i++) {

		q = dev->q_tx[offset + i];

		q = phy->q_tx[i];

		if (q && q->queued)

			return true;

	}

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

+4 −3
Original line number Diff line number Diff line
@@ -561,6 +561,8 @@ struct mt76_phy { 


	unsigned long state;



	struct mt76_queue *q_tx[__MT_TXQ_MAX];



	struct cfg80211_chan_def chandef;

	struct ieee80211_channel *main_chan;
@@ -607,7 +609,6 @@ struct mt76_dev { 
	struct sk_buff_head rx_skb[__MT_RXQ_MAX];



	struct list_head txwi_cache;

	struct mt76_queue *q_tx[2 * __MT_TXQ_MAX];

	struct mt76_queue *q_mcu[__MT_MCUQ_MAX];

	struct mt76_queue q_rx[__MT_RXQ_MAX];

	const struct mt76_queue_ops *queue_ops;
@@ -797,7 +798,7 @@ static inline int mt76_init_tx_queue(struct mt76_phy *phy, int qid, int idx, 
		return PTR_ERR(q);



	q->qid = qid;

	phy->dev->q_tx[qid] = q;

	phy->q_tx[qid] = q;



	return 0;

}
@@ -938,7 +939,7 @@ void mt76_rx(struct mt76_dev *dev, enum mt76_rxq_id q, struct sk_buff *skb); 
void mt76_tx(struct mt76_phy *dev, struct ieee80211_sta *sta,

	     struct mt76_wcid *wcid, struct sk_buff *skb);

void mt76_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *txq);

void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,

void mt76_stop_tx_queues(struct mt76_phy *phy, struct ieee80211_sta *sta,

			 bool send_bar);

void mt76_tx_check_agg_ssn(struct ieee80211_sta *sta, struct sk_buff *skb);

void mt76_txq_schedule(struct mt76_phy *phy, enum mt76_txq_id qid);

drivers/net/wireless/mediatek/mt76/mt7603/beacon.c

+8 −9
Original line number Diff line number Diff line
@@ -24,14 +24,14 @@ mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif) 
	if (!skb)

		return;



	mt76_tx_queue_skb(dev, mdev->q_tx[MT_TXQ_BEACON], skb,

	mt76_tx_queue_skb(dev, dev->mphy.q_tx[MT_TXQ_BEACON], skb,

			  &mvif->sta.wcid, NULL);



	spin_lock_bh(&dev->ps_lock);

	mt76_wr(dev, MT_DMA_FQCR0, MT_DMA_FQCR0_BUSY |

		FIELD_PREP(MT_DMA_FQCR0_TARGET_WCID, mvif->sta.wcid.idx) |

		FIELD_PREP(MT_DMA_FQCR0_TARGET_QID,

			   mdev->q_tx[MT_TXQ_CAB]->hw_idx) |

			   dev->mphy.q_tx[MT_TXQ_CAB]->hw_idx) |

		FIELD_PREP(MT_DMA_FQCR0_DEST_PORT_ID, 3) |

		FIELD_PREP(MT_DMA_FQCR0_DEST_QUEUE_ID, 8));
@@ -81,7 +81,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
	data.dev = dev;

	__skb_queue_head_init(&data.q);



	q = mdev->q_tx[MT_TXQ_BEACON];

	q = dev->mphy.q_tx[MT_TXQ_BEACON];

	spin_lock_bh(&q->lock);

	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),

		IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -92,13 +92,13 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
	/* Flush all previous CAB queue packets */

	mt76_wr(dev, MT_WF_ARB_CAB_FLUSH, GENMASK(30, 16) | BIT(0));



	mt76_queue_tx_cleanup(dev, mdev->q_tx[MT_TXQ_CAB], false);

	mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_CAB], false);



	mt76_csa_check(mdev);

	if (mdev->csa_complete)

		goto out;



	q = mdev->q_tx[MT_TXQ_CAB];

	q = dev->mphy.q_tx[MT_TXQ_CAB];

	do {

		nframes = skb_queue_len(&data.q);

		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -123,8 +123,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
		struct ieee80211_vif *vif = info->control.vif;

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



		mt76_tx_queue_skb(dev, mdev->q_tx[MT_TXQ_CAB], skb,

				  &mvif->sta.wcid, NULL);

		mt76_tx_queue_skb(dev, q, skb, &mvif->sta.wcid, NULL);

	}

	mt76_queue_kick(dev, q);

	spin_unlock_bh(&q->lock);
@@ -139,8 +138,8 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
		 ((1 << (MT7603_MAX_INTERFACES - 1)) - 1)));



out:

	mt76_queue_tx_cleanup(dev, mdev->q_tx[MT_TXQ_BEACON], false);

	if (mdev->q_tx[MT_TXQ_BEACON]->queued > hweight8(mdev->beacon_mask))

	mt76_queue_tx_cleanup(dev, dev->mphy.q_tx[MT_TXQ_BEACON], false);

	if (dev->mphy.q_tx[MT_TXQ_BEACON]->queued > hweight8(mdev->beacon_mask))

		dev->beacon_check++;

}