Commit 1bae8fa8 authored by Roger Quadros's avatar Roger Quadros Committed by Jakub Kicinski

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

This reverts commit 643cf0e3.

This is to make it easier to revert the offending commit
fd23df72 ("net: ethernet: ti: am65-cpsw: Add suspend/resume support")
Signed-off-by: default avatarRoger Quadros <rogerq@kernel.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 1a352596
...@@ -2876,9 +2876,7 @@ static int am65_cpsw_nuss_suspend(struct device *dev) ...@@ -2876,9 +2876,7 @@ static int am65_cpsw_nuss_suspend(struct device *dev)
struct am65_cpsw_port *port; struct am65_cpsw_port *port;
struct net_device *ndev; struct net_device *ndev;
int i, ret; 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++) { for (i = 0; i < common->port_num; i++) {
port = &common->ports[i]; port = &common->ports[i];
ndev = port->ndev; ndev = port->ndev;
...@@ -2886,7 +2884,6 @@ static int am65_cpsw_nuss_suspend(struct device *dev) ...@@ -2886,7 +2884,6 @@ static int am65_cpsw_nuss_suspend(struct device *dev)
if (!ndev) if (!ndev)
continue; continue;
port->vid_context = readl(port->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
netif_device_detach(ndev); netif_device_detach(ndev);
if (netif_running(ndev)) { if (netif_running(ndev)) {
rtnl_lock(); rtnl_lock();
...@@ -2910,7 +2907,6 @@ static int am65_cpsw_nuss_resume(struct device *dev) ...@@ -2910,7 +2907,6 @@ static int am65_cpsw_nuss_resume(struct device *dev)
struct am65_cpsw_port *port; struct am65_cpsw_port *port;
struct net_device *ndev; struct net_device *ndev;
int i, ret; int i, ret;
struct am65_cpsw_host *host_p = am65_common_get_host(common);
am65_cpts_resume(common->cpts); am65_cpts_resume(common->cpts);
...@@ -2932,11 +2928,8 @@ static int am65_cpsw_nuss_resume(struct device *dev) ...@@ -2932,11 +2928,8 @@ static int am65_cpsw_nuss_resume(struct device *dev)
} }
netif_device_attach(ndev); 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; return 0;
} }
#endif /* CONFIG_PM_SLEEP */ #endif /* CONFIG_PM_SLEEP */
......
...@@ -55,16 +55,12 @@ struct am65_cpsw_port { ...@@ -55,16 +55,12 @@ struct am65_cpsw_port {
bool rx_ts_enabled; bool rx_ts_enabled;
struct am65_cpsw_qos qos; struct am65_cpsw_qos qos;
struct devlink_port devlink_port; struct devlink_port devlink_port;
/* Only for suspend resume context */
u32 vid_context;
}; };
struct am65_cpsw_host { struct am65_cpsw_host {
struct am65_cpsw_common *common; struct am65_cpsw_common *common;
void __iomem *port_base; void __iomem *port_base;
void __iomem *stat_base; void __iomem *stat_base;
/* Only for suspend resume context */
u32 vid_context;
}; };
struct am65_cpsw_tx_chn { struct am65_cpsw_tx_chn {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment