Revert "net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume"

This reverts commit 643cf0e3ab5ccee37b3c53c018bd476c45c4b70e.

This is to make it easier to revert the offending commit
fd23df72f2be ("net: ethernet: ti: am65-cpsw: Add suspend/resume support")

Signed-off-by: Roger Quadros <rogerq@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 071cb22..44773a3 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2876,9 +2876,7 @@ static int am65_cpsw_nuss_suspend(struct device *dev)
        struct am65_cpsw_port *port;
        struct net_device *ndev;
        int i, ret;
-       struct am65_cpsw_host *host_p = am65_common_get_host(common);
 
-       host_p->vid_context = readl(host_p->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
        for (i = 0; i < common->port_num; i++) {
                port = &common->ports[i];
                ndev = port->ndev;
@@ -2886,7 +2884,6 @@ static int am65_cpsw_nuss_suspend(struct device *dev)
                if (!ndev)
                        continue;
 
-               port->vid_context = readl(port->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
                netif_device_detach(ndev);
                if (netif_running(ndev)) {
                        rtnl_lock();
@@ -2910,7 +2907,6 @@ static int am65_cpsw_nuss_resume(struct device *dev)
        struct am65_cpsw_port *port;
        struct net_device *ndev;
        int i, ret;
-       struct am65_cpsw_host *host_p = am65_common_get_host(common);
 
        am65_cpts_resume(common->cpts);
 
@@ -2932,11 +2928,8 @@ static int am65_cpsw_nuss_resume(struct device *dev)
                }
 
                netif_device_attach(ndev);
-               writel(port->vid_context, port->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
        }
 
-       writel(host_p->vid_context, host_p->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
-
        return 0;
 }
 #endif /* CONFIG_PM_SLEEP */

diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
index e95cc37..2c9850f 100644 (file)
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
@@ -55,16 +55,12 @@ struct am65_cpsw_port {
        bool                            rx_ts_enabled;
        struct am65_cpsw_qos            qos;
        struct devlink_port             devlink_port;
-       /* Only for suspend resume context */
-       u32                             vid_context;
 };
 
 struct am65_cpsw_host {
        struct am65_cpsw_common         *common;
        void __iomem                    *port_base;
        void __iomem                    *stat_base;
-       /* Only for suspend resume context */
-       u32                             vid_context;
 };
 
 struct am65_cpsw_tx_chn {