diff options
author | Rob Herring <rob.herring@calxeda.com> | 2012-11-05 01:22:20 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-11-07 03:51:13 -0500 |
commit | b821bd8e5a4413c8e28e64d878720978883ebfc8 (patch) | |
tree | 1897f0e76c5cbfd4bf504cd06cf97f805cf2c32d /drivers/net/ethernet/calxeda | |
parent | 0aefa8ecd81f4f4b3f7f336aa152b13cc79c4bfe (diff) |
net: calxedaxgmac: remove explicit rx dma buffer polling
New received frames will trigger the rx DMA to poll the DMA descriptors,
so there is no need to tell the h/w to poll. We also want to enable
dropping frames from the fifo when there is no buffer.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/calxeda')
-rw-r--r-- | drivers/net/ethernet/calxeda/xgmac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 7f5fd17c8002..728fcef4e685 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c | |||
@@ -966,7 +966,7 @@ static int xgmac_hw_init(struct net_device *dev) | |||
966 | ctrl |= XGMAC_CONTROL_IPC; | 966 | ctrl |= XGMAC_CONTROL_IPC; |
967 | writel(ctrl, ioaddr + XGMAC_CONTROL); | 967 | writel(ctrl, ioaddr + XGMAC_CONTROL); |
968 | 968 | ||
969 | writel(DMA_CONTROL_DFF | DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); | 969 | writel(DMA_CONTROL_OSF, ioaddr + XGMAC_DMA_CONTROL); |
970 | 970 | ||
971 | /* Set the HW DMA mode and the COE */ | 971 | /* Set the HW DMA mode and the COE */ |
972 | writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA | | 972 | writel(XGMAC_OMR_TSF | XGMAC_OMR_RFD | XGMAC_OMR_RFA | |
@@ -1180,8 +1180,6 @@ static int xgmac_rx(struct xgmac_priv *priv, int limit) | |||
1180 | 1180 | ||
1181 | xgmac_rx_refill(priv); | 1181 | xgmac_rx_refill(priv); |
1182 | 1182 | ||
1183 | writel(1, priv->base + XGMAC_DMA_RX_POLL); | ||
1184 | |||
1185 | return count; | 1183 | return count; |
1186 | } | 1184 | } |
1187 | 1185 | ||