Commit 7bcffde0 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by David S. Miller
Browse files

net: ethernet: ti: am65-cpsw-nuss: restore vlan configuration while down/up 



The vlan configuration is not restored after interface down/up sequence.

Steps to check:
 # ip link add link eth0 name eth0.100 type vlan id 100
 # ifconfig eth0 down
 # ifconfig eth0 up

This patch fixes it, restoring vlan ALE entries on .ndo_open().

Fixes: 93a76530 ("net: ethernet: ti: introduce am65x/j721e gigabit eth subsystem driver")
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8483eca

drivers/net/ethernet/ti/am65-cpsw-nuss.c

+19 −0
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ static int am65_cpsw_nuss_ndo_slave_add_vid(struct net_device *ndev, 
	u32 port_mask, unreg_mcast = 0;

	int ret;



	if (!netif_running(ndev) || !vid)

		return 0;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);
@@ -246,6 +249,9 @@ static int am65_cpsw_nuss_ndo_slave_kill_vid(struct net_device *ndev, 
	struct am65_cpsw_common *common = am65_ndev_to_common(ndev);

	int ret;



	if (!netif_running(ndev) || !vid)

		return 0;



	ret = pm_runtime_get_sync(common->dev);

	if (ret < 0) {

		pm_runtime_put_noidle(common->dev);
@@ -571,6 +577,16 @@ static int am65_cpsw_nuss_ndo_slave_stop(struct net_device *ndev) 
	return 0;

}



static int cpsw_restore_vlans(struct net_device *vdev, int vid, void *arg)

{

	struct am65_cpsw_port *port = arg;



	if (!vdev)

		return 0;



	return am65_cpsw_nuss_ndo_slave_add_vid(port->ndev, 0, vid);

}



static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev)

{

	struct am65_cpsw_common *common = am65_ndev_to_common(ndev);
@@ -644,6 +660,9 @@ static int am65_cpsw_nuss_ndo_slave_open(struct net_device *ndev) 
		}

	}



	/* restore vlan configurations */

	vlan_for_each(ndev, cpsw_restore_vlans, port);



	phy_attached_info(port->slave.phy);

	phy_start(port->slave.phy);

CRA Git | Maintained and supported by SUSTech CRA and CCSE