Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx: reset ethernet tx ring on fast reset to prevent packet loss / irq issues

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48753
This commit is contained in:
Felix Fietkau 2016-02-22 15:11:23 +00:00
parent b77a72ce0c
commit 29bbc6e6be
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View file

@ -513,14 +513,16 @@ static void ag71xx_fast_reset(struct ag71xx *ag)
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
struct net_device *dev = ag->dev; struct net_device *dev = ag->dev;
u32 reset_mask = pdata->reset_bit; u32 reset_mask = pdata->reset_bit;
u32 rx_ds, tx_ds; u32 rx_ds;
u32 mii_reg; u32 mii_reg;
reset_mask &= AR71XX_RESET_GE0_MAC | AR71XX_RESET_GE1_MAC; reset_mask &= AR71XX_RESET_GE0_MAC | AR71XX_RESET_GE1_MAC;
ag71xx_hw_stop(ag);
wmb();
mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG); mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC); rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
tx_ds = ag71xx_rr(ag, AG71XX_REG_TX_DESC);
ath79_device_reset_set(reset_mask); ath79_device_reset_set(reset_mask);
udelay(10); udelay(10);
@ -530,13 +532,16 @@ static void ag71xx_fast_reset(struct ag71xx *ag)
ag71xx_dma_reset(ag); ag71xx_dma_reset(ag);
ag71xx_hw_setup(ag); ag71xx_hw_setup(ag);
ag71xx_tx_packets(ag, true); ag71xx_tx_packets(ag, true);
ag->tx_ring.curr = 0;
ag->tx_ring.dirty = 0;
netdev_reset_queue(ag->dev);
/* setup max frame length */ /* setup max frame length */
ag71xx_wr(ag, AG71XX_REG_MAC_MFL, ag71xx_wr(ag, AG71XX_REG_MAC_MFL,
ag71xx_max_frame_len(ag->dev->mtu)); ag71xx_max_frame_len(ag->dev->mtu));
ag71xx_wr(ag, AG71XX_REG_RX_DESC, rx_ds); ag71xx_wr(ag, AG71XX_REG_RX_DESC, rx_ds);
ag71xx_wr(ag, AG71XX_REG_TX_DESC, tx_ds); ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
ag71xx_wr(ag, AG71XX_REG_MII_CFG, mii_reg); ag71xx_wr(ag, AG71XX_REG_MII_CFG, mii_reg);
ag71xx_hw_set_macaddr(ag, dev->dev_addr); ag71xx_hw_set_macaddr(ag, dev->dev_addr);
@ -962,6 +967,9 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
break; break;
} }
if (flush)
desc->ctrl |= DESC_EMPTY;
n++; n++;
if (!skb) if (!skb)
continue; continue;