From: Roger Quadros <rogerq@kernel.org>
To: davem@davemloft.net, maciej.fijalkowski@intel.com, kuba@kernel.org
Cc: andrew@lunn.ch, edumazet@google.com, pabeni@redhat.com,
vigneshr@ti.com, linux-omap@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Roger Quadros <rogerq@kernel.org>
Subject: [PATCH v5 net-next 1/6] Revert "net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume"
Date: Tue, 6 Dec 2022 11:44:14 +0200 [thread overview]
Message-ID: <20221206094419.19478-2-rogerq@kernel.org> (raw)
In-Reply-To: <20221206094419.19478-1-rogerq@kernel.org>
This reverts commit 1af3cb3702d02167926a2bd18580cecb2d64fd94.
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>
---
drivers/net/ethernet/ti/am65-cpsw-nuss.c | 7 -------
drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 --
2 files changed, 9 deletions(-)
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.c b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
index 6b0458df613a..b43dc75c2202 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.c
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.c
@@ -2714,7 +2714,6 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
struct clk *clk;
u64 id_temp;
int ret, i;
- int ale_entries;
common = devm_kzalloc(dev, sizeof(struct am65_cpsw_common), GFP_KERNEL);
if (!common)
@@ -2809,10 +2808,6 @@ static int am65_cpsw_nuss_probe(struct platform_device *pdev)
goto err_of_clear;
}
- ale_entries = common->ale->params.ale_entries;
- common->ale_context = devm_kzalloc(dev,
- ale_entries * ALE_ENTRY_WORDS * sizeof(u32),
- GFP_KERNEL);
ret = am65_cpsw_init_cpts(common);
if (ret)
goto err_of_clear;
@@ -2883,7 +2878,6 @@ static int am65_cpsw_nuss_suspend(struct device *dev)
int i, ret;
struct am65_cpsw_host *host_p = am65_common_get_host(common);
- cpsw_ale_dump(common->ale, common->ale_context);
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];
@@ -2942,7 +2936,6 @@ static int am65_cpsw_nuss_resume(struct device *dev)
}
writel(host_p->vid_context, host_p->port_base + AM65_CPSW_PORT_VLAN_REG_OFFSET);
- cpsw_ale_restore(common->ale, common->ale_context);
return 0;
}
diff --git a/drivers/net/ethernet/ti/am65-cpsw-nuss.h b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
index 4b75620f8d28..e95cc37a7286 100644
--- a/drivers/net/ethernet/ti/am65-cpsw-nuss.h
+++ b/drivers/net/ethernet/ti/am65-cpsw-nuss.h
@@ -149,8 +149,6 @@ struct am65_cpsw_common {
struct net_device *hw_bridge_dev;
struct notifier_block am65_cpsw_netdevice_nb;
unsigned char switch_id[MAX_PHYS_ITEM_ID_LEN];
- /* only for suspend/resume context restore */
- u32 *ale_context;
};
struct am65_cpsw_ndev_stats {
--
2.17.1
next prev parent reply other threads:[~2022-12-06 9:45 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-12-06 9:44 [PATCH v5 net-next 0/6] net: ethernet: ti: am65-cpsw: Fix set channel operation Roger Quadros
2022-12-06 9:44 ` Roger Quadros [this message]
2022-12-06 9:44 ` [PATCH v5 net-next 2/6] Revert "net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume" Roger Quadros
2022-12-06 9:44 ` [PATCH v5 net-next 3/6] Revert "net: ethernet: ti: am65-cpsw: Add suspend/resume support" Roger Quadros
2022-12-06 9:44 ` [PATCH v5 net-next 4/6] net: ethernet: ti: am65-cpsw: Add suspend/resume support Roger Quadros
2022-12-08 4:21 ` Jakub Kicinski
2022-12-08 9:49 ` Roger Quadros
2022-12-06 9:44 ` [PATCH v5 net-next 5/6] net: ethernet: ti: am65-cpsw: retain PORT_VLAN_REG after suspend/resume Roger Quadros
2022-12-06 9:44 ` [PATCH v5 net-next 6/6] net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume Roger Quadros
2022-12-06 10:05 ` [PATCH v5 net-next 0/6] net: ethernet: ti: am65-cpsw: Fix set channel operation Leon Romanovsky
2022-12-06 10:15 ` Roger Quadros
2022-12-06 11:49 ` Leon Romanovsky
2022-12-08 4:30 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221206094419.19478-2-rogerq@kernel.org \
--to=rogerq@kernel.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=maciej.fijalkowski@intel.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=vigneshr@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).