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

Commit f6455de0 authored by Bodong Wang's avatar Bodong Wang Committed by Saeed Mahameed
Browse files

net/mlx5: E-Switch, Refactor eswitch SR-IOV interface 



Devlink eswitch mode is not necessarily related to SR-IOV, e.g, ECPF
can be at offload mode when SR-IOV is not enabled.

Rename the interface and eswitch mode names to decouple from SR-IOV,
and cleanup eswitch messages accordingly.

Signed-off-by: default avatarBodong Wang <bodong@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent e1d974d0

drivers/infiniband/hw/mlx5/ib_rep.h

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ struct net_device *mlx5_ib_get_rep_netdev(struct mlx5_eswitch *esw, 
#else /* CONFIG_MLX5_ESWITCH */

static inline u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw)

{

	return SRIOV_NONE;

	return MLX5_ESWITCH_NONE;

}



static inline

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -6814,7 +6814,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	printk_once(KERN_INFO "%s", mlx5_version);



	if (MLX5_ESWITCH_MANAGER(mdev) &&

	    mlx5_ib_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {

	    mlx5_ib_eswitch_mode(mdev->priv.eswitch) == MLX5_ESWITCH_OFFLOADS) {

		if (!mlx5_core_mp_enabled(mdev))

			mlx5_ib_register_vport_reps(mdev);

		return mdev;

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

+1 −1
Original line number Diff line number Diff line
@@ -5115,7 +5115,7 @@ static void *mlx5e_add(struct mlx5_core_dev *mdev) 


#ifdef CONFIG_MLX5_ESWITCH

	if (MLX5_ESWITCH_MANAGER(mdev) &&

	    mlx5_eswitch_mode(mdev->priv.eswitch) == SRIOV_OFFLOADS) {

	    mlx5_eswitch_mode(mdev->priv.eswitch) == MLX5_ESWITCH_OFFLOADS) {

		mlx5e_rep_register_vport_reps(mdev);

		return mdev;

	}

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

+3 −3
Original line number Diff line number Diff line
@@ -391,7 +391,7 @@ static int mlx5e_rep_get_port_parent_id(struct net_device *dev, 
	struct mlx5e_priv *uplink_priv = NULL;

	struct net_device *uplink_dev;



	if (esw->mode == SRIOV_NONE)

	if (esw->mode == MLX5_ESWITCH_NONE)

		return -EOPNOTSUPP;



	uplink_dev = mlx5_eswitch_uplink_get_proto_dev(esw, REP_ETH);
@@ -419,7 +419,7 @@ static void mlx5e_sqs2vport_stop(struct mlx5_eswitch *esw, 
	struct mlx5e_rep_sq *rep_sq, *tmp;

	struct mlx5e_rep_priv *rpriv;



	if (esw->mode != SRIOV_OFFLOADS)

	if (esw->mode != MLX5_ESWITCH_OFFLOADS)

		return;



	rpriv = mlx5e_rep_to_rep_priv(rep);
@@ -440,7 +440,7 @@ static int mlx5e_sqs2vport_start(struct mlx5_eswitch *esw, 
	int err;

	int i;



	if (esw->mode != SRIOV_OFFLOADS)

	if (esw->mode != MLX5_ESWITCH_OFFLOADS)

		return 0;



	rpriv = mlx5e_rep_to_rep_priv(rep);

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

+1 −1
Original line number Diff line number Diff line
@@ -3342,7 +3342,7 @@ mlx5e_tc_add_flow(struct mlx5e_priv *priv, 
	if (!tc_can_offload_extack(priv->netdev, f->common.extack))

		return -EOPNOTSUPP;



	if (esw && esw->mode == SRIOV_OFFLOADS)

	if (esw && esw->mode == MLX5_ESWITCH_OFFLOADS)

		err = mlx5e_add_fdb_flow(priv, f, flow_flags,

					 filter_dev, flow);

	else