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

mt76: connac: move tx initialization/cleanup in mt76_connac module 



Move mt76_connac_init_tx_queues and mt76_connac_tx_cleanup routines
in mt76_connac module. This is a preliminary patch to add mt7990
chipset support.

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

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

+3 −6
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ mt7622_init_tx_queues_multi(struct mt7615_dev *dev) 
static int

mt7615_init_tx_queues(struct mt7615_dev *dev)

{

	int ret, i;

	int ret;



	ret = mt76_init_mcu_queue(&dev->mt76, MT_MCUQ_FWDL, MT7615_TXQ_FWDL,

				  MT7615_TX_FWDL_RING_SIZE, MT_TX_RING_BASE);
@@ -54,14 +54,11 @@ mt7615_init_tx_queues(struct mt7615_dev *dev) 
	if (!is_mt7615(&dev->mt76))

		return mt7622_init_tx_queues_multi(dev);



	ret = mt76_init_tx_queue(&dev->mphy, 0, 0, MT7615_TX_RING_SIZE,

	ret = mt76_connac_init_tx_queues(&dev->mphy, 0, MT7615_TX_RING_SIZE,

					 MT_TX_RING_BASE, 0);

	if (ret)

		return ret;



	for (i = 1; i <= MT_TXQ_PSD ; i++)

		dev->mphy.q_tx[i] = dev->mphy.q_tx[0];



	return mt76_init_mcu_queue(&dev->mt76, MT_MCUQ_WM, MT7615_TXQ_MCU,

				   MT7615_TX_MCU_RING_SIZE, MT_TX_RING_BASE);

}

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

+8 −0
Original line number Diff line number Diff line
@@ -261,6 +261,12 @@ void mt76_connac_power_save_sched(struct mt76_phy *phy, 
void mt76_connac_free_pending_tx_skbs(struct mt76_connac_pm *pm,

				      struct mt76_wcid *wcid);



static inline void mt76_connac_tx_cleanup(struct mt76_dev *dev)

{

	dev->queue_ops->tx_cleanup(dev, dev->q_mcu[MT_MCUQ_WM], false);

	dev->queue_ops->tx_cleanup(dev, dev->q_mcu[MT_MCUQ_WA], false);

}



static inline bool

mt76_connac_pm_ref(struct mt76_phy *phy, struct mt76_connac_pm *pm)

{
@@ -323,6 +329,8 @@ mt76_connac_mutex_release(struct mt76_dev *dev, struct mt76_connac_pm *pm) 
	mutex_unlock(&dev->mutex);

}



int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,

			       int ring_base, u32 flags);

void mt76_connac_write_hw_txp(struct mt76_dev *dev,

			      struct mt76_tx_info *tx_info,

			      void *txp_ptr, u32 id);

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

+16 −0
Original line number Diff line number Diff line
@@ -251,6 +251,22 @@ void mt76_connac_txp_skb_unmap(struct mt76_dev *dev, 
}

EXPORT_SYMBOL_GPL(mt76_connac_txp_skb_unmap);



int mt76_connac_init_tx_queues(struct mt76_phy *phy, int idx, int n_desc,

			       int ring_base, u32 flags)

{

	int i, err;



	err = mt76_init_tx_queue(phy, 0, idx, n_desc, ring_base, flags);

	if (err < 0)

		return err;



	for (i = 1; i <= MT_TXQ_PSD; i++)

		phy->q_tx[i] = phy->q_tx[0];



	return 0;

}

EXPORT_SYMBOL_GPL(mt76_connac_init_tx_queues);



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/dma.c

+3 −19
Original line number Diff line number Diff line
@@ -9,29 +9,14 @@ static int 
mt7915_init_tx_queues(struct mt7915_phy *phy, int idx, int n_desc, int ring_base)

{

	struct mt7915_dev *dev = phy->dev;

	int i, err;



	if (mtk_wed_device_active(&phy->dev->mt76.mmio.wed)) {

		ring_base = MT_WED_TX_RING_BASE;

		idx -= MT_TXQ_ID(0);

	}



	err = mt76_init_tx_queue(phy->mt76, 0, idx, n_desc, ring_base,

	return mt76_connac_init_tx_queues(phy->mt76, idx, n_desc, ring_base,

					  MT_WED_Q_TX(idx));

	if (err < 0)

		return err;



	for (i = 0; i <= MT_TXQ_PSD; i++)

		phy->mt76->q_tx[i] = phy->mt76->q_tx[0];



	return 0;

}



static void

mt7915_tx_cleanup(struct mt7915_dev *dev)

{

	mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_WM], false);

	mt76_queue_tx_cleanup(dev, dev->mt76.q_mcu[MT_MCUQ_WA], false);

}



static int mt7915_poll_tx(struct napi_struct *napi, int budget)
@@ -40,8 +25,7 @@ static int mt7915_poll_tx(struct napi_struct *napi, int budget) 


	dev = container_of(napi, struct mt7915_dev, mt76.tx_napi);



	mt7915_tx_cleanup(dev);



	mt76_connac_tx_cleanup(&dev->mt76);

	if (napi_complete_done(napi, 0))

		mt7915_irq_enable(dev, MT_INT_TX_DONE_MCU);

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

+4 −17
Original line number Diff line number Diff line
@@ -5,20 +5,6 @@ 
#include "../dma.h"

#include "mac.h"



static int mt7921_init_tx_queues(struct mt7921_phy *phy, int idx, int n_desc)

{

	int i, err;



	err = mt76_init_tx_queue(phy->mt76, 0, idx, n_desc, MT_TX_RING_BASE, 0);

	if (err < 0)

		return err;



	for (i = 0; i <= MT_TXQ_PSD; i++)

		phy->mt76->q_tx[i] = phy->mt76->q_tx[0];



	return 0;

}



static int mt7921_poll_tx(struct napi_struct *napi, int budget)

{

	struct mt7921_dev *dev;
@@ -31,7 +17,7 @@ static int mt7921_poll_tx(struct napi_struct *napi, int budget) 
		return 0;

	}



	mt7921_mcu_tx_cleanup(dev);

	mt76_connac_tx_cleanup(&dev->mt76);

	if (napi_complete(napi))

		mt7921_irq_enable(dev, MT_INT_TX_DONE_ALL);

	mt76_connac_pm_unref(&dev->mphy, &dev->pm);
@@ -250,8 +236,9 @@ int mt7921_dma_init(struct mt7921_dev *dev) 
		return ret;



	/* init tx queue */

	ret = mt7921_init_tx_queues(&dev->phy, MT7921_TXQ_BAND0,

				    MT7921_TX_RING_SIZE);

	ret = mt76_connac_init_tx_queues(dev->phy.mt76, MT7921_TXQ_BAND0,

					 MT7921_TX_RING_SIZE,

					 MT_TX_RING_BASE, 0);

	if (ret)

		return ret;