diff options
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c | 123 |
1 files changed, 23 insertions, 100 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c index bcafb4bf9415..7b8ff7a71003 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en/rqt.c @@ -4,33 +4,6 @@ #include "rqt.h" #include <linux/mlx5/transobj.h> -static bool verify_num_vhca_ids(struct mlx5_core_dev *mdev, u32 *vhca_ids, - unsigned int size) -{ - unsigned int max_num_vhca_id = MLX5_CAP_GEN_2(mdev, max_rqt_vhca_id); - int i; - - /* Verify that all vhca_ids are in range [0, max_num_vhca_ids - 1] */ - for (i = 0; i < size; i++) - if (vhca_ids[i] >= max_num_vhca_id) - return false; - return true; -} - -static bool rqt_verify_vhca_ids(struct mlx5_core_dev *mdev, u32 *vhca_ids, - unsigned int size) -{ - if (!vhca_ids) - return true; - - if (!MLX5_CAP_GEN(mdev, cross_vhca_rqt)) - return false; - if (!verify_num_vhca_ids(mdev, vhca_ids, size)) - return false; - - return true; -} - void mlx5e_rss_params_indir_init_uniform(struct mlx5e_rss_params_indir *indir, unsigned int num_channels) { @@ -40,38 +13,19 @@ void mlx5e_rss_params_indir_init_uniform(struct mlx5e_rss_params_indir *indir, indir->table[i] = i % num_channels; } -static void fill_rqn_list(void *rqtc, u32 *rqns, u32 *vhca_ids, unsigned int size) -{ - unsigned int i; - - if (vhca_ids) { - MLX5_SET(rqtc, rqtc, rq_vhca_id_format, 1); - for (i = 0; i < size; i++) { - MLX5_SET(rqtc, rqtc, rq_vhca[i].rq_num, rqns[i]); - MLX5_SET(rqtc, rqtc, rq_vhca[i].rq_vhca_id, vhca_ids[i]); - } - } else { - for (i = 0; i < size; i++) - MLX5_SET(rqtc, rqtc, rq_num[i], rqns[i]); - } -} static int mlx5e_rqt_init(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev, - u16 max_size, u32 *init_rqns, u32 *init_vhca_ids, u16 init_size) + u16 max_size, u32 *init_rqns, u16 init_size) { - int entry_sz; void *rqtc; int inlen; int err; u32 *in; - - if (!rqt_verify_vhca_ids(mdev, init_vhca_ids, init_size)) - return -EOPNOTSUPP; + int i; rqt->mdev = mdev; rqt->size = max_size; - entry_sz = init_vhca_ids ? MLX5_ST_SZ_BYTES(rq_vhca) : MLX5_ST_SZ_BYTES(rq_num); - inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + entry_sz * init_size; + inlen = MLX5_ST_SZ_BYTES(create_rqt_in) + sizeof(u32) * init_size; in = kvzalloc(inlen, GFP_KERNEL); if (!in) return -ENOMEM; @@ -79,9 +33,10 @@ static int mlx5e_rqt_init(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev, rqtc = MLX5_ADDR_OF(create_rqt_in, in, rqt_context); MLX5_SET(rqtc, rqtc, rqt_max_size, rqt->size); - MLX5_SET(rqtc, rqtc, rqt_actual_size, init_size); - fill_rqn_list(rqtc, init_rqns, init_vhca_ids, init_size); + MLX5_SET(rqtc, rqtc, rqt_actual_size, init_size); + for (i = 0; i < init_size; i++) + MLX5_SET(rqtc, rqtc, rq_num[i], init_rqns[i]); err = mlx5_core_create_rqt(rqt->mdev, in, inlen, &rqt->rqtn); @@ -94,7 +49,7 @@ int mlx5e_rqt_init_direct(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev, { u16 max_size = indir_enabled ? indir_table_size : 1; - return mlx5e_rqt_init(rqt, mdev, max_size, &init_rqn, NULL, 1); + return mlx5e_rqt_init(rqt, mdev, max_size, &init_rqn, 1); } static int mlx5e_bits_invert(unsigned long a, int size) @@ -108,8 +63,7 @@ static int mlx5e_bits_invert(unsigned long a, int size) return inv; } -static int mlx5e_calc_indir_rqns(u32 *rss_rqns, u32 *rqns, u32 *rss_vhca_ids, u32 *vhca_ids, - unsigned int num_rqns, +static int mlx5e_calc_indir_rqns(u32 *rss_rqns, u32 *rqns, unsigned int num_rqns, u8 hfunc, struct mlx5e_rss_params_indir *indir) { unsigned int i; @@ -128,42 +82,30 @@ static int mlx5e_calc_indir_rqns(u32 *rss_rqns, u32 *rqns, u32 *rss_vhca_ids, u3 */ return -EINVAL; rss_rqns[i] = rqns[ix]; - if (vhca_ids) - rss_vhca_ids[i] = vhca_ids[ix]; } return 0; } int mlx5e_rqt_init_indir(struct mlx5e_rqt *rqt, struct mlx5_core_dev *mdev, - u32 *rqns, u32 *vhca_ids, unsigned int num_rqns, + u32 *rqns, unsigned int num_rqns, u8 hfunc, struct mlx5e_rss_params_indir *indir) { - u32 *rss_rqns, *rss_vhca_ids = NULL; + u32 *rss_rqns; int err; rss_rqns = kvmalloc_array(indir->actual_table_size, sizeof(*rss_rqns), GFP_KERNEL); if (!rss_rqns) return -ENOMEM; - if (vhca_ids) { - rss_vhca_ids = kvmalloc_array(indir->actual_table_size, sizeof(*rss_vhca_ids), - GFP_KERNEL); - if (!rss_vhca_ids) { - kvfree(rss_rqns); - return -ENOMEM; - } - } - - err = mlx5e_calc_indir_rqns(rss_rqns, rqns, rss_vhca_ids, vhca_ids, num_rqns, hfunc, indir); + err = mlx5e_calc_indir_rqns(rss_rqns, rqns, num_rqns, hfunc, indir); if (err) goto out; - err = mlx5e_rqt_init(rqt, mdev, indir->max_table_size, rss_rqns, rss_vhca_ids, + err = mlx5e_rqt_init(rqt, mdev, indir->max_table_size, rss_rqns, indir->actual_table_size); out: - kvfree(rss_vhca_ids); kvfree(rss_rqns); return err; } @@ -184,20 +126,15 @@ void mlx5e_rqt_destroy(struct mlx5e_rqt *rqt) mlx5_core_destroy_rqt(rqt->mdev, rqt->rqtn); } -static int mlx5e_rqt_redirect(struct mlx5e_rqt *rqt, u32 *rqns, u32 *vhca_ids, - unsigned int size) +static int mlx5e_rqt_redirect(struct mlx5e_rqt *rqt, u32 *rqns, unsigned int size) { - int entry_sz; + unsigned int i; void *rqtc; int inlen; u32 *in; int err; - if (!rqt_verify_vhca_ids(rqt->mdev, vhca_ids, size)) - return -EINVAL; - - entry_sz = vhca_ids ? MLX5_ST_SZ_BYTES(rq_vhca) : MLX5_ST_SZ_BYTES(rq_num); - inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) + entry_sz * size; + inlen = MLX5_ST_SZ_BYTES(modify_rqt_in) + sizeof(u32) * size; in = kvzalloc(inlen, GFP_KERNEL); if (!in) return -ENOMEM; @@ -206,8 +143,8 @@ static int mlx5e_rqt_redirect(struct mlx5e_rqt *rqt, u32 *rqns, u32 *vhca_ids, MLX5_SET(modify_rqt_in, in, bitmask.rqn_list, 1); MLX5_SET(rqtc, rqtc, rqt_actual_size, size); - - fill_rqn_list(rqtc, rqns, vhca_ids, size); + for (i = 0; i < size; i++) + MLX5_SET(rqtc, rqtc, rq_num[i], rqns[i]); err = mlx5_core_modify_rqt(rqt->mdev, rqt->rqtn, in, inlen); @@ -215,21 +152,17 @@ static int mlx5e_rqt_redirect(struct mlx5e_rqt *rqt, u32 *rqns, u32 *vhca_ids, return err; } -int mlx5e_rqt_redirect_direct(struct mlx5e_rqt *rqt, u32 rqn, u32 *vhca_id) +int mlx5e_rqt_redirect_direct(struct mlx5e_rqt *rqt, u32 rqn) { - return mlx5e_rqt_redirect(rqt, &rqn, vhca_id, 1); + return mlx5e_rqt_redirect(rqt, &rqn, 1); } -int mlx5e_rqt_redirect_indir(struct mlx5e_rqt *rqt, u32 *rqns, u32 *vhca_ids, - unsigned int num_rqns, +int mlx5e_rqt_redirect_indir(struct mlx5e_rqt *rqt, u32 *rqns, unsigned int num_rqns, u8 hfunc, struct mlx5e_rss_params_indir *indir) { - u32 *rss_rqns, *rss_vhca_ids = NULL; + u32 *rss_rqns; int err; - if (!rqt_verify_vhca_ids(rqt->mdev, vhca_ids, num_rqns)) - return -EINVAL; - if (WARN_ON(rqt->size != indir->max_table_size)) return -EINVAL; @@ -237,23 +170,13 @@ int mlx5e_rqt_redirect_indir(struct mlx5e_rqt *rqt, u32 *rqns, u32 *vhca_ids, if (!rss_rqns) return -ENOMEM; - if (vhca_ids) { - rss_vhca_ids = kvmalloc_array(indir->actual_table_size, sizeof(*rss_vhca_ids), - GFP_KERNEL); - if (!rss_vhca_ids) { - kvfree(rss_rqns); - return -ENOMEM; - } - } - - err = mlx5e_calc_indir_rqns(rss_rqns, rqns, rss_vhca_ids, vhca_ids, num_rqns, hfunc, indir); + err = mlx5e_calc_indir_rqns(rss_rqns, rqns, num_rqns, hfunc, indir); if (err) goto out; - err = mlx5e_rqt_redirect(rqt, rss_rqns, rss_vhca_ids, indir->actual_table_size); + err = mlx5e_rqt_redirect(rqt, rss_rqns, indir->actual_table_size); out: - kvfree(rss_vhca_ids); kvfree(rss_rqns); return err; } |