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

mt76: move mcu queues to mt76_dev q_mcu array 



Move mcu queue to a dedicated array q_mcu in mt76_dev structure.
This is a preliminary patch to move data queues in mt76_phy and properly
support dbdc

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

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

+4 −0
Original line number Diff line number Diff line
@@ -660,9 +660,13 @@ void mt76_dma_cleanup(struct mt76_dev *dev) 


	mt76_worker_disable(&dev->tx_worker);

	netif_napi_del(&dev->tx_napi);



	for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)

		mt76_dma_tx_cleanup(dev, dev->q_tx[i], true);



	for (i = 0; i < ARRAY_SIZE(dev->q_mcu); i++)

		mt76_dma_tx_cleanup(dev, dev->q_mcu[i], true);



	mt76_for_each_q_rx(dev, i) {

		netif_napi_del(&dev->napi[i]);

		mt76_dma_rx_cleanup(dev, &dev->q_rx[i]);

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

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ int mt76_mcu_send_firmware(struct mt76_dev *dev, int cmd, const void *data, 
		len -= cur_len;



		if (dev->queue_ops->tx_cleanup)

			dev->queue_ops->tx_cleanup(dev, dev->q_tx[MT_TXQ_FWDL],

			dev->queue_ops->tx_cleanup(dev,

						   dev->q_mcu[MT_MCUQ_FWDL],

						   false);

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -64,15 +64,15 @@ enum mt76_txq_id { 
	MT_TXQ_BE = IEEE80211_AC_BE,

	MT_TXQ_BK = IEEE80211_AC_BK,

	MT_TXQ_PSD,

	MT_TXQ_MCU,

	MT_TXQ_MCU_WA,

	MT_TXQ_BEACON,

	MT_TXQ_CAB,

	MT_TXQ_FWDL,

	__MT_TXQ_MAX

};



enum mt76_mcuq_id {

	MT_MCUQ_WM,

	MT_MCUQ_WA,

	MT_MCUQ_FWDL,

	__MT_MCUQ_MAX

};
@@ -811,7 +811,7 @@ static inline int mt76_init_mcu_queue(struct mt76_dev *dev, int qid, int idx, 
	if (IS_ERR(q))

		return PTR_ERR(q);



	q->qid = qid;

	q->qid = __MT_TXQ_MAX + qid;

	dev->q_mcu[qid] = q;



	return 0;

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

+24 −27
Original line number Diff line number Diff line
@@ -4,21 +4,6 @@ 
#include "mac.h"

#include "../dma.h"



static int

mt7603_init_tx_queue(struct mt7603_dev *dev, int qid, int idx, int n_desc)

{

	int err;



	err = mt76_init_tx_queue(&dev->mphy, qid, idx, n_desc,

				 MT_TX_RING_BASE);

	if (err < 0)

		return err;



	mt7603_irq_enable(dev, MT_INT_TX_DONE(idx));



	return 0;

}



static void

mt7603_rx_loopback_skb(struct mt7603_dev *dev, struct sk_buff *skb)

{
@@ -146,13 +131,15 @@ static int mt7603_poll_tx(struct napi_struct *napi, int budget) 
	dev = container_of(napi, struct mt7603_dev, mt76.tx_napi);

	dev->tx_dma_check = 0;



	for (i = MT_TXQ_MCU; i >= 0; i--)

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

	for (i = MT_TXQ_PSD; i >= 0; i--)

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



	if (napi_complete_done(napi, 0))

		mt7603_irq_enable(dev, MT_INT_TX_DONE_ALL);



	for (i = MT_TXQ_MCU; i >= 0; i--)

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

	for (i = MT_TXQ_PSD; i >= 0; i--)

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



	mt7603_mac_sta_poll(dev);
@@ -185,32 +172,42 @@ int mt7603_dma_init(struct mt7603_dev *dev) 
	mt7603_pse_client_reset(dev);



	for (i = 0; i < ARRAY_SIZE(wmm_queue_map); i++) {

		ret = mt7603_init_tx_queue(dev, i, wmm_queue_map[i],

					   MT7603_TX_RING_SIZE);

		ret = mt76_init_tx_queue(&dev->mphy, i, wmm_queue_map[i],

					 MT7603_TX_RING_SIZE, MT_TX_RING_BASE);

		if (ret)

			return ret;

	}



	ret = mt7603_init_tx_queue(dev, MT_TXQ_PSD,

				   MT_TX_HW_QUEUE_MGMT, MT7603_PSD_RING_SIZE);

	ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_PSD, MT_TX_HW_QUEUE_MGMT,

				 MT7603_PSD_RING_SIZE, MT_TX_RING_BASE);

	if (ret)

		return ret;



	ret = mt7603_init_tx_queue(dev, MT_TXQ_MCU,

				   MT_TX_HW_QUEUE_MCU, MT_MCU_RING_SIZE);

	ret = mt76_init_mcu_queue(&dev->mt76, MT_MCUQ_WM, MT_TX_HW_QUEUE_MCU,

				  MT_MCU_RING_SIZE, MT_TX_RING_BASE);

	if (ret)

		return ret;



	ret = mt7603_init_tx_queue(dev, MT_TXQ_BEACON,

				   MT_TX_HW_QUEUE_BCN, MT_MCU_RING_SIZE);

	ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_BEACON, MT_TX_HW_QUEUE_BCN,

				 MT_MCU_RING_SIZE, MT_TX_RING_BASE);

	if (ret)

		return ret;



	ret = mt7603_init_tx_queue(dev, MT_TXQ_CAB,

				   MT_TX_HW_QUEUE_BMC, MT_MCU_RING_SIZE);

	ret = mt76_init_tx_queue(&dev->mphy, MT_TXQ_CAB, MT_TX_HW_QUEUE_BMC,

				 MT_MCU_RING_SIZE, MT_TX_RING_BASE);

	if (ret)

		return ret;



	mt7603_irq_enable(dev,

			  MT_INT_TX_DONE(IEEE80211_AC_VO) |

			  MT_INT_TX_DONE(IEEE80211_AC_VI) |

			  MT_INT_TX_DONE(IEEE80211_AC_BE) |

			  MT_INT_TX_DONE(IEEE80211_AC_BK) |

			  MT_INT_TX_DONE(MT_TX_HW_QUEUE_MGMT) |

			  MT_INT_TX_DONE(MT_TX_HW_QUEUE_MCU) |

			  MT_INT_TX_DONE(MT_TX_HW_QUEUE_BCN) |

			  MT_INT_TX_DONE(MT_TX_HW_QUEUE_BMC));



	ret = mt7603_init_rx_queue(dev, &dev->mt76.q_rx[MT_RXQ_MCU], 1,

				   MT7603_MCU_RX_RING_SIZE, MT_RX_BUF_SIZE);

	if (ret)

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

+1 −0
Original line number Diff line number Diff line
@@ -1434,6 +1434,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev) 


	mt7603_pse_client_reset(dev);



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

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

		mt76_queue_tx_cleanup(dev, dev->mt76.q_tx[i], true);