Skip to content

Commit 32a2365

Browse files
Maxim Mikityanskiyborkmann
authored andcommitted
net/mlx5e: Move queue param structs to en/params.h
structs mlx5e_{rq,sq,cq,channel}_param are going to be used in the upcoming XSK RX and TX patches. Move them to a header file to make them accessible from other C files. Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.com> Acked-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
1 parent 0a06382 commit 32a2365

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

drivers/net/ethernet/mellanox/mlx5/core/en/params.h

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,37 @@ struct mlx5e_xsk_param {
1111
u16 chunk_size;
1212
};
1313

14+
struct mlx5e_rq_param {
15+
u32 rqc[MLX5_ST_SZ_DW(rqc)];
16+
struct mlx5_wq_param wq;
17+
struct mlx5e_rq_frags_info frags_info;
18+
};
19+
20+
struct mlx5e_sq_param {
21+
u32 sqc[MLX5_ST_SZ_DW(sqc)];
22+
struct mlx5_wq_param wq;
23+
bool is_mpw;
24+
};
25+
26+
struct mlx5e_cq_param {
27+
u32 cqc[MLX5_ST_SZ_DW(cqc)];
28+
struct mlx5_wq_param wq;
29+
u16 eq_ix;
30+
u8 cq_period_mode;
31+
};
32+
33+
struct mlx5e_channel_param {
34+
struct mlx5e_rq_param rq;
35+
struct mlx5e_sq_param sq;
36+
struct mlx5e_sq_param xdp_sq;
37+
struct mlx5e_sq_param icosq;
38+
struct mlx5e_cq_param rx_cq;
39+
struct mlx5e_cq_param tx_cq;
40+
struct mlx5e_cq_param icosq_cq;
41+
};
42+
43+
/* Parameter calculations */
44+
1445
u16 mlx5e_get_linear_rq_headroom(struct mlx5e_params *params,
1546
struct mlx5e_xsk_param *xsk);
1647
u32 mlx5e_rx_get_linear_frag_sz(struct mlx5e_params *params,

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

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -57,35 +57,6 @@
5757
#include "en/reporter.h"
5858
#include "en/params.h"
5959

60-
struct mlx5e_rq_param {
61-
u32 rqc[MLX5_ST_SZ_DW(rqc)];
62-
struct mlx5_wq_param wq;
63-
struct mlx5e_rq_frags_info frags_info;
64-
};
65-
66-
struct mlx5e_sq_param {
67-
u32 sqc[MLX5_ST_SZ_DW(sqc)];
68-
struct mlx5_wq_param wq;
69-
bool is_mpw;
70-
};
71-
72-
struct mlx5e_cq_param {
73-
u32 cqc[MLX5_ST_SZ_DW(cqc)];
74-
struct mlx5_wq_param wq;
75-
u16 eq_ix;
76-
u8 cq_period_mode;
77-
};
78-
79-
struct mlx5e_channel_param {
80-
struct mlx5e_rq_param rq;
81-
struct mlx5e_sq_param sq;
82-
struct mlx5e_sq_param xdp_sq;
83-
struct mlx5e_sq_param icosq;
84-
struct mlx5e_cq_param rx_cq;
85-
struct mlx5e_cq_param tx_cq;
86-
struct mlx5e_cq_param icosq_cq;
87-
};
88-
8960
bool mlx5e_check_fragmented_striding_rq_cap(struct mlx5_core_dev *mdev)
9061
{
9162
bool striding_rq_umr = MLX5_CAP_GEN(mdev, striding_rq) &&

0 commit comments

Comments
 (0)