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

mt76: connac: move mt7615_txp_skb_unmap in common code 



Move mt7615_txp_skb_unmap in shared code and reuse it in mt7915e and
mt7921e driver.

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

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

+1 −55
Original line number Diff line number Diff line
@@ -876,60 +876,6 @@ int mt7615_mac_write_txwi(struct mt7615_dev *dev, __le32 *txwi, 
}

EXPORT_SYMBOL_GPL(mt7615_mac_write_txwi);



static void

mt7615_txp_skb_unmap_fw(struct mt76_dev *dev, struct mt76_connac_fw_txp *txp)

{

	int i;



	for (i = 0; i < txp->nbuf; i++)

		dma_unmap_single(dev->dev, le32_to_cpu(txp->buf[i]),

				 le16_to_cpu(txp->len[i]), DMA_TO_DEVICE);

}



static void

mt7615_txp_skb_unmap_hw(struct mt76_dev *dev, struct mt76_connac_hw_txp *txp)

{

	u32 last_mask;

	int i;



	last_mask = is_mt7663(dev) ? MT_TXD_LEN_LAST : MT_TXD_LEN_MSDU_LAST;



	for (i = 0; i < ARRAY_SIZE(txp->ptr); i++) {

		struct mt76_connac_txp_ptr *ptr = &txp->ptr[i];

		bool last;

		u16 len;



		len = le16_to_cpu(ptr->len0);

		last = len & last_mask;

		len &= MT_TXD_LEN_MASK;

		dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,

				 DMA_TO_DEVICE);

		if (last)

			break;



		len = le16_to_cpu(ptr->len1);

		last = len & last_mask;

		len &= MT_TXD_LEN_MASK;

		dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,

				 DMA_TO_DEVICE);

		if (last)

			break;

	}

}



void mt7615_txp_skb_unmap(struct mt76_dev *dev,

			  struct mt76_txwi_cache *t)

{

	struct mt76_connac_txp_common *txp;



	txp = mt76_connac_txwi_to_txp(dev, t);

	if (is_mt7615(dev))

		mt7615_txp_skb_unmap_fw(dev, &txp->fw);

	else

		mt7615_txp_skb_unmap_hw(dev, &txp->hw);

}

EXPORT_SYMBOL_GPL(mt7615_txp_skb_unmap);



bool mt7615_mac_wtbl_update(struct mt7615_dev *dev, int idx, u32 mask)

{

	mt76_rmw(dev, MT_WTBL_UPDATE, MT_WTBL_UPDATE_WLAN_IDX,
@@ -1608,7 +1554,7 @@ mt7615_txwi_free(struct mt7615_dev *dev, struct mt76_txwi_cache *txwi) 
	u32 val;

	u8 wcid;



	mt7615_txp_skb_unmap(mdev, txwi);

	mt76_connac_txp_skb_unmap(mdev, txwi);

	if (!txwi->skb)

		goto out;

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

+0 −2
Original line number Diff line number Diff line
@@ -517,8 +517,6 @@ int mt7615_mac_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif, 
void mt7615_mac_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,

			   struct ieee80211_sta *sta);

void mt7615_mac_work(struct work_struct *work);

void mt7615_txp_skb_unmap(struct mt76_dev *dev,

			  struct mt76_txwi_cache *txwi);

int mt7615_mcu_set_rx_hdr_trans_blacklist(struct mt7615_dev *dev);

int mt7615_mcu_set_fcc5_lpn(struct mt7615_dev *dev, int val);

int mt7615_mcu_set_pulse_th(struct mt7615_dev *dev,

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

+2 −0
Original line number Diff line number Diff line
@@ -327,6 +327,8 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm) 
void mt76_connac_write_hw_txp(struct mt76_dev *dev,

			      struct mt76_tx_info *tx_info,

			      void *txp_ptr, u32 id);

void mt76_connac_txp_skb_unmap(struct mt76_dev *dev,

			       struct mt76_txwi_cache *txwi);

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,

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

+60 −0
Original line number Diff line number Diff line
@@ -191,6 +191,66 @@ void mt76_connac_write_hw_txp(struct mt76_dev *dev, 
}

EXPORT_SYMBOL_GPL(mt76_connac_write_hw_txp);



static void

mt76_connac_txp_skb_unmap_fw(struct mt76_dev *mdev,

			     struct mt76_connac_fw_txp *txp)

{

	struct device *dev = is_connac_v1(mdev) ? mdev->dev : mdev->dma_dev;

	int i;



	for (i = 0; i < txp->nbuf; i++)

		dma_unmap_single(dev, le32_to_cpu(txp->buf[i]),

				 le16_to_cpu(txp->len[i]), DMA_TO_DEVICE);

}



static void

mt76_connac_txp_skb_unmap_hw(struct mt76_dev *dev,

			     struct mt76_connac_hw_txp *txp)

{

	u32 last_mask;

	int i;



	if (is_mt7663(dev) || is_mt7921(dev))

		last_mask = MT_TXD_LEN_LAST;

	else

		last_mask = MT_TXD_LEN_MSDU_LAST;



	for (i = 0; i < ARRAY_SIZE(txp->ptr); i++) {

		struct mt76_connac_txp_ptr *ptr = &txp->ptr[i];

		bool last;

		u16 len;



		len = le16_to_cpu(ptr->len0);

		last = len & last_mask;

		len &= MT_TXD_LEN_MASK;

		dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf0), len,

				 DMA_TO_DEVICE);

		if (last)

			break;



		len = le16_to_cpu(ptr->len1);

		last = len & last_mask;

		len &= MT_TXD_LEN_MASK;

		dma_unmap_single(dev->dev, le32_to_cpu(ptr->buf1), len,

				 DMA_TO_DEVICE);

		if (last)

			break;

	}

}



void mt76_connac_txp_skb_unmap(struct mt76_dev *dev,

			       struct mt76_txwi_cache *t)

{

	struct mt76_connac_txp_common *txp;



	txp = mt76_connac_txwi_to_txp(dev, t);

	if (is_mt76_fw_txp(dev))

		mt76_connac_txp_skb_unmap_fw(dev, &txp->fw);

	else

		mt76_connac_txp_skb_unmap_hw(dev, &txp->hw);

}

EXPORT_SYMBOL_GPL(mt76_connac_txp_skb_unmap);



static u16

mt76_connac2_mac_tx_rate_val(struct mt76_phy *mphy, struct ieee80211_vif *vif,

			     bool beacon, bool mcast)

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

+1 −13
Original line number Diff line number Diff line
@@ -804,18 +804,6 @@ mt7915_tx_check_aggr(struct ieee80211_sta *sta, __le32 *txwi) 
		ieee80211_start_tx_ba_session(sta, tid, 0);

}



static void

mt7915_txp_skb_unmap(struct mt76_dev *dev, struct mt76_txwi_cache *t)

{

	struct mt76_connac_fw_txp *txp;

	int i;



	txp = mt76_connac_txwi_to_txp(dev, t);

	for (i = 0; i < txp->nbuf; i++)

		dma_unmap_single(dev->dma_dev, le32_to_cpu(txp->buf[i]),

				 le16_to_cpu(txp->len[i]), DMA_TO_DEVICE);

}



static void

mt7915_txwi_free(struct mt7915_dev *dev, struct mt76_txwi_cache *t,

		 struct ieee80211_sta *sta, struct list_head *free_list)
@@ -826,7 +814,7 @@ mt7915_txwi_free(struct mt7915_dev *dev, struct mt76_txwi_cache *t, 
	__le32 *txwi;

	u16 wcid_idx;



	mt7915_txp_skb_unmap(mdev, t);

	mt76_connac_txp_skb_unmap(mdev, t);

	if (!t->skb)

		goto out;