mt76: move tx_tasklet management in mt76x02-lib moudle (53d20fdb) · Commits · 戴 / test

drivers/net/wireless/mediatek/mt76/mt76x0/pci.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -166,7 +166,7 @@ static void mt76x0e_cleanup(struct mt76x02_dev *dev)
		clear_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);
		mt76x0_chip_onoff(dev, false, false);
		mt76x0e_stop_hw(dev);
		mt76_dma_cleanup(&dev->mt76);
		mt76x02_dma_cleanup(dev);
		mt76x02_mcu_cleanup(&dev->mt76);
		}

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -72,5 +72,6 @@ mt76x02_wait_for_wpdma(struct mt76_dev *dev, int timeout)

		int mt76x02_dma_init(struct mt76x02_dev *dev);
		void mt76x02_dma_disable(struct mt76x02_dev *dev);
		void mt76x02_dma_cleanup(struct mt76x02_dev *dev);

		#endif /* __MT76x02_DMA_H */

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

+41 −1

Original line number	Diff line number	Diff line
		@@ -57,16 +57,49 @@ mt76x02_init_rx_queue(struct mt76x02_dev dev, struct mt76_queue q,
		return 0;
		}

		static void mt76x02_process_tx_status_fifo(struct mt76x02_dev *dev)
		{
		struct mt76x02_tx_status stat;
		u8 update = 1;

		while (kfifo_get(&dev->txstatus_fifo, &stat))
		mt76x02_send_tx_status(&dev->mt76, &stat, &update);
		}

		static void mt76x02_tx_tasklet(unsigned long data)
		{
		struct mt76x02_dev dev = (struct mt76x02_dev )data;
		int i;

		mt76x02_process_tx_status_fifo(dev);

		for (i = MT_TXQ_MCU; i >= 0; i--)
		mt76_queue_tx_cleanup(dev, i, false);

		mt76x02_mac_poll_tx_status(dev, false);
		mt76x02_irq_enable(dev, MT_INT_TX_DONE_ALL);
		}

		int mt76x02_dma_init(struct mt76x02_dev *dev)
		{
		struct mt76_txwi_cache __maybe_unused *t;
		int i, ret, fifo_size;
		struct mt76_queue *q;
		int i, ret;
		void *status_fifo;

		BUILD_BUG_ON(sizeof(t->txwi) < sizeof(struct mt76x02_txwi));
		BUILD_BUG_ON(sizeof(struct mt76x02_rxwi) > MT_RX_HEADROOM);

		fifo_size = roundup_pow_of_two(32 * sizeof(struct mt76x02_tx_status));
		status_fifo = devm_kzalloc(dev->mt76.dev, fifo_size, GFP_KERNEL);
		if (!status_fifo)
		return -ENOMEM;

		tasklet_init(&dev->tx_tasklet, mt76x02_tx_tasklet, (unsigned long) dev);
		kfifo_init(&dev->txstatus_fifo, status_fifo, fifo_size);

		mt76_dma_attach(&dev->mt76);

		mt76_wr(dev, MT_WPDMA_RST_IDX, ~0);

		for (i = 0; i < IEEE80211_NUM_ACS; i++) {
		@@ -132,6 +165,13 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev)
		}
		EXPORT_SYMBOL_GPL(mt76x02_dma_enable);

		void mt76x02_dma_cleanup(struct mt76x02_dev *dev)
		{
		tasklet_kill(&dev->tx_tasklet);
		mt76_dma_cleanup(&dev->mt76);
		}
		EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup);

		void mt76x02_dma_disable(struct mt76x02_dev *dev)
		{
		u32 val = mt76_rr(dev, MT_WPDMA_GLO_CFG);

drivers/net/wireless/mediatek/mt76/mt76x2/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ mt76x2-common-y := \
		eeprom.o mac.o init.o phy.o debugfs.o mcu.o

		mt76x2e-y := \
		pci.o pci_dma.o pci_main.o pci_init.o pci_tx.o \
		pci.o pci_main.o pci_init.o pci_tx.o \
		pci_core.o pci_mac.o pci_mcu.o pci_phy.o \
		pci_dfs.o pci_trace.o

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

+0 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ int mt76x2_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx,
		struct sk_buff *skb);
		void mt76x2_mac_set_beacon_enable(struct mt76x02_dev *dev, u8 vif_idx, bool val);

		void mt76x2_mac_process_tx_status_fifo(struct mt76x02_dev *dev);

		void mt76x2_mac_work(struct work_struct *work);

		#endif

Admin message