[PATCH 1/2] wifi: rtw89: pci: fix interrupt stuck after leaving low power mode

[PATCH 1/2] wifi: rtw89: pci: fix interrupt stuck after leaving low power mode

[Ping-Ke Shih]

We turn off interrupt in ISR, and re-enable interrupt in threadfn or
napi_poll according to the mode it stays. If we are turning off interrupt,
rtwpci->running flag is unset and interrupt handler stop processing even
if it was called, so disallow to re-enable interrupt in this situation.
Or, wifi chip doesn't trigger interrupt events anymore because interrupt
status (ISR) isn't clear by interrupt handler anymore.

Fixes: c83dcd0508e2 ("rtw89: pci: add a separate interrupt handler for low power mode")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
Hi Kalle,

This patchset contains two patches with fixes tag, but we don't turn on
lower power mode yet, so this patchset should go to wireless-next tree.

Thank you.

---
 drivers/net/wireless/realtek/rtw89/pci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index c68fec9eb5a64..8a093e1cb328e 100644
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -760,7 +760,8 @@ static irqreturn_t rtw89_pci_interrupt_threadfn(int irq, void *dev)
 
 enable_intr:
 	spin_lock_irqsave(&rtwpci->irq_lock, flags);
-	rtw89_chip_enable_intr(rtwdev, rtwpci);
+	if (likely(rtwpci->running))
+		rtw89_chip_enable_intr(rtwdev, rtwpci);
 	spin_unlock_irqrestore(&rtwpci->irq_lock, flags);
 	return IRQ_HANDLED;
 }
-- 
2.25.1

[PATCH 2/2] wifi: rtw89: pci: correct TX resource checking in low power mode

[Ping-Ke Shih]

Number of TX resource must be minimum of TX_BD and TX_WD. Only considering
TX_BD could drop TX packets pulled from mac80211 if TX_WD is unavailable.

Fixes: 52edbb9fb78a ("rtw89: ps: access TX/RX rings via another registers in low power mode")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw89/pci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c
index 8a093e1cb328e..7bb1b494c5d15 100644
--- a/drivers/net/wireless/realtek/rtw89/pci.c
+++ b/drivers/net/wireless/realtek/rtw89/pci.c
@@ -926,10 +926,12 @@ u32 __rtw89_pci_check_and_reclaim_tx_resource_noio(struct rtw89_dev *rtwdev,
 {
 	struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv;
 	struct rtw89_pci_tx_ring *tx_ring = &rtwpci->tx_rings[txch];
+	struct rtw89_pci_tx_wd_ring *wd_ring = &tx_ring->wd_ring;
 	u32 cnt;
 
 	spin_lock_bh(&rtwpci->trx_lock);
 	cnt = rtw89_pci_get_avail_txbd_num(tx_ring);
+	cnt = min(cnt, wd_ring->curr_num);
 	spin_unlock_bh(&rtwpci->trx_lock);
 
 	return cnt;
-- 
2.25.1

Re: [PATCH 1/2] wifi: rtw89: pci: fix interrupt stuck after leaving low power mode

[Kalle Valo]

Ping-Ke Shih <pkshih@realtek.com> writes:

> We turn off interrupt in ISR, and re-enable interrupt in threadfn or
> napi_poll according to the mode it stays. If we are turning off interrupt,
> rtwpci->running flag is unset and interrupt handler stop processing even
> if it was called, so disallow to re-enable interrupt in this situation.
> Or, wifi chip doesn't trigger interrupt events anymore because interrupt
> status (ISR) isn't clear by interrupt handler anymore.
>
> Fixes: c83dcd0508e2 ("rtw89: pci: add a separate interrupt handler for low power mode")
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> ---
> Hi Kalle,
>
> This patchset contains two patches with fixes tag, but we don't turn on
> lower power mode yet, so this patchset should go to wireless-next tree.

Very good, thanks for letting me know. This kind of info always helps.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCH 1/2] wifi: rtw89: pci: fix interrupt stuck after leaving low power mode

[Kalle Valo]

Ping-Ke Shih <pkshih@realtek.com> wrote:

> We turn off interrupt in ISR, and re-enable interrupt in threadfn or
> napi_poll according to the mode it stays. If we are turning off interrupt,
> rtwpci->running flag is unset and interrupt handler stop processing even
> if it was called, so disallow to re-enable interrupt in this situation.
> Or, wifi chip doesn't trigger interrupt events anymore because interrupt
> status (ISR) isn't clear by interrupt handler anymore.
> 
> Fixes: c83dcd0508e2 ("rtw89: pci: add a separate interrupt handler for low power mode")
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

2 patches applied to wireless-next.git, thanks.

b7e715d3dcd2 wifi: rtw89: pci: fix interrupt stuck after leaving low power mode
4a29213cd775 wifi: rtw89: pci: correct TX resource checking in low power mode

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220824063312.15784-1-pkshih@realtek.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches