]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: macb: Fix race condition in driver when Rx frame is dropped
authorPunnaiah Choudary Kalluri <punnaiah.choudary.kalluri@xilinx.com>
Wed, 29 Apr 2015 03:04:46 +0000 (08:34 +0530)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 Apr 2015 19:24:46 +0000 (15:24 -0400)
Under heavy Rx load, observed that the Hw is updating the USED bit
and it is not updating the received frame status to the BD control
field. This could be lack of resources for processing the BDs at high
data rates. Driver drops the frame associated with this BD but not
clearing the USED bit. So, this is causing hang condition as Hw
expects USED bit to be cleared for this BD.

Signed-off-by: Punnaiah Choudary Kalluri <punnaia@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb.c

index 665c29098e3c27306e8a276bf2aafc38a5b0f3db..4104d49f005d4a825eb14b99efeb5f158ab456d5 100644 (file)
@@ -707,6 +707,9 @@ static void gem_rx_refill(struct macb *bp)
 
                        /* properly align Ethernet header */
                        skb_reserve(skb, NET_IP_ALIGN);
+               } else {
+                       bp->rx_ring[entry].addr &= ~MACB_BIT(RX_USED);
+                       bp->rx_ring[entry].ctrl = 0;
                }
        }