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

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

net/mlx5: Update access functions to Query/Modify vport MAC address 



In preparation for SR-IOV we add here an API to enable each e-switch
client (PF/VF) to configure its L2 MAC addresses and for the e-switch
manager (usually the PF) to access them in order to be able to
configure them into the e-switch.
Therefore we now pass vport num parameter to
mlx5_query_nic_vport_context, so PF can access other vports contexts.

preperation for ethernet sriov and l2 table management.

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 54f0a411

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

+1 −1
Original line number Diff line number Diff line
@@ -2028,7 +2028,7 @@ static void mlx5e_set_netdev_dev_addr(struct net_device *netdev) 
{

	struct mlx5e_priv *priv = netdev_priv(netdev);



	mlx5_query_nic_vport_mac_address(priv->mdev, netdev->dev_addr);

	mlx5_query_nic_vport_mac_address(priv->mdev, 0, netdev->dev_addr);

}



static void mlx5e_build_netdev(struct net_device *netdev)

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

+76 −11
Original line number Diff line number Diff line
@@ -57,33 +57,98 @@ u8 mlx5_query_vport_state(struct mlx5_core_dev *mdev, u8 opmod) 
}

EXPORT_SYMBOL(mlx5_query_vport_state);



void mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev, u8 *addr)

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

					u32 *out, int outlen)

{

	u32 in[MLX5_ST_SZ_DW(query_nic_vport_context_in)];



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



	MLX5_SET(query_nic_vport_context_in, in, opcode,

		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);



	MLX5_SET(query_nic_vport_context_in, in, vport_number, vport);

	if (vport)

		MLX5_SET(query_nic_vport_context_in, in, other_vport, 1);



	return mlx5_cmd_exec_check_status(mdev, in, sizeof(in), out, outlen);

}



static int mlx5_modify_nic_vport_context(struct mlx5_core_dev *mdev, void *in,

					 int inlen)

{

	u32 out[MLX5_ST_SZ_DW(modify_nic_vport_context_out)];



	MLX5_SET(modify_nic_vport_context_in, in, opcode,

		 MLX5_CMD_OP_MODIFY_NIC_VPORT_CONTEXT);



	memset(out, 0, sizeof(out));

	return mlx5_cmd_exec_check_status(mdev, in, inlen, out, sizeof(out));

}



int mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev,

				     u16 vport, u8 *addr)

{

	u32 *out;

	int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);

	u8 *out_addr;

	int err;



	out = mlx5_vzalloc(outlen);

	if (!out)

		return;

		return -ENOMEM;



	out_addr = MLX5_ADDR_OF(query_nic_vport_context_out, out,

				nic_vport_context.permanent_address);



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



	MLX5_SET(query_nic_vport_context_in, in, opcode,

		 MLX5_CMD_OP_QUERY_NIC_VPORT_CONTEXT);



	memset(out, 0, outlen);

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

	err = mlx5_query_nic_vport_context(mdev, vport, out, outlen);

	if (err)

		goto out;



	ether_addr_copy(addr, &out_addr[2]);



out:

	kvfree(out);

	return err;

}

EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_mac_address);



int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *mdev,

				      u16 vport, u8 *addr)

{

	void *in;

	int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);

	int err;

	void *nic_vport_ctx;

	u8 *perm_mac;



	in = mlx5_vzalloc(inlen);

	if (!in) {

		mlx5_core_warn(mdev, "failed to allocate inbox\n");

		return -ENOMEM;

	}



	MLX5_SET(modify_nic_vport_context_in, in,

		 field_select.permanent_address, 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);

	perm_mac = MLX5_ADDR_OF(nic_vport_context, nic_vport_ctx,

				permanent_address);



	ether_addr_copy(&perm_mac[2], addr);



	err = mlx5_modify_nic_vport_context(mdev, in, inlen);



	kvfree(in);



	return err;

}

EXPORT_SYMBOL(mlx5_query_nic_vport_mac_address);

EXPORT_SYMBOL(mlx5_modify_nic_vport_mac_address);



int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,

			     u8 port_num, u16  vf_num, u16 gid_index,

include/linux/mlx5/vport.h

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



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

void mlx5_query_nic_vport_mac_address(struct mlx5_core_dev *mdev, u8 *addr);

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,

				      u16 vport, u8 *addr);

int mlx5_query_hca_vport_gid(struct mlx5_core_dev *dev, u8 other_vport,

			     u8 port_num, u16  vf_num, u16 gid_index,

			     union ib_gid *gid);