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

Commit c3994f4f authored by Or Gerlitz's avatar Or Gerlitz Committed by Greg Kroah-Hartman
Browse files

net/mlx5: E-Switch, Avoid setup attempt if not being e-switch manager 



[ Upstream commit 0efc8562491b7d36f6bbc4fbc8f3348cb6641e9c ]

In smartnic env, the host (PF) driver might not be an e-switch
manager, hence the FW will err on driver attempts to deal with
setting/unsetting the eswitch and as a result the overall setup
of sriov will fail.

Fix that by avoiding the operation if e-switch management is not
allowed for this driver instance. While here, move to use the
correct name for the esw manager capability name.

Fixes: 81848731 ('net/mlx5: E-Switch, Add SR-IOV (FDB) support')
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Reported-by: default avatarGuy Kushnir <guyk@mellanox.com>
Reviewed-by: default avatarEli Cohen <eli@melloanox.com>
Tested-by: default avatarEli Cohen <eli@melloanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b216867c

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

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ static bool mlx5e_is_vf_vport_rep(struct mlx5e_priv *priv) 
	struct mlx5e_rep_priv *rpriv = priv->ppriv;

	struct mlx5_eswitch_rep *rep;



	if (!MLX5_CAP_GEN(priv->mdev, eswitch_flow_table))

	if (!MLX5_ESWITCH_MANAGER(priv->mdev))

		return false;



	rep = rpriv->rep;

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

+1 −1
Original line number Diff line number Diff line
@@ -1535,7 +1535,7 @@ int mlx5_eswitch_enable_sriov(struct mlx5_eswitch *esw, int nvfs, int mode) 
	if (!ESW_ALLOWED(esw))

		return 0;



	if (!MLX5_CAP_GEN(esw->dev, eswitch_flow_table) ||

	if (!MLX5_ESWITCH_MANAGER(esw->dev) ||

	    !MLX5_CAP_ESW_FLOWTABLE_FDB(esw->dev, ft_support)) {

		esw_warn(esw->dev, "E-Switch FDB is not supported, aborting ...\n");

		return -EOPNOTSUPP;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.h

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include <linux/mlx5/device.h>

#include "lib/mpfs.h"



#define MLX5_ESWITCH_MANAGER(mdev) MLX5_CAP_GEN(mdev, eswitch_manager)



enum {

	SRIOV_NONE,

	SRIOV_LEGACY,

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

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "mlx5_core.h"

#include "fs_core.h"

#include "fs_cmd.h"

#include "eswitch.h"

#include "diag/fs_tracepoint.h"



#define INIT_TREE_NODE_ARRAY_SIZE(...)	(sizeof((struct init_tree_node[]){__VA_ARGS__}) /\
@@ -2211,7 +2212,7 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
			goto err;

	}



	if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {

	if (MLX5_ESWITCH_MANAGER(dev)) {

		if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {

			err = init_fdb_root_ns(steering);

			if (err)

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

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

#include <linux/module.h>

#include "mlx5_core.h"

#include "eswitch.h"

#include "../../mlxfw/mlxfw.h"



static int mlx5_cmd_query_adapter(struct mlx5_core_dev *dev, u32 *out,
@@ -152,13 +153,13 @@ int mlx5_query_hca_caps(struct mlx5_core_dev *dev) 
	}



	if (MLX5_CAP_GEN(dev, vport_group_manager) &&

	    MLX5_CAP_GEN(dev, eswitch_flow_table)) {

	    MLX5_ESWITCH_MANAGER(dev)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH_FLOW_TABLE);

		if (err)

			return err;

	}



	if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {

	if (MLX5_ESWITCH_MANAGER(dev)) {

		err = mlx5_core_get_caps(dev, MLX5_CAP_ESWITCH);

		if (err)

			return err;