]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: macb: Add support for suspend/resume with full power down
authorHarini Katakam <harini.katakam@xilinx.com>
Fri, 1 Mar 2019 10:50:35 +0000 (16:20 +0530)
committerDavid S. Miller <davem@davemloft.net>
Sun, 3 Mar 2019 21:51:37 +0000 (13:51 -0800)
When macb device is suspended and system is powered down, the clocks
are removed and hence macb should be closed gracefully and restored
upon resume. This patch does the same by switching off the net device,
suspending phy and performing necessary cleanup of interrupts and BDs.
Upon resume, all these are reinitialized again.

Reset of macb device is done only when GEM is not a wake device.
Even when gem is a wake device, tx queues can be stopped and ptp device
can be closed (tsu clock will be disabled in pm_runtime_suspend) as
wake event detection has no dependency on this.

Signed-off-by: Kedareswara rao Appana <appanad@xilinx.com>
Signed-off-by: Harini Katakam <harini.katakam@xilinx.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index 5173c02e292e04e180e87cffa6a0b1503faef876..ad099fd01b45ae947492e828337c76df6d701587 100644 (file)
@@ -4283,16 +4283,34 @@ static int __maybe_unused macb_suspend(struct device *dev)
 {
        struct net_device *netdev = dev_get_drvdata(dev);
        struct macb *bp = netdev_priv(netdev);
+       struct macb_queue *queue = bp->queues;
+       unsigned long flags;
+       unsigned int q;
+
+       if (!netif_running(netdev))
+               return 0;
 
-       netif_carrier_off(netdev);
-       netif_device_detach(netdev);
 
        if (bp->wol & MACB_WOL_ENABLED) {
                macb_writel(bp, IER, MACB_BIT(WOL));
                macb_writel(bp, WOL, MACB_BIT(MAG));
                enable_irq_wake(bp->queues[0].irq);
+               netif_device_detach(netdev);
+       } else {
+               netif_device_detach(netdev);
+               for (q = 0, queue = bp->queues; q < bp->num_queues;
+                    ++q, ++queue)
+                       napi_disable(&queue->napi);
+               phy_stop(netdev->phydev);
+               phy_suspend(netdev->phydev);
+               spin_lock_irqsave(&bp->lock, flags);
+               macb_reset_hw(bp);
+               spin_unlock_irqrestore(&bp->lock, flags);
        }
 
+       netif_carrier_off(netdev);
+       if (bp->ptp_info)
+               bp->ptp_info->ptp_remove(netdev);
        pm_runtime_force_suspend(dev);
 
        return 0;
@@ -4302,6 +4320,11 @@ static int __maybe_unused macb_resume(struct device *dev)
 {
        struct net_device *netdev = dev_get_drvdata(dev);
        struct macb *bp = netdev_priv(netdev);
+       struct macb_queue *queue = bp->queues;
+       unsigned int q;
+
+       if (!netif_running(netdev))
+               return 0;
 
        pm_runtime_force_resume(dev);
 
@@ -4309,9 +4332,22 @@ static int __maybe_unused macb_resume(struct device *dev)
                macb_writel(bp, IDR, MACB_BIT(WOL));
                macb_writel(bp, WOL, 0);
                disable_irq_wake(bp->queues[0].irq);
+       } else {
+               macb_writel(bp, NCR, MACB_BIT(MPE));
+               for (q = 0, queue = bp->queues; q < bp->num_queues;
+                    ++q, ++queue)
+                       napi_enable(&queue->napi);
+               phy_resume(netdev->phydev);
+               phy_init_hw(netdev->phydev);
+               phy_start(netdev->phydev);
        }
 
+       bp->macbgem_ops.mog_init_rings(bp);
+       macb_init_hw(bp);
+       macb_set_rx_mode(netdev);
        netif_device_attach(netdev);
+       if (bp->ptp_info)
+               bp->ptp_info->ptp_init(netdev);
 
        return 0;
 }