Skip to contentSkip to conversation

net: mvneta: Fix the case where the last poll did not process all rx

PATCH In review Jisheng Zhang 2 participants 2 messages Mar 16, 2020

Subsystems (3)
Networking Network drivers Marvell mvneta Ethernet driver
lore
Share & tools
lore

Jisheng Zhang

author
#0 lore raw

PATCH 1/1 net: mvneta: Fix the case where the last poll did not process all rx

From: Jisheng Zhang <[email protected]>

For the case where the last mvneta_poll did not process all RX packets, we need to xor the pp->cause_rx_tx or port->cause_rx_tx before claculating the rx_queue.

Fixes 2dcf75e2793c ("net: mvneta: Associate RX queues with each CPU")
Signed-off-by Jisheng Zhang <[email protected]>
---
 drivers/net/ethernet/marvell/mvneta.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +1 -2
index 98017e7d5dd0..11babc79dc6c 100644
@@ -3036,11 +3036,10 @@ static int mvneta_poll(struct napi_struct *napi, int budget)
 	/* For the case where the last mvneta_poll did not process all
 	 * RX packets
 	 */
-	rx_queue = fls(((cause_rx_tx >> 8) & 0xff));
-
 	cause_rx_tx |= pp->neta_armada3700 ? pp->cause_rx_tx :
 		port->cause_rx_tx;
 
+	rx_queue = fls(((cause_rx_tx >> 8) & 0xff));
 	if (rx_queue) {
 		rx_queue = rx_queue - 1;
 		if (pp->bm_priv)
Signature · 1 line
2.24.0
maintainer
#1 lore raw

From: Jisheng Zhang <[email protected]>
Date: Mon, 16 Mar 2020 22:56:36 +0800

Quoted 8 lines

From: Jisheng Zhang <[email protected]>

For the case where the last mvneta_poll did not process all RX packets, we need to xor the pp->cause_rx_tx or port->cause_rx_tx before claculating the rx_queue.

Fixes 2dcf75e2793c ("net: mvneta: Associate RX queues with each CPU")
Signed-off-by Jisheng Zhang <[email protected]>

Applied and queued up for -stable, thanks.