hurricos/openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ar71xx: prevent spurious ethernet resets from dma hang check false positives

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-06-17 23:58:11 +02:00
parent f28502a485
commit f9e7ffe73b
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx.h
View File

@ -174,7 +174,7 @@ struct ag71xx {
unsigned int desc_pktlen_mask; unsigned int desc_pktlen_mask;
unsigned int rx_buf_size; unsigned int rx_buf_size;
struct work_struct restart_work; struct delayed_work restart_work;
struct delayed_work link_work; struct delayed_work link_work;
struct timer_list oom_timer; struct timer_list oom_timer;

16
target/linux/ar71xx/files/drivers/net/ethernet/atheros/ag71xx/ag71xx_main.c
View File

@ -908,12 +908,12 @@ static void ag71xx_tx_timeout(struct net_device *dev)
if (netif_msg_tx_err(ag)) if (netif_msg_tx_err(ag))
pr_info("%s: tx timeout\n", ag->dev->name); pr_info("%s: tx timeout\n", ag->dev->name);
schedule_work(&ag->restart_work); schedule_delayed_work(&ag->restart_work, 1);
} }
static void ag71xx_restart_work_func(struct work_struct *work) static void ag71xx_restart_work_func(struct work_struct *work)
{ {
struct ag71xx *ag = container_of(work, struct ag71xx, restart_work); struct ag71xx *ag = container_of(work, struct ag71xx, restart_work.work);
rtnl_lock(); rtnl_lock();
ag71xx_hw_disable(ag); ag71xx_hw_disable(ag);
@ -950,6 +950,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
{ {
struct ag71xx_ring *ring = &ag->tx_ring; struct ag71xx_ring *ring = &ag->tx_ring;
struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
bool dma_stuck = false;
int ring_mask = BIT(ring->order) - 1; int ring_mask = BIT(ring->order) - 1;
int ring_size = BIT(ring->order); int ring_size = BIT(ring->order);
int sent = 0; int sent = 0;
@ -965,8 +966,10 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
if (!flush && !ag71xx_desc_empty(desc)) { if (!flush && !ag71xx_desc_empty(desc)) {
if (pdata->is_ar724x && if (pdata->is_ar724x &&
ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp)) ag71xx_check_dma_stuck(ag, ring->buf[i].timestamp)) {
schedule_work(&ag->restart_work); schedule_delayed_work(&ag->restart_work, HZ / 2);
dma_stuck = true;
}
break; break;
} }
@ -1003,6 +1006,9 @@ static int ag71xx_tx_packets(struct ag71xx *ag, bool flush)
if ((ring->curr - ring->dirty) < (ring_size * 3) / 4) if ((ring->curr - ring->dirty) < (ring_size * 3) / 4)
netif_wake_queue(ag->dev); netif_wake_queue(ag->dev);
if (!dma_stuck)
cancel_delayed_work(&ag->restart_work);
return sent; return sent;
} }
@ -1321,7 +1327,7 @@ static int ag71xx_probe(struct platform_device *pdev)
dev->netdev_ops = &ag71xx_netdev_ops; dev->netdev_ops = &ag71xx_netdev_ops;
dev->ethtool_ops = &ag71xx_ethtool_ops; dev->ethtool_ops = &ag71xx_ethtool_ops;
INIT_WORK(&ag->restart_work, ag71xx_restart_work_func); INIT_DELAYED_WORK(&ag->restart_work, ag71xx_restart_work_func);
init_timer(&ag->oom_timer); init_timer(&ag->oom_timer);
ag->oom_timer.data = (unsigned long) dev; ag->oom_timer.data = (unsigned long) dev;