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

Commit f91bb70a authored by Omri Kahalon's avatar Omri Kahalon Committed by Greg Kroah-Hartman
Browse files

net/mlx5: E-Switch, Fix esw manager vport indication for more vport commands 



[ Upstream commit eca4a928585ac08147e5cc8e2111ecbc6279ee31 ]

Traditionally, the PF (Physical Function) which resides on vport 0 was
the E-switch manager. Since the ECPF (Embedded CPU Physical Function),
which resides on vport 0xfffe, was introduced as the E-Switch manager,
the assumption that the E-switch manager is on vport 0 is incorrect.

Since the eswitch code already uses the actual vport value, all we
need is to always set other_vport=1.

Signed-off-by: default avatarOmri Kahalon <omrik@mellanox.com>
Reviewed-by: default avatarMax Gurtovoy <maxg@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 7e0548e1

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

+2 −4
Original line number Diff line number Diff line
@@ -80,7 +80,6 @@ static int arm_vport_context_events_cmd(struct mlx5_core_dev *dev, u16 vport, 
		 opcode, MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);

	MLX5_SET(modify_nic_vport_context_in, in, field_select.change_event, 1);

	MLX5_SET(modify_nic_vport_context_in, in, vport_number, vport);

	if (vport)

	MLX5_SET(modify_nic_vport_context_in, in, other_vport, 1);

	nic_vport_ctx = MLX5_ADDR_OF(modify_nic_vport_context_in,

				     in, nic_vport_context);
@@ -109,7 +108,6 @@ static int modify_esw_vport_context_cmd(struct mlx5_core_dev *dev, u16 vport, 
	MLX5_SET(modify_esw_vport_context_in, in, opcode,

		 MLX5_CMD_OP_MODIFY_ESW_VPORT_CONTEXT);

	MLX5_SET(modify_esw_vport_context_in, in, vport_number, vport);

	if (vport)

	MLX5_SET(modify_esw_vport_context_in, in, other_vport, 1);

	return mlx5_cmd_exec(dev, in, inlen, out, sizeof(out));

}