mt76: move irq handler in mt76x02-lib moudle (9b43960b) · Commits · 戴 / test

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -146,6 +146,8 @@ void mt76x02_tx_complete(struct mt76_dev dev, struct sk_buff skb);
	bool mt76x02_tx_status_data(struct mt76_dev dev, u8 update);		bool mt76x02_tx_status_data(struct mt76_dev dev, u8 update);
	void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,		void mt76x02_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
	struct sk_buff *skb);		struct sk_buff *skb);
			void mt76x02_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);
			irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance);
	void mt76x02_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,		void mt76x02_tx(struct ieee80211_hw hw, struct ieee80211_tx_control control,
	struct sk_buff *skb);		struct sk_buff *skb);
	int mt76x02_tx_prepare_skb(struct mt76_dev mdev, void txwi,		int mt76x02_tx_prepare_skb(struct mt76_dev mdev, void txwi,

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

+62 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,8 +16,10 @@
	*/		*/

	#include <linux/kernel.h>		#include <linux/kernel.h>
			#include <linux/irq.h>

	#include "mt76x02.h"		#include "mt76x02.h"
			#include "mt76x02_trace.h"

	static int		static int
	mt76x02_init_tx_queue(struct mt76x02_dev dev, struct mt76_queue q,		mt76x02_init_tx_queue(struct mt76x02_dev dev, struct mt76_queue q,
	@@ -136,6 +138,66 @@ int mt76x02_dma_init(struct mt76x02_dev *dev)
	}		}
	EXPORT_SYMBOL_GPL(mt76x02_dma_init);		EXPORT_SYMBOL_GPL(mt76x02_dma_init);

			void mt76x02_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q)
			{
			struct mt76x02_dev *dev;

			dev = container_of(mdev, struct mt76x02_dev, mt76);
			mt76x02_irq_enable(dev, MT_INT_RX_DONE(q));
			}
			EXPORT_SYMBOL_GPL(mt76x02_rx_poll_complete);

			irqreturn_t mt76x02_irq_handler(int irq, void *dev_instance)
			{
			struct mt76x02_dev *dev = dev_instance;
			u32 intr;

			intr = mt76_rr(dev, MT_INT_SOURCE_CSR);
			mt76_wr(dev, MT_INT_SOURCE_CSR, intr);

			if (!test_bit(MT76_STATE_INITIALIZED, &dev->mt76.state))
			return IRQ_NONE;

			trace_dev_irq(dev, intr, dev->mt76.mmio.irqmask);

			intr &= dev->mt76.mmio.irqmask;

			if (intr & MT_INT_TX_DONE_ALL) {
			mt76x02_irq_disable(dev, MT_INT_TX_DONE_ALL);
			tasklet_schedule(&dev->tx_tasklet);
			}

			if (intr & MT_INT_RX_DONE(0)) {
			mt76x02_irq_disable(dev, MT_INT_RX_DONE(0));
			napi_schedule(&dev->mt76.napi[0]);
			}

			if (intr & MT_INT_RX_DONE(1)) {
			mt76x02_irq_disable(dev, MT_INT_RX_DONE(1));
			napi_schedule(&dev->mt76.napi[1]);
			}

			if (intr & MT_INT_PRE_TBTT)
			tasklet_schedule(&dev->pre_tbtt_tasklet);

			/* send buffered multicast frames now */
			if (intr & MT_INT_TBTT)
			mt76_queue_kick(dev, &dev->mt76.q_tx[MT_TXQ_PSD]);

			if (intr & MT_INT_TX_STAT) {
			mt76x02_mac_poll_tx_status(dev, true);
			tasklet_schedule(&dev->tx_tasklet);
			}

			if (intr & MT_INT_GPTIMER) {
			mt76x02_irq_disable(dev, MT_INT_GPTIMER);
			tasklet_schedule(&dev->dfs_pd.dfs_tasklet);
			}

			return IRQ_HANDLED;
			}
			EXPORT_SYMBOL_GPL(mt76x02_irq_handler);

	void mt76x02_set_irq_mask(struct mt76x02_dev *dev, u32 clear, u32 set)		void mt76x02_set_irq_mask(struct mt76x02_dev *dev, u32 clear, u32 set)
	{		{
	unsigned long flags;		unsigned long flags;

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

+23 −0

Original line number	Original line	Diff line number	Diff line
	@@ -110,6 +110,29 @@ TRACE_EVENT(mac_txstat_fetch,
	)		)
	);		);

			TRACE_EVENT(dev_irq,
			TP_PROTO(struct mt76x02_dev *dev, u32 val, u32 mask),

			TP_ARGS(dev, val, mask),

			TP_STRUCT__entry(
			DEV_ENTRY
			__field(u32, val)
			__field(u32, mask)
			),

			TP_fast_assign(
			DEV_ASSIGN;
			__entry->val = val;
			__entry->mask = mask;
			),

			TP_printk(
			DEV_PR_FMT " %08x & %08x",
			DEV_PR_ARG, __entry->val, __entry->mask
			)
			);

	#endif		#endif

	#undef TRACE_INCLUDE_PATH		#undef TRACE_INCLUDE_PATH

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

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -7,8 +7,7 @@ mt76x2-common-y := \

	mt76x2e-y := \		mt76x2e-y := \
	pci.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_mac.o pci_mcu.o pci_phy.o pci_dfs.o
	pci_dfs.o pci_trace.o

	mt76x2u-y := \		mt76x2u-y := \
	usb.o usb_init.o usb_main.o usb_mac.o usb_mcu.o \		usb.o usb_init.o usb_main.o usb_mac.o usb_mcu.o \

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

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -60,7 +60,6 @@ int mt76x2_register_device(struct mt76x02_dev *dev);
	void mt76x2_init_debugfs(struct mt76x02_dev *dev);		void mt76x2_init_debugfs(struct mt76x02_dev *dev);
	void mt76x2_init_device(struct mt76x02_dev *dev);		void mt76x2_init_device(struct mt76x02_dev *dev);

	irqreturn_t mt76x2_irq_handler(int irq, void *dev_instance);
	void mt76x2_phy_power_on(struct mt76x02_dev *dev);		void mt76x2_phy_power_on(struct mt76x02_dev *dev);
	int mt76x2_init_hardware(struct mt76x02_dev *dev);		int mt76x2_init_hardware(struct mt76x02_dev *dev);
	void mt76x2_stop_hardware(struct mt76x02_dev *dev);		void mt76x2_stop_hardware(struct mt76x02_dev *dev);
	@@ -87,8 +86,6 @@ void mt76x2_mac_set_tx_protection(struct mt76x02_dev *dev, u32 val);

	void mt76x2_pre_tbtt_tasklet(unsigned long arg);		void mt76x2_pre_tbtt_tasklet(unsigned long arg);

	void mt76x2_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q);

	void mt76x2_sta_ps(struct mt76_dev dev, struct ieee80211_sta sta, bool ps);		void mt76x2_sta_ps(struct mt76_dev dev, struct ieee80211_sta sta, bool ps);

	void mt76x2_update_channel(struct mt76_dev *mdev);		void mt76x2_update_channel(struct mt76_dev *mdev);

Admin message