From: Leon Romanovsky <leonro@xxxxxxxxxx>
Special QPs created by mlx4 have same QP port borrowed from
the context, while they are expected to have different ones.
Fix it by using HW physical port instead.
It fixes the following error during driver init:
[ 12.074150] mlx4_core 0000:05:00.0: mlx4_ib: initializing demux service for 128 qp1 clients
[ 12.084036] <mlx4_ib> create_pv_sqp: Couldn't create special QP (-16)
[ 12.085123] <mlx4_ib> create_pv_resources: Couldn't create QP1 (-16)
[ 12.088300] mlx4_en: Mellanox ConnectX HCA Ethernet driver v4.0-0
Signed-off-by: Leon Romanovsky <leonro@xxxxxxxxxx>
---
drivers/infiniband/hw/mlx4/mad.c | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c
index 8bd16474708f..be0057222bbc 100644
--- a/drivers/infiniband/hw/mlx4/mad.c
+++ b/drivers/infiniband/hw/mlx4/mad.c
@@ -1792,7 +1792,7 @@ static void pv_qp_event_handler(struct ib_event *event, void *qp_context)
}
static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx,
- enum ib_qp_type qp_type, int create_tun)
+ enum ib_qp_type qp_type, int port, int create_tun)
{
int i, ret;
struct mlx4_ib_demux_pv_qp *tun_qp;
@@ -1822,12 +1822,13 @@ static int create_pv_sqp(struct mlx4_ib_demux_pv_ctx *ctx,
qp_init_attr.proxy_qp_type = qp_type;
qp_attr_mask_INIT = IB_QP_STATE | IB_QP_PKEY_INDEX |
IB_QP_QKEY | IB_QP_PORT;
+ qp_init_attr.init_attr.port_num = ctx->port;
} else {
qp_init_attr.init_attr.qp_type = qp_type;
qp_init_attr.init_attr.create_flags = MLX4_IB_SRIOV_SQP;
qp_attr_mask_INIT = IB_QP_STATE | IB_QP_PKEY_INDEX | IB_QP_QKEY;
+ qp_init_attr.init_attr.port_num = port;
}
- qp_init_attr.init_attr.port_num = ctx->port;
qp_init_attr.init_attr.qp_context = ctx;
qp_init_attr.init_attr.event_handler = pv_qp_event_handler;
tun_qp->qp = ib_create_qp(ctx->pd, &qp_init_attr.init_attr);
@@ -2026,7 +2027,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port,
}
if (ctx->has_smi) {
- ret = create_pv_sqp(ctx, IB_QPT_SMI, create_tun);
+ ret = create_pv_sqp(ctx, IB_QPT_SMI, port, create_tun);
if (ret) {
pr_err("Couldn't create %s QP0 (%d)\n",
create_tun ? "tunnel for" : "", ret);
@@ -2034,7 +2035,7 @@ static int create_pv_resources(struct ib_device *ibdev, int slave, int port,
}
}
- ret = create_pv_sqp(ctx, IB_QPT_GSI, create_tun);
+ ret = create_pv_sqp(ctx, IB_QPT_GSI, port, create_tun);
if (ret) {
pr_err("Couldn't create %s QP1 (%d)\n",
create_tun ? "tunnel for" : "", ret);
--
2.26.2
