[PATCH rtw-next 5/5] wifi: rtw88: pci: Handle more RX interrupts for RTL8821AE

[Bitterblue Smith <rtl8821cerfe2@gmail.com>]

RTL8821AE can raise IMR_RDU (RX descriptor unavailable) and IMR_RXFOVW
(RX FIFO overflow). If they are not handled, RX stops. Based on the
vendor driver and rtlwifi, the way to handle these is the same as the
normal IMR_ROK, so do that.

Move irq_mask from struct rtw_pci to struct rtw_pci_gen in order to
enable these new interrupts only for RTL8821AE and RTL8812AE.

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
---
Perhaps moving irq_mask is not necessary. The RTL8822CE, RTL8822BE,
RTL8821CE, RTL8723DE, and RTL8814AE vendor drivers enable these
interrupts, so maybe they can be enabled for all the chips.
---
 drivers/net/wireless/realtek/rtw88/pci.c     | 41 +++++++++-----------
 drivers/net/wireless/realtek/rtw88/pci.h     |  3 +-
 drivers/net/wireless/realtek/rtw88/pci_old.c |  7 ++++
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
index 35f45e3ede81..ee693395b8d3 100644
--- a/drivers/net/wireless/realtek/rtw88/pci.c
+++ b/drivers/net/wireless/realtek/rtw88/pci.c
@@ -373,20 +373,6 @@ static int rtw_pci_init(struct rtw_dev *rtwdev)
 	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;
 	int ret = 0;
 
-	rtwpci->irq_mask[0] = IMR_HIGHDOK |
-			      IMR_MGNTDOK |
-			      IMR_BKDOK |
-			      IMR_BEDOK |
-			      IMR_VIDOK |
-			      IMR_VODOK |
-			      IMR_ROK |
-			      IMR_BCNDMAINT_E |
-			      IMR_C2HCMD |
-			      0;
-	rtwpci->irq_mask[1] = IMR_TXFOVW |
-			      0;
-	rtwpci->irq_mask[3] = IMR_H2CDOK |
-			      0;
 	spin_lock_init(&rtwpci->irq_lock);
 	spin_lock_init(&rtwpci->hwirq_lock);
 	ret = rtw_pci_init_trx_ring(rtwdev);
@@ -482,15 +468,17 @@ static void rtw_pci_reset_trx_ring(struct rtw_dev *rtwdev)
 static void rtw_pci_enable_interrupt(struct rtw_dev *rtwdev,
 				     struct rtw_pci *rtwpci, bool exclude_rx)
 {
+	const struct rtw_pci_gen *pci_gen = rtwpci->gen;
+	u32 imr0_unmask = exclude_rx ? IMR_ROK | IMR_RDU : 0;
+	u32 imr1_unmask = exclude_rx ? IMR_RXFOVW : 0;
 	unsigned long flags;
-	u32 imr0_unmask = exclude_rx ? IMR_ROK : 0;
 
 	spin_lock_irqsave(&rtwpci->hwirq_lock, flags);
 
-	rtw_write32(rtwdev, RTK_PCI_HIMR0, rtwpci->irq_mask[0] & ~imr0_unmask);
-	rtw_write32(rtwdev, RTK_PCI_HIMR1, rtwpci->irq_mask[1]);
+	rtw_write32(rtwdev, RTK_PCI_HIMR0, pci_gen->irq_mask[0] & ~imr0_unmask);
+	rtw_write32(rtwdev, RTK_PCI_HIMR1, pci_gen->irq_mask[1] & ~imr1_unmask);
 	if (rtw_chip_wcpu_3081(rtwdev))
-		rtw_write32(rtwdev, RTK_PCI_HIMR3, rtwpci->irq_mask[3]);
+		rtw_write32(rtwdev, RTK_PCI_HIMR3, pci_gen->irq_mask[3]);
 
 	rtwpci->irq_enabled = true;
 
@@ -1149,6 +1137,7 @@ static u32 rtw_pci_rx_napi(struct rtw_dev *rtwdev, struct rtw_pci *rtwpci,
 static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,
 				   struct rtw_pci *rtwpci, u32 *irq_status)
 {
+	const struct rtw_pci_gen *pci_gen = rtwpci->gen;
 	unsigned long flags;
 
 	spin_lock_irqsave(&rtwpci->hwirq_lock, flags);
@@ -1159,9 +1148,9 @@ static void rtw_pci_irq_recognized(struct rtw_dev *rtwdev,
 		irq_status[3] = rtw_read32(rtwdev, RTK_PCI_HISR3);
 	else
 		irq_status[3] = 0;
-	irq_status[0] &= rtwpci->irq_mask[0];
-	irq_status[1] &= rtwpci->irq_mask[1];
-	irq_status[3] &= rtwpci->irq_mask[3];
+	irq_status[0] &= pci_gen->irq_mask[0];
+	irq_status[1] &= pci_gen->irq_mask[1];
+	irq_status[3] &= pci_gen->irq_mask[3];
 	rtw_write32(rtwdev, RTK_PCI_HISR0, irq_status[0]);
 	rtw_write32(rtwdev, RTK_PCI_HISR1, irq_status[1]);
 	if (rtw_chip_wcpu_3081(rtwdev))
@@ -1213,7 +1202,8 @@ static irqreturn_t rtw_pci_interrupt_threadfn(int irq, void *dev)
 		pci_gen->tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_VI);
 	if (irq_status[3] & IMR_H2CDOK)
 		pci_gen->tx_isr(rtwdev, rtwpci, RTW_TX_QUEUE_H2C);
-	if (irq_status[0] & IMR_ROK) {
+	if (irq_status[0] & (IMR_ROK | IMR_RDU) ||
+	    irq_status[1] & IMR_RXFOVW) {
 		rtw_pci_rx_isr(rtwdev);
 		rx = true;
 	}
@@ -2005,6 +1995,13 @@ const struct rtw_pci_gen rtw_pci_gen_new = {
 	.rx_napi = rtw_pci_rx_napi,
 	.clkreq_set = rtw_pci_clkreq_set,
 	.aspm_set = rtw_pci_aspm_set,
+
+	.irq_mask = { IMR_HIGHDOK | IMR_MGNTDOK | IMR_BKDOK |
+		      IMR_BEDOK | IMR_VIDOK | IMR_VODOK | IMR_ROK |
+		      IMR_BCNDMAINT_E | IMR_C2HCMD,
+		      IMR_TXFOVW,
+		      0,
+		      IMR_H2CDOK, }
 };
 EXPORT_SYMBOL(rtw_pci_gen_new);
 
diff --git a/drivers/net/wireless/realtek/rtw88/pci.h b/drivers/net/wireless/realtek/rtw88/pci.h
index 92532f842ebc..74074437e34b 100644
--- a/drivers/net/wireless/realtek/rtw88/pci.h
+++ b/drivers/net/wireless/realtek/rtw88/pci.h
@@ -231,6 +231,8 @@ struct rtw_pci_gen {
 		       u8 hw_queue, u32 limit);
 	void (*clkreq_set)(struct rtw_dev *rtwdev, bool enable);
 	void (*aspm_set)(struct rtw_dev *rtwdev, bool enable);
+
+	u32 irq_mask[4];
 };
 
 struct rtw_pci {
@@ -241,7 +243,6 @@ struct rtw_pci {
 	spinlock_t hwirq_lock;
 	/* Used for PCI TX ring/queueing, and enable INT. */
 	spinlock_t irq_lock;
-	u32 irq_mask[4];
 	bool irq_enabled;
 	bool running;
 
diff --git a/drivers/net/wireless/realtek/rtw88/pci_old.c b/drivers/net/wireless/realtek/rtw88/pci_old.c
index 464b57d8a629..ef2da0adff37 100644
--- a/drivers/net/wireless/realtek/rtw88/pci_old.c
+++ b/drivers/net/wireless/realtek/rtw88/pci_old.c
@@ -518,5 +518,12 @@ const struct rtw_pci_gen rtw_pci_gen_old = {
 	.rx_napi = rtw_pci_old_rx_napi,
 	.clkreq_set = rtw_pci_old_clkreq_set,
 	.aspm_set = rtw_pci_old_aspm_set,
+
+	.irq_mask = { IMR_HIGHDOK | IMR_MGNTDOK | IMR_BKDOK |
+		      IMR_BEDOK | IMR_VIDOK | IMR_VODOK | IMR_ROK |
+		      IMR_BCNDMAINT_E | IMR_C2HCMD | IMR_RDU,
+		      IMR_TXFOVW | IMR_RXFOVW,
+		      0,
+		      0, }
 };
 EXPORT_SYMBOL(rtw_pci_gen_old);
-- 
2.55.0