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

mt76: rely on mt76_queue in tx_queue_skb signature 



Rely on mt76_queue instead of qid in tx_queue_skb signature.
This is a preliminary patch to move data queues in mt76_phy and add
dbdc support to mt7915 driver

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

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

+2 −3
Original line number Diff line number Diff line
@@ -344,11 +344,10 @@ mt76_dma_tx_queue_skb_raw(struct mt76_dev *dev, enum mt76_txq_id qid, 
}



static int

mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,

mt76_dma_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

		      struct sk_buff *skb, struct mt76_wcid *wcid,

		      struct ieee80211_sta *sta)

{

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

	struct mt76_tx_info tx_info = {

		.skb = skb,

	};
@@ -398,7 +397,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 


	dma_sync_single_for_cpu(dev->dev, t->dma_addr, dev->drv->txwi_size,

				DMA_TO_DEVICE);

	ret = dev->drv->tx_prepare_skb(dev, txwi, qid, wcid, sta, &tx_info);

	ret = dev->drv->tx_prepare_skb(dev, txwi, q->qid, wcid, sta, &tx_info);

	dma_sync_single_for_device(dev->dev, t->dma_addr, dev->drv->txwi_size,

				   DMA_TO_DEVICE);

	if (ret < 0)

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

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct mt76_queue_ops { 
		     int idx, int n_desc, int bufsize,

		     u32 ring_base);



	int (*tx_queue_skb)(struct mt76_dev *dev, enum mt76_txq_id qid,

	int (*tx_queue_skb)(struct mt76_dev *dev, struct mt76_queue *q,

			    struct sk_buff *skb, struct mt76_wcid *wcid,

			    struct ieee80211_sta *sta);

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

+15 −12
Original line number Diff line number Diff line
@@ -13,23 +13,25 @@ static void 
mt7603_update_beacon_iter(void *priv, u8 *mac, struct ieee80211_vif *vif)

{

	struct mt7603_dev *dev = (struct mt7603_dev *)priv;

	struct mt76_dev *mdev = &dev->mt76;

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

	struct sk_buff *skb = NULL;



	if (!(dev->mt76.beacon_mask & BIT(mvif->idx)))

	if (!(mdev->beacon_mask & BIT(mvif->idx)))

		return;



	skb = ieee80211_beacon_get(mt76_hw(dev), vif);

	if (!skb)

		return;



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

	mt76_tx_queue_skb(dev, mdev->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,

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

			   mdev->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));
@@ -67,6 +69,7 @@ mt7603_add_buffered_bc(void *priv, u8 *mac, struct ieee80211_vif *vif) 
void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t)

{

	struct mt7603_dev *dev = from_tasklet(dev, t, mt76.pre_tbtt_tasklet);

	struct mt76_dev *mdev = &dev->mt76;

	struct mt76_queue *q;

	struct beacon_bc_data data = {};

	struct sk_buff *skb;
@@ -78,7 +81,7 @@ void mt7603_pre_tbtt_tasklet(struct tasklet_struct *t) 
	data.dev = dev;

	__skb_queue_head_init(&data.q);



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

	q = mdev->q_tx[MT_TXQ_BEACON];

	spin_lock_bh(&q->lock);

	ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),

		IEEE80211_IFACE_ITER_RESUME_ALL,
@@ -89,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, dev->mt76.q_tx[MT_TXQ_CAB], false);

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



	mt76_csa_check(&dev->mt76);

	if (dev->mt76.csa_complete)

	mt76_csa_check(mdev);

	if (mdev->csa_complete)

		goto out;



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

	q = mdev->q_tx[MT_TXQ_CAB];

	do {

		nframes = skb_queue_len(&data.q);

		ieee80211_iterate_active_interfaces_atomic(mt76_hw(dev),
@@ -120,7 +123,8 @@ 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, MT_TXQ_CAB, skb, &mvif->sta.wcid, NULL);

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

				  &mvif->sta.wcid, NULL);

	}

	mt76_queue_kick(dev, q);

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



out:

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

	if (dev->mt76.q_tx[MT_TXQ_BEACON]->queued >

	    hweight8(dev->mt76.beacon_mask))

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

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

		dev->beacon_check++;

}

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

+6 −5
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t)

{

	struct mt76x02_dev *dev = from_tasklet(dev, t, mt76.pre_tbtt_tasklet);

	struct mt76_queue *q = dev->mt76.q_tx[MT_TXQ_PSD];

	struct mt76_dev *mdev = &dev->mt76;

	struct mt76_queue *q = mdev->q_tx[MT_TXQ_PSD];

	struct beacon_bc_data data = {};

	struct sk_buff *skb;

	int i;
@@ -35,9 +36,9 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t) 
	mt76_wr(dev, MT_BCN_BYPASS_MASK,

		0xff00 | ~(0xff00 >> dev->beacon_data_count));



	mt76_csa_check(&dev->mt76);

	mt76_csa_check(mdev);



	if (dev->mt76.csa_complete)

	if (mdev->csa_complete)

		return;



	mt76x02_enqueue_buffered_bc(dev, &data, 8);
@@ -58,8 +59,8 @@ static void mt76x02_pre_tbtt_tasklet(struct tasklet_struct *t) 
		struct ieee80211_vif *vif = info->control.vif;

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



		mt76_tx_queue_skb(dev, MT_TXQ_PSD, skb, &mvif->group_wcid,

				  NULL);

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

				  &mvif->group_wcid, NULL);

	}

	spin_unlock_bh(&q->lock);

}

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

+2 −3
Original line number Diff line number Diff line
@@ -239,11 +239,10 @@ static void mt76s_tx_status_data(struct work_struct *work) 
}



static int

mt76s_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid,

mt76s_tx_queue_skb(struct mt76_dev *dev, struct mt76_queue *q,

		   struct sk_buff *skb, struct mt76_wcid *wcid,

		   struct ieee80211_sta *sta)

{

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

	struct mt76_tx_info tx_info = {

		.skb = skb,

	};
@@ -254,7 +253,7 @@ mt76s_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
		return -ENOSPC;



	skb->prev = skb->next = NULL;

	err = dev->drv->tx_prepare_skb(dev, NULL, qid, wcid, sta, &tx_info);

	err = dev->drv->tx_prepare_skb(dev, NULL, q->qid, wcid, sta, &tx_info);

	if (err < 0)

		return err;