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

Commit e7546514 authored by Saeed Mahameed's avatar Saeed Mahameed Committed by David S. Miller
Browse files

net/mlx5: Introduce access functions to modify/query vport state 



In preparation for SR-IOV we add here an API to enable each e-switch
manager (PF) to configure its VFs link states in e-switch

preparation for ethernet sriov.

Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e16aea27

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void mlx5e_update_carrier(struct mlx5e_priv *priv) 
	u8 port_state;



	port_state = mlx5_query_vport_state(mdev,

		MLX5_QUERY_VPORT_STATE_IN_OP_MOD_VNIC_VPORT);

		MLX5_QUERY_VPORT_STATE_IN_OP_MOD_VNIC_VPORT, 0);



	if (port_state == VPORT_STATE_UP)

		netif_carrier_on(priv->netdev);

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

+55 −6
Original line number Diff line number Diff line
@@ -36,26 +36,75 @@ 
#include <linux/mlx5/vport.h>

#include "mlx5_core.h"



u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod)

static int _mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod,

				   u16 vport, u32 *out, int outlen)

{

	u32 in[MLX5_ST_SZ_DW(query_vport_state_in)];

	u32 out[MLX5_ST_SZ_DW(query_vport_state_out)];

	int err;

	u32 in[MLX5_ST_SZ_DW(query_vport_state_in)];



	memset(in, 0, sizeof(in));



	MLX5_SET(query_vport_state_in, in, opcode,

		 MLX5_CMD_OP_QUERY_VPORT_STATE);

	MLX5_SET(query_vport_state_in, in, op_mod, opmod);

	MLX5_SET(query_vport_state_in, in, vport_number, vport);

	if (vport)

		MLX5_SET(query_vport_state_in, in, other_vport, 1);



	err = mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out,

					 sizeof(out));

	err = mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out, outlen);

	if (err)

		mlx5_core_warn(mdev, "MLX5_CMD_OP_QUERY_VPORT_STATE failed\n");



	return err;

}



u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport)

{

	u32 out[MLX5_ST_SZ_DW(query_vport_state_out)] = {0};



	_mlx5_query_vport_state(mdev, opmod, vport, out, sizeof(out));



	return MLX5_GET(query_vport_state_out, out, state);

}

EXPORT_SYMBOL(mlx5_query_vport_state);

EXPORT_SYMBOL_GPL(mlx5_query_vport_state);



u8 mlx5_query_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport)

{

	u32 out[MLX5_ST_SZ_DW(query_vport_state_out)] = {0};



	_mlx5_query_vport_state(mdev, opmod, vport, out, sizeof(out));



	return MLX5_GET(query_vport_state_out, out, admin_state);

}

EXPORT_SYMBOL(mlx5_query_vport_admin_state);



int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,

				  u16 vport, u8 state)

{

	u32 in[MLX5_ST_SZ_DW(modify_vport_state_in)];

	u32 out[MLX5_ST_SZ_DW(modify_vport_state_out)];

	int err;



	memset(in, 0, sizeof(in));



	MLX5_SET(modify_vport_state_in, in, opcode,

		 MLX5_CMD_OP_MODIFY_VPORT_STATE);

	MLX5_SET(modify_vport_state_in, in, op_mod, opmod);

	MLX5_SET(modify_vport_state_in, in, vport_number, vport);



	if (vport)

		MLX5_SET(modify_vport_state_in, in, other_vport, 1);



	MLX5_SET(modify_vport_state_in, in, admin_state, state);



	err = mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out,

					 sizeof(out));

	if (err)

		mlx5_core_warn(mdev, "MLX5_CMD_OP_MODIFY_VPORT_STATE failed\n");



	return err;

}

EXPORT_SYMBOL(mlx5_modify_vport_admin_state);



static int mlx5_query_nic_vport_context(struct mlx5_core_dev *mdev, u16 vport,

					u32 *out, int outlen)

include/linux/mlx5/mlx5_ifc.h

+1 −0
Original line number Diff line number Diff line
@@ -2946,6 +2946,7 @@ struct mlx5_ifc_query_vport_state_out_bits { 


enum {

	MLX5_QUERY_VPORT_STATE_IN_OP_MOD_VNIC_VPORT  = 0x0,

	MLX5_QUERY_VPORT_STATE_IN_OP_MOD_ESW_VPORT   = 0x1,

};



struct mlx5_ifc_query_vport_state_in_bits {

include/linux/mlx5/vport.h

+5 −1
Original line number Diff line number Diff line
@@ -36,7 +36,11 @@ 
#include <linux/mlx5/driver.h>

#include <linux/mlx5/device.h>



u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod);

u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod, u16 vport);

u8 mlx5_query_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,

				u16 vport);

int mlx5_modify_vport_admin_state(struct mlx5_core_dev *mdev, u8 opmod,

				  u16 vport, u8 state);

int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev,

				     u16 vport, u8 *addr);

int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *dev,