Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f125376b authored by Or Gerlitz's avatar Or Gerlitz Committed by Saeed Mahameed
Browse files

net/mlx5: Make eswitch support to depend on switchdev 



Add dependancy for switchdev to be congfigured as any user-space control
plane SW is expected to use the HW switchdev ID to locate the representors
related to VFs of a certain PF and apply SW/offloaded switching on them.

Fixes: e80541ec ('net/mlx5: Add CONFIG_MLX5_ESWITCH Kconfig')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 5ecadff0

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ config MLX5_MPFS 


config MLX5_ESWITCH

	bool "Mellanox Technologies MLX5 SRIOV E-Switch support"

	depends on MLX5_CORE_EN

	depends on MLX5_CORE_EN && NET_SWITCHDEV

	default y

	---help---

	  Mellanox Technologies Ethernet SRIOV E-Switch support in ConnectX NIC.

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+2 −2
Original line number Diff line number Diff line
@@ -4069,7 +4069,7 @@ static void mlx5e_set_netdev_dev_addr(struct net_device *netdev) 
	}

}



#if IS_ENABLED(CONFIG_NET_SWITCHDEV) && IS_ENABLED(CONFIG_MLX5_ESWITCH)

#if IS_ENABLED(CONFIG_MLX5_ESWITCH)

static const struct switchdev_ops mlx5e_switchdev_ops = {

	.switchdev_port_attr_get	= mlx5e_attr_get,

};
@@ -4175,7 +4175,7 @@ static void mlx5e_build_nic_netdev(struct net_device *netdev) 


	mlx5e_set_netdev_dev_addr(netdev);



#if IS_ENABLED(CONFIG_NET_SWITCHDEV) && IS_ENABLED(CONFIG_MLX5_ESWITCH)

#if IS_ENABLED(CONFIG_MLX5_ESWITCH)

	if (MLX5_VPORT_MANAGER(mdev))

		netdev->switchdev_ops = &mlx5e_switchdev_ops;

#endif

drivers/net/ethernet/mellanox/mlx5/core/en_rep.c

+0 −2
Original line number Diff line number Diff line
@@ -900,9 +900,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev) 


	netdev->ethtool_ops	  = &mlx5e_rep_ethtool_ops;



#ifdef CONFIG_NET_SWITCHDEV

	netdev->switchdev_ops = &mlx5e_rep_switchdev_ops;

#endif



	netdev->features	 |= NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_TC | NETIF_F_NETNS_LOCAL;

	netdev->hw_features      |= NETIF_F_HW_TC;