Revert "net: macb: Add support for sama5d2 suspend-to-mem"

This reverts commit d3a73d6.

Author: claudiubeznea

drivers/net/ethernet/cadence/macb.h

@@ -982,11 +982,6 @@ struct macb_queue {
 #endif
 };
 
-struct macb_suspend_ctx {
-	u32 usrio;
-	u32 ncfgr;
-};
-
 struct macb {
 	void __iomem		*regs;
 	bool			native_io;
@@ -1062,9 +1057,6 @@ struct macb {
 	struct ptp_clock_info ptp_clock_info;
 	struct tsu_incr tsu_incr;
 	struct hwtstamp_config tstamp_config;
-
-	/* Suspend context. */
-	struct macb_suspend_ctx suspend;
 };
 
 #ifdef CONFIG_MACB_USE_HWSTAMP

drivers/net/ethernet/cadence/macb_main.c

@@ -2653,38 +2653,6 @@ static int macb_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 	}
 }
 
-static void macb_restore_features(struct net_device *netdev)
-{
-	struct macb *bp = netdev_priv(netdev);
-
-	netdev_features_t features = netdev->features;
-
-	/* TX checksum offload */
-	if (macb_is_gem(bp)) {
-		u32 dmacfg;
-
-		dmacfg = gem_readl(bp, DMACFG);
-		if (features & NETIF_F_HW_CSUM)
-			dmacfg |= GEM_BIT(TXCOEN);
-		else
-			dmacfg &= ~GEM_BIT(TXCOEN);
-		gem_writel(bp, DMACFG, dmacfg);
-	}
-
-	/* RX checksum offload */
-	if (macb_is_gem(bp)) {
-		u32 netcfg;
-
-		netcfg = gem_readl(bp, NCFGR);
-		if (features & NETIF_F_RXCSUM &&
-		    !(netdev->flags & IFF_PROMISC))
-			netcfg |= GEM_BIT(RXCOEN);
-		else
-			netcfg &= ~GEM_BIT(RXCOEN);
-		gem_writel(bp, NCFGR, netcfg);
-	}
-}
-
 static int macb_set_features(struct net_device *netdev,
 			     netdev_features_t features)
 {
@@ -2985,7 +2953,6 @@ static int macb_init(struct platform_device *pdev)
 		if (bp->caps & MACB_CAPS_USRIO_HAS_CLKEN)
 			val |= MACB_BIT(CLKEN);
 
-		bp->suspend.usrio = val;
 		macb_or_gem_writel(bp, USRIO, val);
 	}
 
@@ -2994,8 +2961,6 @@ static int macb_init(struct platform_device *pdev)
 	val |= macb_dbw(bp);
 	if (bp->phy_interface == PHY_INTERFACE_MODE_SGMII)
 		val |= GEM_BIT(SGMIIEN) | GEM_BIT(PCSSEL);
-
-	bp->suspend.ncfgr = val;
 	macb_writel(bp, NCFGR, val);
 
 	return 0;
@@ -3650,9 +3615,6 @@ static int __maybe_unused macb_suspend(struct device *dev)
 		macb_writel(bp, WOL, MACB_BIT(MAG));
 		enable_irq_wake(bp->queues[0].irq);
 	} else {
-		if (netif_running(netdev)) {
-			macb_close(netdev);
-		}
 		clk_disable_unprepare(bp->tx_clk);
 		clk_disable_unprepare(bp->hclk);
 		clk_disable_unprepare(bp->pclk);
@@ -3677,17 +3639,6 @@ static int __maybe_unused macb_resume(struct device *dev)
 		clk_prepare_enable(bp->hclk);
 		clk_prepare_enable(bp->tx_clk);
 		clk_prepare_enable(bp->rx_clk);
-
-		macb_or_gem_writel(bp, USRIO, bp->suspend.usrio);
-		macb_writel(bp, NCFGR, bp->suspend.ncfgr);
-
-		phy_restore(netdev->phydev);
-		if (netif_running(netdev)) {
-			macb_open(netdev);
-		}
-
-		macb_set_rx_mode(netdev);
-		macb_restore_features(netdev);
 	}
 
 	netif_device_attach(netdev);