mt76: move wait_for_wpdma in mt76x02_dma.h (5f1fa4cd) · Commits · 戴 / test

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		#define __MT76x02_DMA_H

		#include "dma.h"
		#include "mt76x02_regs.h"

		#define MT_TXD_INFO_LEN GENMASK(15, 0)
		#define MT_TXD_INFO_NEXT_VLD BIT(16)
		@@ -57,4 +58,13 @@ enum dma_msg_port {
		DISCARD,
		};

		static inline bool
		mt76x02_wait_for_wpdma(struct mt76_dev *dev, int timeout)
		{
		return __mt76_poll(dev, MT_WPDMA_GLO_CFG,
		MT_WPDMA_GLO_CFG_TX_DMA_BUSY \|
		MT_WPDMA_GLO_CFG_RX_DMA_BUSY,
		0, timeout);
		}

		#endif /* __MT76x02_DMA_H */

+0 −8

Original line number	Diff line number	Diff line
		@@ -151,14 +151,6 @@ static inline bool mt76x2_wait_for_bbp(struct mt76x2_dev *dev)
		0, 100);
		}

		static inline bool wait_for_wpdma(struct mt76x2_dev *dev)
		{
		return mt76_poll(dev, MT_WPDMA_GLO_CFG,
		MT_WPDMA_GLO_CFG_TX_DMA_BUSY \|
		MT_WPDMA_GLO_CFG_RX_DMA_BUSY,
		0, 1000);
		}

		extern const struct ieee80211_ops mt76x2_ops;

		struct mt76x2_dev mt76x2_alloc_device(struct device pdev);

+2 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@
		#include "mt76x2_eeprom.h"
		#include "mt76x2_mcu.h"
		#include "mt76x02_util.h"
		#include "mt76x02_dma.h"

		static void
		mt76x2_mac_pbf_init(struct mt76x2_dev *dev)
		@@ -206,7 +207,7 @@ int mt76x2_mac_start(struct mt76x2_dev *dev)
		memset(dev->aggr_stats, 0, sizeof(dev->aggr_stats));

		mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);
		wait_for_wpdma(dev);
		mt76x02_wait_for_wpdma(&dev->mt76, 1000);
		usleep_range(50, 100);

		mt76_set(dev, MT_WPDMA_GLO_CFG,

+1 −1

Original line number	Diff line number	Diff line
		@@ -119,7 +119,7 @@ int mt76x2u_mac_start(struct mt76x2_dev *dev)
		mt76x2u_mac_reset_counters(dev);

		mt76_wr(dev, MT_MAC_SYS_CTRL, MT_MAC_SYS_CTRL_ENABLE_TX);
		wait_for_wpdma(dev);
		mt76x02_wait_for_wpdma(&dev->mt76, 1000);
		usleep_range(50, 100);

		mt76_wr(dev, MT_RX_FILTR_CFG, dev->mt76.rxfilter);