Re: [PATCH net v2] net: stmmac: mask the MAC interrupt while resume resets the MAC

[Igor Velkov <iav@iav.lv>]

This conflicts with net-next commit 8181678a92f0 ("net: stmmac:
propagate PTP init failures in __stmmac_open() and stmmac_resume()").
The success path has to jump to out:, or the MAC IRQ stays disabled
after every resume and the build does not catch it. Resolution, built
with W=1 on net-next 071876fd5048:

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 0c381ae0d0ff,b275b6234b55..000000000000
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@@ -8467,15 -8403,10 +8477,19 @@@ init_coalesce
  
  	netif_device_attach(ndev);
  
- 	return 0;
+ 	ret = 0;
++	goto out;
 +
 +error_stop_dma:
 +	stmmac_stop_all_dma(priv);
 +	stmmac_mac_set(priv, priv->ioaddr, false);
 +error_unlock:
 +	stmmac_legacy_serdes_power_down(priv);
 +	mutex_unlock(&priv->lock);
 +	rtnl_unlock();
+ out:
+ 	if (irq_off)
+ 		enable_irq(ndev->irq);
  
  	return ret;
  }

+Cc Lorenzo.

--
Igor Velkov