Commit 550449d8 authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed

net/mlx5: Don't check vport->enabled in port ops

vport->enabled is always set for a vport for which a devlink port is
registered, therefore the checks in the ops are pointless.
Remove those.
Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent b9335a75
...@@ -4125,7 +4125,6 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab ...@@ -4125,7 +4125,6 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab
{ {
struct mlx5_eswitch *esw; struct mlx5_eswitch *esw;
struct mlx5_vport *vport; struct mlx5_vport *vport;
int err = -EOPNOTSUPP;
esw = mlx5_devlink_eswitch_get(port->devlink); esw = mlx5_devlink_eswitch_get(port->devlink);
if (IS_ERR(esw)) if (IS_ERR(esw))
...@@ -4133,7 +4132,7 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab ...@@ -4133,7 +4132,7 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab
if (!MLX5_CAP_GEN(esw->dev, migration)) { if (!MLX5_CAP_GEN(esw->dev, migration)) {
NL_SET_ERR_MSG_MOD(extack, "Device doesn't support migration"); NL_SET_ERR_MSG_MOD(extack, "Device doesn't support migration");
return err; return -EOPNOTSUPP;
} }
vport = mlx5_devlink_port_fn_get_vport(port, esw); vport = mlx5_devlink_port_fn_get_vport(port, esw);
...@@ -4143,12 +4142,9 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab ...@@ -4143,12 +4142,9 @@ int mlx5_devlink_port_fn_migratable_get(struct devlink_port *port, bool *is_enab
} }
mutex_lock(&esw->state_lock); mutex_lock(&esw->state_lock);
if (vport->enabled) {
*is_enabled = vport->info.mig_enabled; *is_enabled = vport->info.mig_enabled;
err = 0;
}
mutex_unlock(&esw->state_lock); mutex_unlock(&esw->state_lock);
return err; return 0;
} }
int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable, int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,
...@@ -4177,10 +4173,6 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable, ...@@ -4177,10 +4173,6 @@ int mlx5_devlink_port_fn_migratable_set(struct devlink_port *port, bool enable,
} }
mutex_lock(&esw->state_lock); mutex_lock(&esw->state_lock);
if (!vport->enabled) {
NL_SET_ERR_MSG_MOD(extack, "Eswitch vport is disabled");
goto out;
}
if (vport->info.mig_enabled == enable) { if (vport->info.mig_enabled == enable) {
err = 0; err = 0;
...@@ -4224,7 +4216,6 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled, ...@@ -4224,7 +4216,6 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,
{ {
struct mlx5_eswitch *esw; struct mlx5_eswitch *esw;
struct mlx5_vport *vport; struct mlx5_vport *vport;
int err = -EOPNOTSUPP;
esw = mlx5_devlink_eswitch_get(port->devlink); esw = mlx5_devlink_eswitch_get(port->devlink);
if (IS_ERR(esw)) if (IS_ERR(esw))
...@@ -4237,12 +4228,9 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled, ...@@ -4237,12 +4228,9 @@ int mlx5_devlink_port_fn_roce_get(struct devlink_port *port, bool *is_enabled,
} }
mutex_lock(&esw->state_lock); mutex_lock(&esw->state_lock);
if (vport->enabled) {
*is_enabled = vport->info.roce_enabled; *is_enabled = vport->info.roce_enabled;
err = 0;
}
mutex_unlock(&esw->state_lock); mutex_unlock(&esw->state_lock);
return err; return 0;
} }
int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable, int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,
...@@ -4251,10 +4239,10 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable, ...@@ -4251,10 +4239,10 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,
int query_out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out); int query_out_sz = MLX5_ST_SZ_BYTES(query_hca_cap_out);
struct mlx5_eswitch *esw; struct mlx5_eswitch *esw;
struct mlx5_vport *vport; struct mlx5_vport *vport;
int err = -EOPNOTSUPP;
void *query_ctx; void *query_ctx;
void *hca_caps; void *hca_caps;
u16 vport_num; u16 vport_num;
int err;
esw = mlx5_devlink_eswitch_get(port->devlink); esw = mlx5_devlink_eswitch_get(port->devlink);
if (IS_ERR(esw)) if (IS_ERR(esw))
...@@ -4268,10 +4256,6 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable, ...@@ -4268,10 +4256,6 @@ int mlx5_devlink_port_fn_roce_set(struct devlink_port *port, bool enable,
vport_num = vport->vport; vport_num = vport->vport;
mutex_lock(&esw->state_lock); mutex_lock(&esw->state_lock);
if (!vport->enabled) {
NL_SET_ERR_MSG_MOD(extack, "Eswitch vport is disabled");
goto out;
}
if (vport->info.roce_enabled == enable) { if (vport->info.roce_enabled == enable) {
err = 0; err = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment