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.
86 lines
3.1 KiB
86 lines
3.1 KiB
4 years ago
|
From c3ca971b1394fda6a35b50ea0af68cd66cd1e761 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alaa Hleihel <ahleihel@redhat.com>
|
||
|
|
Date: Tue, 12 May 2020 10:55:20 -0400
|
||
|
|
Subject: [PATCH 203/312] [netdrv] net/mlx5: DR, On creation set CQ's arm_db
|
||
|
|
member to right value
|
||
|
|
|
||
|
|
Message-id: <20200512105530.4207-115-ahleihel@redhat.com>
|
||
|
|
Patchwork-id: 306988
|
||
|
|
Patchwork-instance: patchwork
|
||
|
|
O-Subject: [RHEL8.3 BZ 1789382 114/124] net/mlx5: DR, On creation set CQ's arm_db member to right value
|
||
|
|
Bugzilla: 1789384 1789382
|
||
|
|
RH-Acked-by: Tony Camuso <tcamuso@redhat.com>
|
||
|
|
RH-Acked-by: Kamal Heib <kheib@redhat.com>
|
||
|
|
RH-Acked-by: Jarod Wilson <jarod@redhat.com>
|
||
|
|
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789382
|
||
|
|
Bugzilla: http://bugzilla.redhat.com/1789384
|
||
|
|
Upstream: v5.7-rc5
|
||
|
|
|
||
|
|
commit 8075411d93b6efe143d9f606f6531077795b7fbf
|
||
|
|
Author: Erez Shitrit <erezsh@mellanox.com>
|
||
|
|
Date: Wed Mar 25 17:19:43 2020 +0200
|
||
|
|
|
||
|
|
net/mlx5: DR, On creation set CQ's arm_db member to right value
|
||
|
|
|
||
|
|
In polling mode, set arm_db member to a value that will avoid CQ
|
||
|
|
event recovery by the HW.
|
||
|
|
Otherwise we might get event without completion function.
|
||
|
|
In addition,empty completion function to was added to protect from
|
||
|
|
unexpected events.
|
||
|
|
|
||
|
|
Fixes: 297cccebdc5a ("net/mlx5: DR, Expose an internal API to issue RDMA operations")
|
||
|
|
Signed-off-by: Erez Shitrit <erezsh@mellanox.com>
|
||
|
|
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
|
||
|
|
Reviewed-by: Alex Vesker <valex@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/steering/dr_send.c | 14 +++++++++++++-
|
||
|
|
1 file changed, 13 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
|
||
|
|
index c0ab9cf74929..18719acb7e54 100644
|
||
|
|
--- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
|
||
|
|
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
|
||
|
|
@@ -695,6 +695,12 @@ static void dr_cq_event(struct mlx5_core_cq *mcq,
|
||
|
|
pr_info("CQ event %u on CQ #%u\n", event, mcq->cqn);
|
||
|
|
}
|
||
|
|
|
||
|
|
+static void dr_cq_complete(struct mlx5_core_cq *mcq,
|
||
|
|
+ struct mlx5_eqe *eqe)
|
||
|
|
+{
|
||
|
|
+ pr_err("CQ completion CQ: #%u\n", mcq->cqn);
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
|
||
|
|
struct mlx5_uars_page *uar,
|
||
|
|
size_t ncqe)
|
||
|
|
@@ -756,6 +762,7 @@ static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
|
||
|
|
mlx5_fill_page_frag_array(&cq->wq_ctrl.buf, pas);
|
||
|
|
|
||
|
|
cq->mcq.event = dr_cq_event;
|
||
|
|
+ cq->mcq.comp = dr_cq_complete;
|
||
|
|
|
||
|
|
err = mlx5_core_create_cq(mdev, &cq->mcq, in, inlen, out, sizeof(out));
|
||
|
|
kvfree(in);
|
||
|
|
@@ -767,7 +774,12 @@ static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
|
||
|
|
cq->mcq.set_ci_db = cq->wq_ctrl.db.db;
|
||
|
|
cq->mcq.arm_db = cq->wq_ctrl.db.db + 1;
|
||
|
|
*cq->mcq.set_ci_db = 0;
|
||
|
|
- *cq->mcq.arm_db = 0;
|
||
|
|
+
|
||
|
|
+ /* set no-zero value, in order to avoid the HW to run db-recovery on
|
||
|
|
+ * CQ that used in polling mode.
|
||
|
|
+ */
|
||
|
|
+ *cq->mcq.arm_db = cpu_to_be32(2 << 28);
|
||
|
|
+
|
||
|
|
cq->mcq.vector = 0;
|
||
|
|
cq->mcq.irqn = irqn;
|
||
|
|
cq->mcq.uar = uar;
|
||
|
|
--
|
||
|
|
2.13.6
|
||
|
|
|