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

mt76: connac: move mt76_connac_tx_complete_skb in shared code 



Since now txp structures are in common code we can reuse
mt76_connac_tx_complete_skb routine in mt7921e, mt7915e and mt7615e
drivers.

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

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

+0 −2
Original line number Diff line number Diff line
@@ -244,8 +244,6 @@ enum tx_phy_bandwidth { 
#define MT_TX_RATE_MODE			GENMASK(8, 6)

#define MT_TX_RATE_IDX			GENMASK(5, 0)



#define MT_MSDU_ID_VALID		BIT(15)



#define MT_TXD_LEN_MASK			GENMASK(11, 0)

#define MT_TXD_LEN_MSDU_LAST		BIT(14)

#define MT_TXD_LEN_AMSDU_LAST		BIT(15)

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

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int mt7615_mmio_probe(struct device *pdev, void __iomem *mem_base, 
				SURVEY_INFO_TIME_BSS_RX,

		.token_size = MT7615_TOKEN_SIZE,

		.tx_prepare_skb = mt7615_tx_prepare_skb,

		.tx_complete_skb = mt7615_tx_complete_skb,

		.tx_complete_skb = mt76_connac_tx_complete_skb,

		.rx_check = mt7615_rx_check,

		.rx_skb = mt7615_queue_rx_skb,

		.rx_poll_complete = mt7615_rx_poll_complete,

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

+0 −1
Original line number Diff line number Diff line
@@ -507,7 +507,6 @@ int mt7615_tx_prepare_skb(struct mt76_dev *mdev, void *txwi_ptr, 
			  struct mt76_tx_info *tx_info);



void mt7615_tx_worker(struct mt76_worker *w);

void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e);

void mt7615_tx_token_put(struct mt7615_dev *dev);

bool mt7615_rx_check(struct mt76_dev *mdev, void *data, int len);

void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,

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

+0 −31
Original line number Diff line number Diff line
@@ -14,37 +14,6 @@ 
#include "../dma.h"

#include "mac.h"



void mt7615_tx_complete_skb(struct mt76_dev *mdev, struct mt76_queue_entry *e)

{

	if (!e->txwi) {

		dev_kfree_skb_any(e->skb);

		return;

	}



	/* error path */

	if (e->skb == DMA_DUMMY_DATA) {

		struct mt76_connac_txp_common *txp;

		struct mt76_txwi_cache *t;

		struct mt7615_dev *dev;

		u16 token;



		dev = container_of(mdev, struct mt7615_dev, mt76);

		txp = mt76_connac_txwi_to_txp(mdev, e->txwi);



		if (is_mt7615(&dev->mt76))

			token = le16_to_cpu(txp->fw.token);

		else

			token = le16_to_cpu(txp->hw.msdu_id[0]) &

				~MT_MSDU_ID_VALID;



		t = mt76_token_put(mdev, token);

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

	}



	if (e->skb)

		mt76_tx_complete_skb(mdev, e->wcid, e->skb);

}



static void

mt7615_write_hw_txp(struct mt7615_dev *dev, struct mt76_tx_info *tx_info,

		    void *txp_ptr, u32 id)

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

+17 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
#define MT_SDIO_TAIL_SIZE			8

#define MT_SDIO_HDR_SIZE			4



#define MT_MSDU_ID_VALID		BIT(15)



enum {

	CMD_CBW_20MHZ = IEEE80211_STA_RX_BW_20,

	CMD_CBW_40MHZ = IEEE80211_STA_RX_BW_40,
@@ -198,6 +200,19 @@ static inline bool is_connac_v1(struct mt76_dev *dev) 
	return is_mt7615(dev) || is_mt7663(dev) || is_mt7622(dev);

}



static inline bool is_mt76_fw_txp(struct mt76_dev *dev)

{

	switch (mt76_chip(dev)) {

	case 0x7961:

	case 0x7922:

	case 0x7663:

	case 0x7622:

		return false;

	default:

		return true;

	}

}



static inline u8 mt76_connac_chan_bw(struct cfg80211_chan_def *chandef)

{

	static const u8 width_to_bw[] = {
@@ -304,6 +319,8 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm) 
	mutex_unlock(&dev->mutex);

}



void mt76_connac_tx_complete_skb(struct mt76_dev *mdev,

				 struct mt76_queue_entry *e);

void mt76_connac_pm_queue_skb(struct ieee80211_hw *hw,

			      struct mt76_connac_pm *pm,

			      struct mt76_wcid *wcid,