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

Commit 6dcfa234 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net/mlx5e: Implement ndo_get_port_parent_id() 



mlx5e only supports SWITCHDEV_ATTR_ID_PORT_PARENT_ID, which makes it a
great candidate to be converted to use the ndo_get_port_parent_id() NDO
instead of implementing switchdev_port_attr_get().

Since mlx5e makes use of switchdev_port_parent_id() convert it to use
netdev_port_same_parent_id().

Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c4bf2450

drivers/net/ethernet/mellanox/mlx5/core/en/tc_tun.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ static int get_route_and_out_devs(struct mlx5e_priv *priv, 
	/* if the egress device isn't on the same HW e-switch or

	 * it's a LAG device, use the uplink

	 */

	if (!switchdev_port_same_parent_id(priv->netdev, dev) ||

	if (!netdev_port_same_parent_id(priv->netdev, dev) ||

	    dst_is_lag_dev) {

		*route_dev = uplink_dev;

		*out_dev = *route_dev;

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

+11 −20
Original line number Diff line number Diff line
@@ -381,7 +381,8 @@ static const struct ethtool_ops mlx5e_uplink_rep_ethtool_ops = { 
	.set_pauseparam    = mlx5e_uplink_rep_set_pauseparam,

};



static int mlx5e_attr_get(struct net_device *dev, struct switchdev_attr *attr)

static int mlx5e_rep_get_port_parent_id(struct net_device *dev,

					struct netdev_phys_item_id *ppid)

{

	struct mlx5e_priv *priv = netdev_priv(dev);

	struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
@@ -398,20 +399,14 @@ static int mlx5e_attr_get(struct net_device *dev, struct switchdev_attr *attr) 
		uplink_priv = netdev_priv(uplink_dev);

	}



	switch (attr->id) {

	case SWITCHDEV_ATTR_ID_PORT_PARENT_ID:

		attr->u.ppid.id_len = ETH_ALEN;

	ppid->id_len = ETH_ALEN;

	if (uplink_upper && mlx5_lag_is_sriov(uplink_priv->mdev)) {

			ether_addr_copy(attr->u.ppid.id, uplink_upper->dev_addr);

		ether_addr_copy(ppid->id, uplink_upper->dev_addr);

	} else {

		struct mlx5e_rep_priv *rpriv = priv->ppriv;

		struct mlx5_eswitch_rep *rep = rpriv->rep;



			ether_addr_copy(attr->u.ppid.id, rep->hw_id);

		}

		break;

	default:

		return -EOPNOTSUPP;

		ether_addr_copy(ppid->id, rep->hw_id);

	}



	return 0;
@@ -1284,10 +1279,6 @@ static int mlx5e_uplink_rep_set_vf_vlan(struct net_device *dev, int vf, u16 vlan 
	return 0;

}



static const struct switchdev_ops mlx5e_rep_switchdev_ops = {

	.switchdev_port_attr_get	= mlx5e_attr_get,

};



static const struct net_device_ops mlx5e_netdev_ops_vf_rep = {

	.ndo_open                = mlx5e_vf_rep_open,

	.ndo_stop                = mlx5e_vf_rep_close,
@@ -1298,6 +1289,7 @@ static const struct net_device_ops mlx5e_netdev_ops_vf_rep = { 
	.ndo_has_offload_stats	 = mlx5e_rep_has_offload_stats,

	.ndo_get_offload_stats	 = mlx5e_rep_get_offload_stats,

	.ndo_change_mtu          = mlx5e_vf_rep_change_mtu,

	.ndo_get_port_parent_id	 = mlx5e_rep_get_port_parent_id,

};



static const struct net_device_ops mlx5e_netdev_ops_uplink_rep = {
@@ -1319,6 +1311,7 @@ static const struct net_device_ops mlx5e_netdev_ops_uplink_rep = { 
	.ndo_get_vf_config       = mlx5e_get_vf_config,

	.ndo_get_vf_stats        = mlx5e_get_vf_stats,

	.ndo_set_vf_vlan         = mlx5e_uplink_rep_set_vf_vlan,

	.ndo_get_port_parent_id	 = mlx5e_rep_get_port_parent_id,

};



bool mlx5e_eswitch_rep(struct net_device *netdev)
@@ -1393,8 +1386,6 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev) 
	netdev->watchdog_timeo    = 15 * HZ;





	netdev->switchdev_ops = &mlx5e_rep_switchdev_ops;



	netdev->features	 |= NETIF_F_HW_TC | NETIF_F_NETNS_LOCAL;

	netdev->hw_features      |= NETIF_F_HW_TC;

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

+2 −3
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ 
#include <linux/mlx5/fs.h>

#include <linux/mlx5/device.h>

#include <linux/rhashtable.h>

#include <net/switchdev.h>

#include <net/tc_act/tc_mirred.h>

#include <net/tc_act/tc_vlan.h>

#include <net/tc_act/tc_tunnel_key.h>
@@ -2525,7 +2524,7 @@ static int parse_tc_fdb_actions(struct mlx5e_priv *priv, 


			action |= MLX5_FLOW_CONTEXT_ACTION_FWD_DEST |

				  MLX5_FLOW_CONTEXT_ACTION_COUNT;

			if (switchdev_port_same_parent_id(priv->netdev,

			if (netdev_port_same_parent_id(priv->netdev,

						       out_dev) ||

			    is_merged_eswitch_dev(priv, out_dev)) {

				struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;