Commit f9f41e3d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'macb-WOL-fixes' 



Nicolas Ferre says:

====================
net: macb: Wake-on-Lan magic packet fixes and GEM handling

Here is a split series to fix WoL magic-packet on the current macb driver. Only
fixes in this one based on current net/master.

Changes in v5:
- Addressed the error code returned by phylink_ethtool_set_wol() as suggested
  by Russell.
  If PHY handles WoL, MAC doesn't stay in the way.
- Removed Florian's tag on 3/5 because of the above changes.
- Correct the "Fixes" tag on 1/5.

Changes in v4:
- Pure bug fix series for 'net'. GEM addition and MACB update removed: will be
  sent later.

Changes in v3:
- Revert some of the v2 changes done in macb_resume(). Now the resume function
  supports in-depth re-configuration of the controller in order to deal with
  deeper sleep states. Basically as it was before changes introduced by this
  series
- Tested for non-regression with our deeper Power Management mode which cuts
  power to the controller completely

Changes in v2:
- Add patch 4/7 ("net: macb: fix macb_suspend() by removing call to netif_carrier_off()")
  needed for keeping phy state consistent
- Add patch 5/7 ("net: macb: fix call to pm_runtime in the suspend/resume functions") that prevent
  putting the macb in runtime pm suspend mode when WoL is used
- Collect review tags on 3 first patches from Florian: Thanks!
- Review of macb_resume() function
- Addition of pm_wakeup_event() in both MACB and GEM WoL IRQ handlers
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c8b1d743 6c8f85ca

drivers/net/ethernet/cadence/macb_main.c

+19 −12
Original line number Diff line number Diff line
@@ -2821,11 +2821,13 @@ static void macb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
{

	struct macb *bp = netdev_priv(netdev);



	wol->supported = 0;

	wol->wolopts = 0;



	if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET)

	if (bp->wol & MACB_WOL_HAS_MAGIC_PACKET) {

		phylink_ethtool_get_wol(bp->phylink, wol);

		wol->supported |= WAKE_MAGIC;



		if (bp->wol & MACB_WOL_ENABLED)

			wol->wolopts |= WAKE_MAGIC;

	}

}



static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
@@ -2833,9 +2835,13 @@ static int macb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) 
	struct macb *bp = netdev_priv(netdev);

	int ret;



	/* Pass the order to phylink layer */

	ret = phylink_ethtool_set_wol(bp->phylink, wol);

	if (!ret)

		return 0;

	/* Don't manage WoL on MAC if handled by the PHY

	 * or if there's a failure in talking to the PHY

	 */

	if (!ret || ret != -EOPNOTSUPP)

		return ret;



	if (!(bp->wol & MACB_WOL_HAS_MAGIC_PACKET) ||

	    (wol->wolopts & ~WAKE_MAGIC))
@@ -4422,7 +4428,7 @@ static int macb_probe(struct platform_device *pdev) 
	bp->wol = 0;

	if (of_get_property(np, "magic-packet", NULL))

		bp->wol |= MACB_WOL_HAS_MAGIC_PACKET;

	device_init_wakeup(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);

	device_set_wakeup_capable(&pdev->dev, bp->wol & MACB_WOL_HAS_MAGIC_PACKET);



	spin_lock_init(&bp->lock);
@@ -4598,9 +4604,9 @@ static int __maybe_unused macb_suspend(struct device *dev) 
			bp->pm_data.scrt2 = gem_readl_n(bp, ETHT, SCRT2_ETHT);

	}



	netif_carrier_off(netdev);

	if (bp->ptp_info)

		bp->ptp_info->ptp_remove(netdev);

	if (!device_may_wakeup(dev))

		pm_runtime_force_suspend(dev);



	return 0;
@@ -4616,6 +4622,7 @@ static int __maybe_unused macb_resume(struct device *dev) 
	if (!netif_running(netdev))

		return 0;



	if (!device_may_wakeup(dev))

		pm_runtime_force_resume(dev);



	if (bp->wol & MACB_WOL_ENABLED) {
@@ -4654,7 +4661,7 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev) 
	struct net_device *netdev = dev_get_drvdata(dev);

	struct macb *bp = netdev_priv(netdev);



	if (!(device_may_wakeup(&bp->dev->dev))) {

	if (!(device_may_wakeup(dev))) {

		clk_disable_unprepare(bp->tx_clk);

		clk_disable_unprepare(bp->hclk);

		clk_disable_unprepare(bp->pclk);
@@ -4670,7 +4677,7 @@ static int __maybe_unused macb_runtime_resume(struct device *dev) 
	struct net_device *netdev = dev_get_drvdata(dev);

	struct macb *bp = netdev_priv(netdev);



	if (!(device_may_wakeup(&bp->dev->dev))) {

	if (!(device_may_wakeup(dev))) {

		clk_prepare_enable(bp->pclk);

		clk_prepare_enable(bp->hclk);

		clk_prepare_enable(bp->tx_clk);

CRA Git | Maintained and supported by SUSTech CRA and CCSE