You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
136 lines
4.3 KiB
136 lines
4.3 KiB
4 years ago
|
From ff649813dd587b6fe99a52b44bc8aef6cba9e5d1 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Sun, 10 May 2020 15:04:10 -0400
|
||
|
|
Subject: [PATCH 092/312] [netdrv] net/mlx5: WQ, Move short getters into header
|
||
|
|
file
|
||
|
|
|
||
|
|
Message-id: <20200510150452.10307-46-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306669
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789380 v2 45/87] net/mlx5: WQ, Move short getters into header file
|
||
|
|
Bugzilla: 1789380
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Jonathan Toppins <jtoppins@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789380
|
||
|
|
Upstream: v5.5-rc1
|
||
|
|
|
||
|
|
commit 769619ee39dfa8297a1fe2bc2865eb1e73a9f824
|
||
|
|
Author: Tariq Toukan <tariqt@mellanox.com>
|
||
|
|
Date: Wed Oct 16 13:29:16 2019 +0300
|
||
|
|
|
||
|
|
net/mlx5: WQ, Move short getters into header file
|
||
|
|
|
||
|
|
Move short Work Queue API getter functions into the WQ
|
||
|
|
header file.
|
||
|
|
|
||
|
|
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
|
||
|
|
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
|
||
|
|
|
||
|
|
Signed-off-by: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
|
||
|
|
---
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/wq.c | 20 --------------------
|
||
|
|
drivers/net/ethernet/mellanox/mlx5/core/wq.h | 24 ++++++++++++++++++++----
|
||
|
|
2 files changed, 20 insertions(+), 24 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.c b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
index dab2625e1e59..f2a0e72285ba 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.c
|
||
|
|
@@ -34,26 +34,6 @@
|
||
|
|
#include "wq.h"
|
||
|
|
#include "mlx5_core.h"
|
||
|
|
|
||
|
|
-u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq)
|
||
|
|
-{
|
||
|
|
- return (u32)wq->fbc.sz_m1 + 1;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq)
|
||
|
|
-{
|
||
|
|
- return wq->fbc.sz_m1 + 1;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-u8 mlx5_cqwq_get_log_stride_size(struct mlx5_cqwq *wq)
|
||
|
|
-{
|
||
|
|
- return wq->fbc.log_stride;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-u32 mlx5_wq_ll_get_size(struct mlx5_wq_ll *wq)
|
||
|
|
-{
|
||
|
|
- return (u32)wq->fbc.sz_m1 + 1;
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
static u32 wq_get_byte_sz(u8 log_sz, u8 log_stride)
|
||
|
|
{
|
||
|
|
return ((u32)1 << log_sz) << log_stride;
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/wq.h b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
|
||
|
|
index 27338c3c6136..d9a94bc223c0 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/wq.h
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/wq.h
|
||
|
|
@@ -80,7 +80,6 @@ int mlx5_wq_cyc_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
|
||
|
|
void *wqc, struct mlx5_wq_cyc *wq,
|
||
|
|
struct mlx5_wq_ctrl *wq_ctrl);
|
||
|
|
void mlx5_wq_cyc_wqe_dump(struct mlx5_wq_cyc *wq, u16 ix, u8 nstrides);
|
||
|
|
-u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq);
|
||
|
|
|
||
|
|
int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
|
||
|
|
void *qpc, struct mlx5_wq_qp *wq,
|
||
|
|
@@ -89,16 +88,18 @@ int mlx5_wq_qp_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
|
||
|
|
int mlx5_cqwq_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
|
||
|
|
void *cqc, struct mlx5_cqwq *wq,
|
||
|
|
struct mlx5_wq_ctrl *wq_ctrl);
|
||
|
|
-u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq);
|
||
|
|
-u8 mlx5_cqwq_get_log_stride_size(struct mlx5_cqwq *wq);
|
||
|
|
|
||
|
|
int mlx5_wq_ll_create(struct mlx5_core_dev *mdev, struct mlx5_wq_param *param,
|
||
|
|
void *wqc, struct mlx5_wq_ll *wq,
|
||
|
|
struct mlx5_wq_ctrl *wq_ctrl);
|
||
|
|
-u32 mlx5_wq_ll_get_size(struct mlx5_wq_ll *wq);
|
||
|
|
|
||
|
|
void mlx5_wq_destroy(struct mlx5_wq_ctrl *wq_ctrl);
|
||
|
|
|
||
|
|
+static inline u32 mlx5_wq_cyc_get_size(struct mlx5_wq_cyc *wq)
|
||
|
|
+{
|
||
|
|
+ return (u32)wq->fbc.sz_m1 + 1;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static inline int mlx5_wq_cyc_is_full(struct mlx5_wq_cyc *wq)
|
||
|
|
{
|
||
|
|
return wq->cur_sz == wq->sz;
|
||
|
|
@@ -169,6 +170,16 @@ static inline int mlx5_wq_cyc_cc_bigger(u16 cc1, u16 cc2)
|
||
|
|
return !equal && !smaller;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static inline u32 mlx5_cqwq_get_size(struct mlx5_cqwq *wq)
|
||
|
|
+{
|
||
|
|
+ return wq->fbc.sz_m1 + 1;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
+static inline u8 mlx5_cqwq_get_log_stride_size(struct mlx5_cqwq *wq)
|
||
|
|
+{
|
||
|
|
+ return wq->fbc.log_stride;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static inline u32 mlx5_cqwq_ctr2ix(struct mlx5_cqwq *wq, u32 ctr)
|
||
|
|
{
|
||
|
|
return ctr & wq->fbc.sz_m1;
|
||
|
|
@@ -225,6 +236,11 @@ static inline struct mlx5_cqe64 *mlx5_cqwq_get_cqe(struct mlx5_cqwq *wq)
|
||
|
|
return cqe;
|
||
|
|
}
|
||
|
|
|
||
|
|
+static inline u32 mlx5_wq_ll_get_size(struct mlx5_wq_ll *wq)
|
||
|
|
+{
|
||
|
|
+ return (u32)wq->fbc.sz_m1 + 1;
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static inline int mlx5_wq_ll_is_full(struct mlx5_wq_ll *wq)
|
||
|
|
{
|
||
|
|
return wq->cur_sz == wq->fbc.sz_m1;
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|