Add two helpers to:
1. Compute the txq_ix given a channel and a tc offset (tc_to_txq_ix).
2. Compute the channel index and tc offset given a txq_ix
(txq_ix_to_chtc_ix).
The first helper, tc_to_txq_ix, is used in place of the mathematical
expressionin mlx5e_open_sqs when txq_ix values are computed.
The second helper, txq_ix_to_chtc_ix, will be used in a following patch.
Signed-off-by: Joe Damato <jdamato@xxxxxxxxxx>
---
.../net/ethernet/mellanox/mlx5/core/en_main.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index b758bc72ac36..ce15805ad55a 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2312,6 +2312,22 @@ static int mlx5e_txq_get_qos_node_hw_id(struct mlx5e_params *params, int txq_ix,
return 0;
}
+static inline int tc_to_txq_ix(struct mlx5e_channel *c,
+ struct mlx5e_params *params,
+ int tc)
+{
+ return c->ix + tc * params->num_channels;
+}
+
+static inline void txq_ix_to_chtc_ix(struct mlx5e_params *params, int txq_ix,
+ int *ch_ix, int *tc_ix)
+{
+ if (params->num_channels) {
+ *ch_ix = txq_ix % params->num_channels;
+ *tc_ix = txq_ix / params->num_channels;
+ }
+}
+
static int mlx5e_open_sqs(struct mlx5e_channel *c,
struct mlx5e_params *params,
struct mlx5e_channel_param *cparam)
@@ -2319,7 +2335,7 @@ static int mlx5e_open_sqs(struct mlx5e_channel *c,
int err, tc;
for (tc = 0; tc < mlx5e_get_dcb_num_tc(params); tc++) {
- int txq_ix = c->ix + tc * params->num_channels;
+ int txq_ix = tc_to_txq_ix(c, params, tc);
u32 qos_queue_group_id;
u32 tisn;
--
2.25.1
