Commit 76027f40 authored by Felix Fietkau's avatar Felix Fietkau
Browse files

mt76: mt7915: bring up the WA event rx queue for band1 



This is needed for DBDC cards to work correctly on both bands simultaneously

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 95f381c5

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

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ enum mt76_rxq_id { 
	MT_RXQ_MCU,

	MT_RXQ_MCU_WA,

	MT_RXQ_EXT,

	MT_RXQ_EXT_WA,

	__MT_RXQ_MAX

};

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

+8 −0
Original line number Diff line number Diff line
@@ -286,6 +286,14 @@ int mt7915_dma_init(struct mt7915_dev *dev) 
				       rx_buf_size, MT_RX_DATA_RING_BASE);

		if (ret)

			return ret;



		/* event from WA */

		ret = mt76_queue_alloc(dev, &dev->mt76.q_rx[MT_RXQ_EXT_WA],

				       MT7915_RXQ_MCU_WA_EXT,

				       MT7915_RX_MCU_RING_SIZE,

				       rx_buf_size, MT_RX_EVENT_RING_BASE);

		if (ret)

			return ret;

	}



	ret = mt76_init_queues(dev);

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

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ enum mt7915_rxq_id { 
	MT7915_RXQ_BAND1,

	MT7915_RXQ_MCU_WM = 0,

	MT7915_RXQ_MCU_WA,

	MT7915_RXQ_MCU_WA_EXT,

};



struct mt7915_sta_stats {

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

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ mt7915_rx_poll_complete(struct mt76_dev *mdev, enum mt76_rxq_id q) 
		[MT_RXQ_EXT] = MT_INT_RX_DONE_DATA1,

		[MT_RXQ_MCU] = MT_INT_RX_DONE_WM,

		[MT_RXQ_MCU_WA] = MT_INT_RX_DONE_WA,

		[MT_RXQ_EXT_WA] = MT_INT_RX_DONE_WA_EXT,

	};



	mt7915_irq_enable(dev, rx_irq_mask[q]);
@@ -67,6 +68,9 @@ static irqreturn_t mt7915_irq_handler(int irq, void *dev_instance) 
	if (intr & MT_INT_RX_DONE_WA)

		napi_schedule(&dev->mt76.napi[MT_RXQ_MCU_WA]);



	if (intr & MT_INT_RX_DONE_WA_EXT)

		napi_schedule(&dev->mt76.napi[MT_RXQ_EXT_WA]);



	if (intr & MT_INT_MCU_CMD) {

		u32 val = mt76_rr(dev, MT_MCU_CMD);

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

+2 −1
Original line number Diff line number Diff line
@@ -348,7 +348,8 @@ 
#define MT_INT_RX_DONE_DATA1		BIT(17)

#define MT_INT_RX_DONE_WM		BIT(0)

#define MT_INT_RX_DONE_WA		BIT(1)

#define MT_INT_RX_DONE_ALL		(BIT(0) | BIT(1) | GENMASK(17, 16))

#define MT_INT_RX_DONE_WA_EXT		BIT(2)

#define MT_INT_RX_DONE_ALL		(GENMASK(2, 0) | GENMASK(17, 16))

#define MT_INT_TX_DONE_MCU_WA		BIT(15)

#define MT_INT_TX_DONE_FWDL		BIT(26)

#define MT_INT_TX_DONE_MCU_WM		BIT(27)