net/mlx5e: Use vport MTU rather than physical port MTU

[cascardo/linux.git] / drivers / net / ethernet / mellanox / mlx5 / core / vport.c

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/vport.c b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
index 90ab09e..b69dadc 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/vport.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/vport.c
@@ -196,6 +196,46 @@ int mlx5_modify_nic_vport_mac_address(struct mlx5_core_dev *mdev,
 }
 EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mac_address);
 
+int mlx5_query_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 *mtu)
+{
+       int outlen = MLX5_ST_SZ_BYTES(query_nic_vport_context_out);
+       u32 *out;
+       int err;
+
+       out = mlx5_vzalloc(outlen);
+       if (!out)
+               return -ENOMEM;
+
+       err = mlx5_query_nic_vport_context(mdev, 0, out, outlen);
+       if (!err)
+               *mtu = MLX5_GET(query_nic_vport_context_out, out,
+                               nic_vport_context.mtu);
+
+       kvfree(out);
+       return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_query_nic_vport_mtu);
+
+int mlx5_modify_nic_vport_mtu(struct mlx5_core_dev *mdev, u16 mtu)
+{
+       int inlen = MLX5_ST_SZ_BYTES(modify_nic_vport_context_in);
+       void *in;
+       int err;
+
+       in = mlx5_vzalloc(inlen);
+       if (!in)
+               return -ENOMEM;
+
+       MLX5_SET(modify_nic_vport_context_in, in, field_select.mtu, 1);
+       MLX5_SET(modify_nic_vport_context_in, in, nic_vport_context.mtu, mtu);
+
+       err = mlx5_modify_nic_vport_context(mdev, in, inlen);
+
+       kvfree(in);
+       return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_modify_nic_vport_mtu);
+
 int mlx5_query_nic_vport_mac_list(struct mlx5_core_dev *dev,
                                  u32 vport,
                                  enum mlx5_list_type list_type,
@@ -852,7 +892,8 @@ int mlx5_nic_vport_disable_roce(struct mlx5_core_dev *mdev)
 EXPORT_SYMBOL_GPL(mlx5_nic_vport_disable_roce);
 
 int mlx5_core_query_vport_counter(struct mlx5_core_dev *dev, u8 other_vport,
-                                 u8 port_num, void *out, size_t out_sz)
+                                 int vf, u8 port_num, void *out,
+                                 size_t out_sz)
 {
        int     in_sz = MLX5_ST_SZ_BYTES(query_vport_counter_in);
        int     is_group_manager;
@@ -871,7 +912,7 @@ int mlx5_core_query_vport_counter(struct mlx5_core_dev *dev, u8 other_vport,
        if (other_vport) {
                if (is_group_manager) {
                        MLX5_SET(query_vport_counter_in, in, other_vport, 1);
-                       MLX5_SET(query_vport_counter_in, in, vport_number, 0);
+                       MLX5_SET(query_vport_counter_in, in, vport_number, vf + 1);
                } else {
                        err = -EPERM;
                        goto free;
@@ -890,3 +931,70 @@ free:
        return err;
 }
 EXPORT_SYMBOL_GPL(mlx5_core_query_vport_counter);
+
+int mlx5_core_modify_hca_vport_context(struct mlx5_core_dev *dev,
+                                      u8 other_vport, u8 port_num,
+                                      int vf,
+                                      struct mlx5_hca_vport_context *req)
+{
+       int in_sz = MLX5_ST_SZ_BYTES(modify_hca_vport_context_in);
+       u8 out[MLX5_ST_SZ_BYTES(modify_hca_vport_context_out)];
+       int is_group_manager;
+       void *in;
+       int err;
+       void *ctx;
+
+       mlx5_core_dbg(dev, "vf %d\n", vf);
+       is_group_manager = MLX5_CAP_GEN(dev, vport_group_manager);
+       in = kzalloc(in_sz, GFP_KERNEL);
+       if (!in)
+               return -ENOMEM;
+
+       memset(out, 0, sizeof(out));
+       MLX5_SET(modify_hca_vport_context_in, in, opcode, MLX5_CMD_OP_MODIFY_HCA_VPORT_CONTEXT);
+       if (other_vport) {
+               if (is_group_manager) {
+                       MLX5_SET(modify_hca_vport_context_in, in, other_vport, 1);
+                       MLX5_SET(modify_hca_vport_context_in, in, vport_number, vf);
+               } else {
+                       err = -EPERM;
+                       goto ex;
+               }
+       }
+
+       if (MLX5_CAP_GEN(dev, num_ports) > 1)
+               MLX5_SET(modify_hca_vport_context_in, in, port_num, port_num);
+
+       ctx = MLX5_ADDR_OF(modify_hca_vport_context_in, in, hca_vport_context);
+       MLX5_SET(hca_vport_context, ctx, field_select, req->field_select);
+       MLX5_SET(hca_vport_context, ctx, sm_virt_aware, req->sm_virt_aware);
+       MLX5_SET(hca_vport_context, ctx, has_smi, req->has_smi);
+       MLX5_SET(hca_vport_context, ctx, has_raw, req->has_raw);
+       MLX5_SET(hca_vport_context, ctx, vport_state_policy, req->policy);
+       MLX5_SET(hca_vport_context, ctx, port_physical_state, req->phys_state);
+       MLX5_SET(hca_vport_context, ctx, vport_state, req->vport_state);
+       MLX5_SET64(hca_vport_context, ctx, port_guid, req->port_guid);
+       MLX5_SET64(hca_vport_context, ctx, node_guid, req->node_guid);
+       MLX5_SET(hca_vport_context, ctx, cap_mask1, req->cap_mask1);
+       MLX5_SET(hca_vport_context, ctx, cap_mask1_field_select, req->cap_mask1_perm);
+       MLX5_SET(hca_vport_context, ctx, cap_mask2, req->cap_mask2);
+       MLX5_SET(hca_vport_context, ctx, cap_mask2_field_select, req->cap_mask2_perm);
+       MLX5_SET(hca_vport_context, ctx, lid, req->lid);
+       MLX5_SET(hca_vport_context, ctx, init_type_reply, req->init_type_reply);
+       MLX5_SET(hca_vport_context, ctx, lmc, req->lmc);
+       MLX5_SET(hca_vport_context, ctx, subnet_timeout, req->subnet_timeout);
+       MLX5_SET(hca_vport_context, ctx, sm_lid, req->sm_lid);
+       MLX5_SET(hca_vport_context, ctx, sm_sl, req->sm_sl);
+       MLX5_SET(hca_vport_context, ctx, qkey_violation_counter, req->qkey_violation_counter);
+       MLX5_SET(hca_vport_context, ctx, pkey_violation_counter, req->pkey_violation_counter);
+       err = mlx5_cmd_exec(dev, in, in_sz, out, sizeof(out));
+       if (err)
+               goto ex;
+
+       err = mlx5_cmd_status_to_err_v2(out);
+
+ex:
+       kfree(in);
+       return err;
+}
+EXPORT_SYMBOL_GPL(mlx5_core_modify_hca_vport_context);