dwc_eth_qos: Reset hardware before PHY start

vwax · davem330 · commit 3647bc35bd42 · 2016-02-06T03:38:11.000-05:00
The hardware reset is currently done after phy_start() is called,
leading to a race where we can lose the link status if the phy state
machine calls dwceqos_adjust_link() before we reset the MAC registers.

Acked-by: Lars Persson &lt;larper@axis.com&gt;
Signed-off-by: Rabin Vincent &lt;rabinv@axis.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/synopsys/dwc_eth_qos.c b/drivers/net/ethernet/synopsys/dwc_eth_qos.c
@@ -1880,9 +1880,9 @@ static int dwceqos_open(struct net_device *ndev)
 	}
 	netdev_reset_queue(ndev);
 
+	dwceqos_init_hw(lp);
 	napi_enable(&lp->napi);
 	phy_start(lp->phy_dev);
-	dwceqos_init_hw(lp);
 
 	netif_start_queue(ndev);
 	tasklet_enable(&lp->tx_bdreclaim_tasklet);

Original file line number	Diff line number	Diff line change
`@@ -1880,9 +1880,9 @@ static int dwceqos_open(struct net_device *ndev)`
`1880`	`1880`	`}`
`1881`	`1881`	`netdev_reset_queue(ndev);`
`1882`	`1882`
	`1883`	`+ dwceqos_init_hw(lp);`
`1883`	`1884`	`napi_enable(&lp->napi);`
`1884`	`1885`	`phy_start(lp->phy_dev);`
`1885`		`- dwceqos_init_hw(lp);`
`1886`	`1886`
`1887`	`1887`	`netif_start_queue(ndev);`
`1888`	`1888`	`tasklet_enable(&lp->tx_bdreclaim_tasklet);`