Manually rebased: generic/hack-5.4/662-remove_pfifo_fast.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us> [manual changes to ramips/patches-5.10/835-asoc-add-mt7620-support.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
		
			
				
	
	
		
			36 lines
		
	
	
		
			905 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
		
			905 B
		
	
	
	
		
			Diff
		
	
	
	
	
	
From: Felix Fietkau <nbd@nbd.name>
 | 
						|
Date: Fri, 4 Sep 2020 18:14:05 +0200
 | 
						|
Subject: [PATCH] net: ethernet: mtk_eth_soc: avoid rearming interrupt if
 | 
						|
 napi_complete returns false
 | 
						|
 | 
						|
Reduces unnecessary interrupts
 | 
						|
 | 
						|
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 | 
						|
---
 | 
						|
 | 
						|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 | 
						|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 | 
						|
@@ -1536,8 +1536,8 @@ static int mtk_napi_tx(struct napi_struc
 | 
						|
 	if (status & MTK_TX_DONE_INT)
 | 
						|
 		return budget;
 | 
						|
 
 | 
						|
-	napi_complete(napi);
 | 
						|
-	mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
 | 
						|
+	if (napi_complete(napi))
 | 
						|
+		mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
 | 
						|
 
 | 
						|
 	return tx_done;
 | 
						|
 }
 | 
						|
@@ -1570,8 +1570,9 @@ poll_again:
 | 
						|
 		remain_budget -= rx_done;
 | 
						|
 		goto poll_again;
 | 
						|
 	}
 | 
						|
-	napi_complete(napi);
 | 
						|
-	mtk_rx_irq_enable(eth, MTK_RX_DONE_INT);
 | 
						|
+
 | 
						|
+	if (napi_complete(napi))
 | 
						|
+		mtk_rx_irq_enable(eth, MTK_RX_DONE_INT);
 | 
						|
 
 | 
						|
 	return rx_done + budget - remain_budget;
 | 
						|
 }
 |