Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

mt76: add skb pointer to mt76_tx_info 



Pass skb pointer to tx_prepare_skb through mt76_tx_info data structure.
This is a preliminary patch to properly support dma error path for
new chipsets (e.g. 7615)

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

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

+6 −5
Original line number Diff line number Diff line
@@ -290,7 +290,9 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
		      struct ieee80211_sta *sta)

{

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

	struct mt76_tx_info tx_info = {};

	struct mt76_tx_info tx_info = {

		.skb = skb,

	};

	int len, n = 0, ret = -ENOMEM;

	struct mt76_queue_entry e;

	struct mt76_txwi_cache *t;
@@ -335,8 +337,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, skb, qid, wcid, sta,

				       &tx_info);

	ret = dev->drv->tx_prepare_skb(dev, txwi, 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)
@@ -348,7 +349,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
	}



	return mt76_dma_add_buf(dev, q, tx_info.buf, tx_info.nbuf,

				tx_info.info, skb, t);

				tx_info.info, tx_info.skb, t);



unmap:

	for (n--; n > 0; n--)
@@ -356,7 +357,7 @@ mt76_dma_tx_queue_skb(struct mt76_dev *dev, enum mt76_txq_id qid, 
				 tx_info.buf[n].len, DMA_TO_DEVICE);



free:

	e.skb = skb;

	e.skb = tx_info.skb;

	e.txwi = t;

	dev->drv->tx_complete_skb(dev, qid, &e);

	mt76_put_txwi(dev, t);

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

+2 −2
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ struct mt76_queue_buf { 


struct mt76_tx_info {

	struct mt76_queue_buf buf[32];

	struct sk_buff *skb;

	int nbuf;

	u32 info;

};
@@ -291,8 +292,7 @@ struct mt76_driver_ops { 
	void (*update_survey)(struct mt76_dev *dev);



	int (*tx_prepare_skb)(struct mt76_dev *dev, void *txwi_ptr,

			      struct sk_buff *skb, enum mt76_txq_id qid,

			      struct mt76_wcid *wcid,

			      enum mt76_txq_id qid, struct mt76_wcid *wcid,

			      struct ieee80211_sta *sta,

			      struct mt76_tx_info *tx_info);

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

+6 −5
Original line number Diff line number Diff line
@@ -912,13 +912,13 @@ mt7603_mac_write_txwi(struct mt7603_dev *dev, __le32 *txwi, 
}



int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,

			  struct sk_buff *skb, enum mt76_txq_id qid,

			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			  enum mt76_txq_id qid, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta,

			  struct mt76_tx_info *tx_info)

{

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

	struct mt7603_sta *msta = container_of(wcid, struct mt7603_sta, wcid);

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx_info->skb);

	struct ieee80211_key_conf *key = info->control.hw_key;

	int pid;
@@ -934,7 +934,7 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
			mt7603_wtbl_set_ps(dev, msta, false);

	}



	pid = mt76_tx_status_skb_add(mdev, wcid, skb);

	pid = mt76_tx_status_skb_add(mdev, wcid, tx_info->skb);



	if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) {

		spin_lock_bh(&dev->mt76.lock);
@@ -944,7 +944,8 @@ int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
		spin_unlock_bh(&dev->mt76.lock);

	}



	mt7603_mac_write_txwi(dev, txwi_ptr, skb, qid, wcid, sta, pid, key);

	mt7603_mac_write_txwi(dev, txwi_ptr, tx_info->skb, qid, wcid,

			      sta, pid, key);



	return 0;

}

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

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ void mt7603_wtbl_set_smps(struct mt7603_dev *dev, struct mt7603_sta *sta, 
void mt7603_filter_tx(struct mt7603_dev *dev, int idx, bool abort);



int mt7603_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr,

			  struct sk_buff *skb, enum mt76_txq_id qid,

			  struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			  enum mt76_txq_id qid, struct mt76_wcid *wcid,

			  struct ieee80211_sta *sta,

			  struct mt76_tx_info *tx_info);



void mt7603_tx_complete_skb(struct mt76_dev *mdev, enum mt76_txq_id qid,

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

+2 −2
Original line number Diff line number Diff line
@@ -183,8 +183,8 @@ irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance); 
void mt76x02_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,

		struct sk_buff *skb);

int mt76x02_tx_prepare_skb(struct mt76_dev *mdev, void *txwi,

			   struct sk_buff *skb, enum mt76_txq_id qid,

			   struct mt76_wcid *wcid, struct ieee80211_sta *sta,

			   enum mt76_txq_id qid, struct mt76_wcid *wcid,

			   struct ieee80211_sta *sta,

			   struct mt76_tx_info *tx_info);

void mt76x02_sw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

		     const u8 *mac);