[PATCH net-next V3] net: axienet: Clear stale AXI DMA TX/RX status before re-enabling interrupts
From: Kusuma Vasana <hidden>
Date: 2026-09-06 15:33:11
Also in:
linux-arm-kernel, lkml
Subsystem:
networking drivers, the rest, xilinx axi ethernet driver · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Radhey Shyam Pandey
The AXI DMA interrupt line is level-sensitive: it asserts whenever the IOC (XAXIDMA_IRQ_IOC_MASK) or DELAY (XAXIDMA_IRQ_DELAY_MASK) bits in the status register (XAXIDMA_TX_SR_OFFSET / XAXIDMA_RX_SR_OFFSET) are set and their corresponding enable bits in the control register are active. During TX/RX, interrupts are disabled in the control register while NAPI runs. Completions arriving in this window cause hardware to latch IOC/DELAY into the status register regardless of the control register mask state. After NAPI completion, re-enabling interrupts immediately re-asserts the IRQ line due to these stale status register bits, even when no new work is pending. This results in a stale interrupt and redundant NAPI poll cycle with no new work pending, causing unnecessary CPU processing. In the initial driver, the status register was cleared after polling all packets, which naturally consumed any status accumulated during processing. In later versions of the driver, status register clearing was moved to the ISR before polling begins, leaving no mechanism to clear status bits that arrive during the NAPI poll window. Clear the status register IOC/DELAY bits before re-enabling interrupts and recheck the next BD to catch race-window completions. Both are skipped on budget exhaustion. On the RX side, both are additionally skipped on refill failure to leave the level-sensitive IRQ armed so the poll is rescheduled on the next hardware completion. Signed-off-by: Kusuma Vasana <redacted> --- Targeting net-next with no Fixes tag: the extra poll cycle is a performance inefficiency, not a functional defect. Changes in v3: - Updated the commit description. - Restricted TX/RX status-register clear and completion recheck to the NAPI completion path, with RX only when refill succeeds. - Rechecked descriptor completion after status-register clear to handle race-window completions. Changes in v2: -Added net-next prefix in the subject -Updated the commit description --- .../net/ethernet/xilinx/xilinx_axienet_main.c | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+)
diff --git a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
index fcf517069d16..4816870e8502 100644
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c@@ -1018,6 +1018,16 @@ static int axienet_tx_poll(struct napi_struct *napi, int budget) netif_wake_queue(ndev); } + /* Clear stale IOC/DELAY bits and re-check for race-window completions. + * Skipped on budget exhaustion. + */ + if (packets < budget) { + axienet_dma_out32(lp, XAXIDMA_TX_SR_OFFSET, + XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK); + if (lp->tx_bd_v[lp->tx_bd_ci].status & XAXIDMA_BD_STS_COMPLETE_MASK) + return budget; + } + if (packets < budget && napi_complete_done(napi, packets)) { /* Re-enable TX completion interrupts. This should * cause an immediate interrupt if any TX packets are
@@ -1301,6 +1311,18 @@ static int axienet_rx_poll(struct napi_struct *napi, int budget) if (tail_p) axienet_dma_out_addr(lp, XAXIDMA_RX_TDESC_OFFSET, tail_p); + /* Clear stale IOC/DELAY bits and re-check for race-window completions. + * Skipped on budget exhaustion and on refill failure (cur_p->skb == + * NULL) to leave the level-sensitive IRQ armed so the poll is + * rescheduled on the next hardware completion. + */ + if (packets < budget && cur_p->skb) { + axienet_dma_out32(lp, XAXIDMA_RX_SR_OFFSET, + XAXIDMA_IRQ_IOC_MASK | XAXIDMA_IRQ_DELAY_MASK); + if (cur_p->status & XAXIDMA_BD_STS_COMPLETE_MASK) + return budget; + } + if (packets < budget && napi_complete_done(napi, packets)) { if (READ_ONCE(lp->rx_dim_enabled)) { struct dim_sample sample = {
--
2.43.0