aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2013-03-10 18:25:16 +0000
committerFelix Fietkau <nbd@openwrt.org>2013-03-10 18:25:16 +0000
commitc44506fcbd3657d90f27bc790f4aa22add84db6b (patch)
tree2e84be666a22d0b20f4acc9ec33fdaf937cdd6cf /target/linux
parentc1adc793282fe8e81bf893cda1202653e0f736e8 (diff)
downloadupstream-c44506fcbd3657d90f27bc790f4aa22add84db6b.tar.gz
upstream-c44506fcbd3657d90f27bc790f4aa22add84db6b.tar.bz2
upstream-c44506fcbd3657d90f27bc790f4aa22add84db6b.zip
cns3xxx: fix an rx irq handling corner case
When an rx interrupt comes in, rx interrupts are disabled and NAPI polling is scheduled. During the NAPI poll, the driver first processes received frames in the ring, then fills the dma descriptor slots with new buffers and calls tx complete, before finally re-enabling rx interrupts and completing NAPI (if below the budget). If the hardware rx queue overflows before the napi complete is called, the hardware will not throw any further rx interrupts and rx processing stops completely. Fix this by keeping NAPI polling scheduled until it completes a poll without receiving any packets, and also handle NAPI completion before refilling rx or completing tx. SVN-Revision: 35942
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
index 7ffff684de..7309d9ea77 100644
--- a/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
+++ b/target/linux/cns3xxx/files/drivers/net/ethernet/cavium/cns3xxx_eth.c
@@ -706,15 +706,15 @@ static int eth_poll(struct napi_struct *napi, int budget)
}
}
- cns3xxx_alloc_rx_buf(sw, received);
-
- rx_ring->cur_index = i;
-
- if (received != budget) {
+ if (!received) {
napi_complete(napi);
enable_irq(IRQ_CNS3XXX_SW_R0RXC);
}
+ cns3xxx_alloc_rx_buf(sw, received);
+
+ rx_ring->cur_index = i;
+
wmb();
enable_rx_dma(sw);