ftgmac100: Rework NAPI & interrupts handling
First, don't look at the interrupt status in the poll loop to decide what to poll. It's wrong. If we have run out of budget, we may still have RX packets to unqueue but no more RX interrupt pending. So instead move the code looking at the interrupt status into the interrupt handler where it belongs. That avoids a slow MMIO read in the NAPI fast path. We keep the abnormal interrupts enabled while NAPI is scheduled. While at it, actually do something useful in the "error" cases: On AHB bus error, trigger the new reset task, that's about all we can do. On RX packet fifo or descriptor overflows, we need to restart the MAC after having freed things up. So set a flag that NAPI will see and use to perform that restart after harvesting the RX ring. Finally, we shouldn't complete NAPI if there are still outgoing packets that will need harvesting. Waiting for more interrupts is less efficient than letting NAPI run a while longer while the queue drains. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

부모
9b86785d1e
커밋
10cbd64076
@@ -86,6 +86,20 @@
|
||||
#define FTGMAC100_INT_PHYSTS_CHG (1 << 9)
|
||||
#define FTGMAC100_INT_NO_HPTXBUF (1 << 10)
|
||||
|
||||
/* Interrupts we care about in NAPI mode */
|
||||
#define FTGMAC100_INT_BAD (FTGMAC100_INT_RPKT_LOST | \
|
||||
FTGMAC100_INT_XPKT_LOST | \
|
||||
FTGMAC100_INT_AHB_ERR | \
|
||||
FTGMAC100_INT_NO_RXBUF)
|
||||
|
||||
/* Normal RX/TX interrupts, enabled when NAPI off */
|
||||
#define FTGMAC100_INT_RXTX (FTGMAC100_INT_XPKT_ETH | \
|
||||
FTGMAC100_INT_RPKT_BUF)
|
||||
|
||||
/* All the interrupts we care about */
|
||||
#define FTGMAC100_INT_ALL (FTGMAC100_INT_RPKT_BUF | \
|
||||
FTGMAC100_INT_BAD)
|
||||
|
||||
/*
|
||||
* Interrupt timer control register
|
||||
*/
|
||||
|
Reference in New Issue
Block a user