UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: macb: remove BUG_ON() and reset the queue to handle RX errors 

This patch removes two BUG_ON() used to notify about RX queue corruptions
on macb (not gem) hardware without actually handling the error.

The new code skips corrupted frames but still processes faultless frames.
Then it resets the RX queue before restarting the reception from a clean
state.

This patch is a rework of an older patch proposed by Neil Armstrong:
http://patchwork.ozlabs.org/patch/371525/

Signed-off-by: Cyrille Pitchen <cyrille.pitchen@atmel.com>
Acked-by: Neil Armstrong <narmstrong@baylibre.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Cyrille Pitchen 2016-03-25 10:37:34 +01:00 committed by David S. Miller
parent d31fecd1af
commit 9ba723b081
1 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/net/ethernet/cadence/macb.c
View File

@ -917,7 +917,10 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
unsigned int frag_len = bp->rx_buffer_size; unsigned int frag_len = bp->rx_buffer_size;
if (offset + frag_len > len) { if (offset + frag_len > len) {
BUG_ON(frag != last_frag); if (unlikely(frag != last_frag)) {
dev_kfree_skb_any(skb);
return -1;
}
frag_len = len - offset; frag_len = len - offset;
} }
skb_copy_to_linear_data_offset(skb, offset, skb_copy_to_linear_data_offset(skb, offset,
@ -945,8 +948,23 @@ static int macb_rx_frame(struct macb *bp, unsigned int first_frag,
return 0; return 0;
} }
static inline void macb_init_rx_ring(struct macb *bp)
{
dma_addr_t addr;
int i;
addr = bp->rx_buffers_dma;
for (i = 0; i < RX_RING_SIZE; i++) {
bp->rx_ring[i].addr = addr;
bp->rx_ring[i].ctrl = 0;
addr += bp->rx_buffer_size;
}
bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
}
static int macb_rx(struct macb *bp, int budget) static int macb_rx(struct macb *bp, int budget)
{ {
bool reset_rx_queue = false;
int received = 0; int received = 0;
unsigned int tail; unsigned int tail;
int first_frag = -1; int first_frag = -1;
@ -972,10 +990,18 @@ static int macb_rx(struct macb *bp, int budget)
if (ctrl & MACB_BIT(RX_EOF)) { if (ctrl & MACB_BIT(RX_EOF)) {
int dropped; int dropped;
BUG_ON(first_frag == -1);
if (unlikely(first_frag == -1)) {
reset_rx_queue = true;
continue;
}
dropped = macb_rx_frame(bp, first_frag, tail); dropped = macb_rx_frame(bp, first_frag, tail);
first_frag = -1; first_frag = -1;
if (unlikely(dropped < 0)) {
reset_rx_queue = true;
continue;
}
if (!dropped) { if (!dropped) {
received++; received++;
budget--; budget--;
@ -983,6 +1009,26 @@ static int macb_rx(struct macb *bp, int budget)
} }
} }
if (unlikely(reset_rx_queue)) {
unsigned long flags;
u32 ctrl;
netdev_err(bp->dev, "RX queue corruption: reset it\n");
spin_lock_irqsave(&bp->lock, flags);
ctrl = macb_readl(bp, NCR);
macb_writel(bp, NCR, ctrl & ~MACB_BIT(RE));
macb_init_rx_ring(bp);
macb_writel(bp, RBQP, bp->rx_ring_dma);
macb_writel(bp, NCR, ctrl | MACB_BIT(RE));
spin_unlock_irqrestore(&bp->lock, flags);
return received;
}
if (first_frag != -1) if (first_frag != -1)
bp->rx_tail = first_frag; bp->rx_tail = first_frag;
else else
@ -1523,15 +1569,8 @@ static void gem_init_rings(struct macb *bp)
static void macb_init_rings(struct macb *bp) static void macb_init_rings(struct macb *bp)
{ {
int i; int i;
dma_addr_t addr;
addr = bp->rx_buffers_dma; macb_init_rx_ring(bp);
for (i = 0; i < RX_RING_SIZE; i++) {
bp->rx_ring[i].addr = addr;
bp->rx_ring[i].ctrl = 0;
addr += bp->rx_buffer_size;
}
bp->rx_ring[RX_RING_SIZE - 1].addr |= MACB_BIT(RX_WRAP);
for (i = 0; i < TX_RING_SIZE; i++) { for (i = 0; i < TX_RING_SIZE; i++) {
bp->queues[0].tx_ring[i].addr = 0; bp->queues[0].tx_ring[i].addr = 0;