openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: mediatek: fix mtk_pending_work 

The driver supports 2 MACs. Both run on the same DMA ring. If we hit a TX
timeout we need to stop both netdevs before restarting them again. If we
don't do this, mtk_stop() wont shutdown DMA and the consecutive call to
mtk_open() wont restart DMA and enable IRQs.

Signed-off-by: John Crispin <blogic@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
John Crispin 2016-04-08 00:54:09 +02:00 committed by David S. Miller
parent 34c2e4c9e9
commit e7d425dcea
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/net/ethernet/mediatek/mtk_eth_soc.c
View File

@ -1432,17 +1432,29 @@ static void mtk_pending_work(struct work_struct *work)
{ {
struct mtk_mac *mac = container_of(work, struct mtk_mac, pending_work); struct mtk_mac *mac = container_of(work, struct mtk_mac, pending_work);
struct mtk_eth *eth = mac->hw; struct mtk_eth *eth = mac->hw;
struct net_device *dev = eth->netdev[mac->id]; int err, i;
int err; unsigned long restart = 0;
rtnl_lock(); rtnl_lock();
mtk_stop(dev);
err = mtk_open(dev); /* stop all devices to make sure that dma is properly shut down */
if (err) { for (i = 0; i < MTK_MAC_COUNT; i++) {
netif_alert(eth, ifup, dev, if (!netif_oper_up(eth->netdev[i]))
"Driver up/down cycle failed, closing device.\n"); continue;
dev_close(dev); mtk_stop(eth->netdev[i]);
__set_bit(i, &restart);
}
/* restart DMA and enable IRQs */
for (i = 0; i < MTK_MAC_COUNT; i++) {
if (!test_bit(i, &restart))
continue;
err = mtk_open(eth->netdev[i]);
if (err) {
netif_alert(eth, ifup, eth->netdev[i],
"Driver up/down cycle failed, closing device.\n");
dev_close(eth->netdev[i]);
}
} }
rtnl_unlock(); rtnl_unlock();
} }