|
|
@@ -1671,7 +1671,7 @@ static void stmmac_init_tx_coalesce(struct stmmac_priv *priv)
|
|
|
* 0 on success and an appropriate (-)ve integer as defined in errno.h
|
|
|
* file on failure.
|
|
|
*/
|
|
|
-static int stmmac_hw_setup(struct net_device *dev)
|
|
|
+static int stmmac_hw_setup(struct net_device *dev, bool init_ptp)
|
|
|
{
|
|
|
struct stmmac_priv *priv = netdev_priv(dev);
|
|
|
int ret;
|
|
|
@@ -1708,9 +1708,11 @@ static int stmmac_hw_setup(struct net_device *dev)
|
|
|
|
|
|
stmmac_mmc_setup(priv);
|
|
|
|
|
|
- ret = stmmac_init_ptp(priv);
|
|
|
- if (ret && ret != -EOPNOTSUPP)
|
|
|
- pr_warn("%s: failed PTP initialisation\n", __func__);
|
|
|
+ if (init_ptp) {
|
|
|
+ ret = stmmac_init_ptp(priv);
|
|
|
+ if (ret && ret != -EOPNOTSUPP)
|
|
|
+ pr_warn("%s: failed PTP initialisation\n", __func__);
|
|
|
+ }
|
|
|
|
|
|
#ifdef CONFIG_DEBUG_FS
|
|
|
ret = stmmac_init_fs(dev);
|
|
|
@@ -1787,7 +1789,7 @@ static int stmmac_open(struct net_device *dev)
|
|
|
goto init_error;
|
|
|
}
|
|
|
|
|
|
- ret = stmmac_hw_setup(dev);
|
|
|
+ ret = stmmac_hw_setup(dev, true);
|
|
|
if (ret < 0) {
|
|
|
pr_err("%s: Hw setup failed\n", __func__);
|
|
|
goto init_error;
|
|
|
@@ -3036,7 +3038,7 @@ int stmmac_resume(struct net_device *ndev)
|
|
|
netif_device_attach(ndev);
|
|
|
|
|
|
init_dma_desc_rings(ndev, GFP_ATOMIC);
|
|
|
- stmmac_hw_setup(ndev);
|
|
|
+ stmmac_hw_setup(ndev, false);
|
|
|
stmmac_init_tx_coalesce(priv);
|
|
|
|
|
|
napi_enable(&priv->napi);
|