From f28718c9e59a62fc8199d23874aebcb00eb49656 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein Date: Fri, 3 Aug 2012 08:40:37 +0000 Subject: [PATCH] --- yaml --- r: 328539 b: refs/heads/master c: d2b57063e4aba51d3c49ec957607d2e4c9d5f29a h: refs/heads/master i: 328537: 5d7555082b7c3a96f4cab7b492724a53948fd8f4 328535: c4f80579e30b4c5efb6d0d3e5db25257e71f4f2e v: v3 --- [refs] | 2 +- trunk/drivers/infiniband/hw/mlx4/qp.c | 4 ---- trunk/drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c | 2 ++ trunk/include/rdma/ib_verbs.h | 3 +++ 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 231b050b98b4..c0c79de1097f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a084feebd24764fab9657a586ea65484ddbd79cf +refs/heads/master: d2b57063e4aba51d3c49ec957607d2e4c9d5f29a diff --git a/trunk/drivers/infiniband/hw/mlx4/qp.c b/trunk/drivers/infiniband/hw/mlx4/qp.c index 56e66a4c335c..f585eddef4b7 100644 --- a/trunk/drivers/infiniband/hw/mlx4/qp.c +++ b/trunk/drivers/infiniband/hw/mlx4/qp.c @@ -2225,10 +2225,6 @@ int mlx4_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, int qp_attr if (qp->flags & MLX4_IB_QP_LSO) qp_init_attr->create_flags |= IB_QP_CREATE_IPOIB_UD_LSO; - qp_init_attr->sq_sig_type = - qp->sq_signal_bits == cpu_to_be32(MLX4_WQE_CTRL_CQ_UPDATE) ? - IB_SIGNAL_ALL_WR : IB_SIGNAL_REQ_WR; - out: mutex_unlock(&qp->mutex); return err; diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c b/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c index 7cf8ec5f3827..c69648487321 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/fw.c @@ -559,7 +559,7 @@ int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) dev_cap->max_pds = 1 << (field & 0x3f); MLX4_GET(field, outbox, QUERY_DEV_CAP_RSVD_XRC_OFFSET); dev_cap->reserved_xrcds = field >> 4; - MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_XRC_OFFSET); + MLX4_GET(field, outbox, QUERY_DEV_CAP_MAX_PD_OFFSET); dev_cap->max_xrcds = 1 << (field & 0x1f); MLX4_GET(size, outbox, QUERY_DEV_CAP_RDMARC_ENTRY_SZ_OFFSET); diff --git a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c index 362b25e1f2e7..293c9e820c49 100644 --- a/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/trunk/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c @@ -360,6 +360,8 @@ static int get_res(struct mlx4_dev *dev, int slave, u64 res_id, r->from_state = r->state; r->state = RES_ANY_BUSY; + mlx4_dbg(dev, "res %s id 0x%llx to busy\n", + ResourceType(type), r->res_id); if (res) *((struct res_common **)res) = r; diff --git a/trunk/include/rdma/ib_verbs.h b/trunk/include/rdma/ib_verbs.h index 07996af8265a..46bc045bbe15 100644 --- a/trunk/include/rdma/ib_verbs.h +++ b/trunk/include/rdma/ib_verbs.h @@ -614,6 +614,9 @@ enum ib_qp_type { enum ib_qp_create_flags { IB_QP_CREATE_IPOIB_UD_LSO = 1 << 0, IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK = 1 << 1, + /* reserve bits 26-31 for low level drivers' internal use */ + IB_QP_CREATE_RESERVED_START = 1 << 26, + IB_QP_CREATE_RESERVED_END = 1 << 31, }; struct ib_qp_init_attr {