lkml.org 
[lkml]   [2022]   [Nov]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 net-next 1/6] Revert "net: ethernet: ti: am65-cpsw: Fix hardware switch mode on suspend/resume"
    Date
    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
    \
     
     \ /
      Last update: 2022-11-23 14:08    [W:4.057 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site