Commit 596a4254 authored by Paul Barker's avatar Paul Barker Committed by Paolo Abeni

net: ravb: Always process TX descriptor ring

The TX queue should be serviced each time the poll function is called,
even if the full RX work budget has been consumed. This prevents
starvation of the TX queue when RX bandwidth usage is high.

Fixes: c156633f ("Renesas Ethernet AVB driver proper")
Signed-off-by: default avatarPaul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: default avatarSergey Shtylyov <s.shtylyov@omp.ru>
Link: https://lore.kernel.org/r/20240402145305.82148-1-paul.barker.ct@bp.renesas.comSigned-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 72076fc9
...@@ -1324,12 +1324,12 @@ static int ravb_poll(struct napi_struct *napi, int budget) ...@@ -1324,12 +1324,12 @@ static int ravb_poll(struct napi_struct *napi, int budget)
int q = napi - priv->napi; int q = napi - priv->napi;
int mask = BIT(q); int mask = BIT(q);
int quota = budget; int quota = budget;
bool unmask;
/* Processing RX Descriptor Ring */ /* Processing RX Descriptor Ring */
/* Clear RX interrupt */ /* Clear RX interrupt */
ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0); ravb_write(ndev, ~(mask | RIS0_RESERVED), RIS0);
if (ravb_rx(ndev, &quota, q)) unmask = !ravb_rx(ndev, &quota, q);
goto out;
/* Processing TX Descriptor Ring */ /* Processing TX Descriptor Ring */
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
...@@ -1339,6 +1339,9 @@ static int ravb_poll(struct napi_struct *napi, int budget) ...@@ -1339,6 +1339,9 @@ static int ravb_poll(struct napi_struct *napi, int budget)
netif_wake_subqueue(ndev, q); netif_wake_subqueue(ndev, q);
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
if (!unmask)
goto out;
napi_complete(napi); napi_complete(napi);
/* Re-enable RX/TX interrupts */ /* Re-enable RX/TX interrupts */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment