1 From 300ca8c6b5dcee2593f22d5bf8f13bb4da8c19c5 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Tue, 29 Mar 2016 17:00:47 +0200
4 Subject: [PATCH 74/91] net: mediatek: fix mtk_pending_work
6 The driver supports 2 MACs. Both run on the same DMA ring. If we hit a TX
7 timeout we need to stop both netdevs before retarting them again. If we
8 dont do thsi, mtk_stop() wont shutdown DMA and the consecutive call to
9 mtk_open() wont restart DMA and enable IRQs.
11 Signed-off-by: John Crispin <blogic@openwrt.org>
13 drivers/net/ethernet/mediatek/mtk_eth_soc.c | 30 +++++++++++++++++++--------
14 1 file changed, 21 insertions(+), 9 deletions(-)
16 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
17 index 04bdb9d..26eeb1a 100644
18 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
19 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
20 @@ -1430,19 +1430,31 @@ static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
22 static void mtk_pending_work(struct work_struct *work)
24 - struct mtk_mac *mac = container_of(work, struct mtk_mac, pending_work);
25 - struct mtk_eth *eth = mac->hw;
26 - struct net_device *dev = eth->netdev[mac->id];
28 + struct mtk_eth *eth = container_of(work, struct mtk_eth, pending_work);
30 + unsigned long restart = 0;
35 - err = mtk_open(dev);
37 - netif_alert(eth, ifup, dev,
38 + /* stop all devices to make sure that dma is properly shut down */
39 + for (i = 0; i < MTK_MAC_COUNT; i++) {
40 + if (!netif_oper_up(eth->netdev[i]))
42 + mtk_stop(eth->netdev[i]);
43 + __set_bit(i, &restart);
47 + /* restart DMA and enable IRQs */
48 + for (i = 0; i < MTK_MAC_COUNT; i++) {
49 + if (!test_bit(i, &restart))
51 + err = mtk_open(eth->netdev[i]);
53 + netif_alert(eth, ifup, eth->netdev[i],
54 "Driver up/down cycle failed, closing device.\n");
56 + dev_close(eth->netdev[i]);