[MTHCA] 1. bugfix: gid lookup use wrong port number;

2. prints improvement to fit WPP;
3. ib_device_attr dont include specific Mellanox data;
4. added mechanism, providing the work with memfree devices in blocking mode, which requires transition a completion event from KVP to UVP.

The mechanism works as follows:
   upon create_cq:
      UVP allocates a doorbell record in UARC resident area;
      KVP stores the address of this record in the CQ object;
   upon completion:
      KVP posts event to this record (technically, increments sn - completion sequence number);
   upon arming the CQ:
      UVP consumes the event (technically, uses sn for numbering the next doorbell)

git-svn-id: svn://openib.tc.cornell.edu/gen1@334 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/hw/mthca/kernel/hca_data.c b/trunk/hw/mthca/kernel/hca_data.c
index 26dfdb64e28073c5f9be5f285ebb623a0e144ac8..2ca9e6a5ca7f9b5eae7e99ef75f03e4463400280 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_data.c
+++ b/trunk/hw/mthca/kernel/hca_data.c
@@ -310,7 +310,7 @@ mlnx_conv_hca_cap(
                ibal_port_p->subnet_timeout = mthca_port_p->subnet_timeout;\r
                // ibal_port_p->local_ack_timeout = 3; // TBD: currently ~32 usec\r
                HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM ,("Port %d port_guid 0x%I64x\n",\r
-                       ibal_port_p->port_num, ibal_port_p->port_guid));\r
+                       ibal_port_p->port_num, cl_ntoh64(ibal_port_p->port_guid)));\r
        }\r
 }\r
 \r

diff --git a/trunk/hw/mthca/kernel/hca_verbs.c b/trunk/hw/mthca/kernel/hca_verbs.c
index 366232f28250418e48e6c06379017af6ff382632..81d5a6baf18d75c35324fdbc5526c1ef0402a82b 100644 (file)
--- a/trunk/hw/mthca/kernel/hca_verbs.c
+++ b/trunk/hw/mthca/kernel/hca_verbs.c
@@ -225,7 +225,7 @@ mlnx_query_ca (
        }\r
        \r
        //copy vendor specific data\r
-       cl_memcpy(last_p, props.board_id, MTHCA_BOARD_ID_LEN);\r
+       cl_memcpy(last_p,to_mdev(ib_dev)->board_id, MTHCA_BOARD_ID_LEN);\r
        last_p += PTR_ALIGN(MTHCA_BOARD_ID_LEN);\r
        \r
        // Separate the loops to ensure that table pointers are always setup\r
@@ -258,11 +258,25 @@ mlnx_query_ca (
                        }\r
                }\r
 \r
-               HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM,("port %d gid0:", port_num));\r
-               for (i = 0; i < 16; i++)\r
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM,\r
-                               (" 0x%x", p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[i]));\r
-               HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM,("\n"));\r
+               HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM,("port %d gid0:\n", port_num));\r
+               HCA_PRINT(TRACE_LEVEL_VERBOSE, HCA_DBG_SHIM,\r
+                       (" 0x%x%x%x%x%x%x%x%x-0x%x%x%x%x%x%x%x%x\n", \r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[0],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[1],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[2],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[3],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[4],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[5],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[6],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[7],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[8],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[9],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[10],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[11],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[12],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[13],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[14],\r
+                       p_ca_attr->p_port_attr[port_num].p_gid_table[0].raw[15]));\r
        }\r
 \r
        // set result size\r

diff --git a/trunk/hw/mthca/kernel/mt_verbs.c b/trunk/hw/mthca/kernel/mt_verbs.c
index 05d6edd92628511b200f01465745dc4f4532c2a1..7c9200b776aad51b42da1fd06a8cf4b8bd937359 100644 (file)
--- a/trunk/hw/mthca/kernel/mt_verbs.c
+++ b/trunk/hw/mthca/kernel/mt_verbs.c
@@ -491,7 +491,7 @@ int ibv_destroy_qp(struct ib_qp *qp)
                atomic_dec(&pd->usecnt);
                atomic_dec(&scq->usecnt);
                atomic_dec(&rcq->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d, pd_handle %p, ctx %p \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_QP ,("PD%d use cnt %d, pd_handle %p, ctx %p \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt, pd, pd->ucontext));
                if (srq)
                        atomic_dec(&srq->usecnt);
@@ -526,7 +526,7 @@ struct ib_cq *ibv_create_cq(struct ib_device *device,
                        create_cq->mr.length, create_cq->mr.hca_va, TRUE );
                if (IS_ERR(ib_mr)) {
                        err = PTR_ERR(ib_mr);
-                       HCA_PRINT(TRACE_LEVEL_ERROR,HCA_DBG_LOW ,("ibv_reg_mr failed (%d)\n", err));
+                       HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_CQ ,("ibv_reg_mr failed (%d)\n", err));
                        goto err_alloc_mr;
                }
                user_handle = create_cq->user_handle;
@@ -538,7 +538,7 @@ struct ib_cq *ibv_create_cq(struct ib_device *device,
        cq = device->create_cq(device, cqe, context, p_umv_buf);
        if (IS_ERR(cq)) {
                err = PTR_ERR(cq);
-               HCA_PRINT(TRACE_LEVEL_ERROR,HCA_DBG_LOW ,("create_qp failed (%d)\n", err));
+               HCA_PRINT(TRACE_LEVEL_ERROR ,HCA_DBG_CQ ,("create_cq failed (%d)\n", err));
                goto err_create_cq;
        }
 
@@ -682,7 +682,7 @@ struct ib_mr *ibv_reg_phys_mr(struct ib_pd *pd,
                mr->pd      = pd;
                atomic_inc(&pd->usecnt);
                atomic_set(&mr->usecnt, 0);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 
@@ -715,7 +715,7 @@ int ibv_rereg_phys_mr(struct ib_mr *mr,
        if (!ret && (mr_rereg_mask & IB_MR_REREG_PD)) {
                atomic_dec(&old_pd->usecnt);
                atomic_inc(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 
@@ -740,7 +740,7 @@ int ibv_dereg_mr(struct ib_mr *mr)
        ret = mr->device->dereg_mr(mr);
        if (!ret) {
                atomic_dec(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d, pd_handle %p, ctx %p \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_MEMORY ,("PD%d use cnt %d, pd_handle %p, ctx %p \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt, pd, pd->ucontext));
        }
 
@@ -761,7 +761,7 @@ struct ib_mw *ibv_alloc_mw(struct ib_pd *pd)
                mw->device  = pd->device;
                mw->pd      = pd;
                atomic_inc(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 
@@ -777,7 +777,7 @@ int ibv_dealloc_mw(struct ib_mw *mw)
        ret = mw->device->dealloc_mw(mw);
        if (!ret) {
                atomic_dec(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 
@@ -800,7 +800,7 @@ struct ib_fmr *ibv_alloc_fmr(struct ib_pd *pd,
                fmr->device = pd->device;
                fmr->pd     = pd;
                atomic_inc(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 
@@ -827,7 +827,7 @@ int ibv_dealloc_fmr(struct ib_fmr *fmr)
        ret = fmr->device->dealloc_fmr(fmr);
        if (!ret) {
                atomic_dec(&pd->usecnt);
-               HCA_PRINT(TRACE_LEVEL_INFORMATION  ,HCA_DBG_SHIM        ,("PD%d use cnt %d \n", 
+               HCA_PRINT(TRACE_LEVEL_INFORMATION ,HCA_DBG_MEMORY ,("PD%d use cnt %d \n", 
                        ((struct mthca_pd*)pd)->pd_num, pd->usecnt));
        }
 

diff --git a/trunk/hw/mthca/kernel/mthca_cmd.c b/trunk/hw/mthca/kernel/mthca_cmd.c
index 081f81541f1dc43f578c764a96c8c9a580f33001..41476e428362a12cd72aa9029bbde9ed0219d5bd 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_cmd.c
+++ b/trunk/hw/mthca/kernel/mthca_cmd.c
@@ -1616,15 +1616,14 @@ int mthca_MODIFY_QP(struct mthca_dev *dev, int trans, u32 num,
        } else {
                { // debug print
                        int i;
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE  ,HCA_DBG_LOW  ,("Dumping QP context:\n"));
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("  opt param mask: %08x\n", cl_ntoh32(*(__be32 *)mailbox->buf)));
-                       for (i = 0; i < 0x100 / 4; ++i) {
-                               if (i % 8 == 0)
-                                       HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_LOW ,("  [%02x] ", i * 4));
-                               HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_LOW ,(" %08x",
-                                      cl_ntoh32(((__be32 *) mailbox->buf)[i + 2])));
-                               if ((i + 1) % 8 == 0)
-                                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("\n"));
+                       HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_QP ,("Dumping QP context:\n"));
+                       HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_QP ,("  opt param mask: %08x\n", cl_ntoh32(*(__be32 *)mailbox->buf)));
+                       for (i = 2; i < 0x100 / 4; i=i+4) {
+                               HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_QP ,("  [%02x] %08x %08x %08x %08x\n",i-2,
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i ]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 1]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 2]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 3])));
                        }
                }
        }
@@ -1636,15 +1635,13 @@ int mthca_MODIFY_QP(struct mthca_dev *dev, int trans, u32 num,
 
                if (mailbox) { // debug print
                        int i;
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE  ,HCA_DBG_LOW  ,("Dumping QP context:\n"));
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,(" %08x\n", cl_ntoh32(*(__be32 *)mailbox->buf)));
-                       for (i = 0; i < 0x100 / 4; ++i) {
-                               if (i % 8 == 0)
-                                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("[%02x] ", i * 4));
-                               HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_LOW ,(" %08x",
-                                      cl_ntoh32(((__be32 *) mailbox->buf)[i + 2])));
-                               if ((i + 1) % 8 == 0)
-                                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("\n"));
+                       HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_QP ,("Dumping QP context:\n"));
+                       for (i = 2; i < 0x100 / 4; i=i+4) {
+                               HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_QP ,("  [%02x] %08x %08x %08x %08x\n",i-2,
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i ]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 1]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 2]),
+                                                       cl_ntoh32(((__be32 *) mailbox->buf)[i + 3])));
                        }
                }
        } else

diff --git a/trunk/hw/mthca/kernel/mthca_cq.c b/trunk/hw/mthca/kernel/mthca_cq.c
index af872dbd921dcc232da8a231774bb5c96a1d6c18..dac40203314005c3a764b5baa60e452aed78925d 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_cq.c
+++ b/trunk/hw/mthca/kernel/mthca_cq.c
@@ -228,7 +228,12 @@ void mthca_cq_completion(struct mthca_dev *dev, u32 cqn)
                return;
        }
 
-       ++cq->arm_sn;
+       if (mthca_is_memfree(dev)) {
+               if (cq->ibcq.ucontext)
+                       ++*cq->p_u_arm_sn;
+               else
+                       ++cq->arm_sn;
+       }
 
        cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context);
 }
@@ -422,7 +427,7 @@ static void handle_error_cqe(struct mthca_dev *dev, struct mthca_cq *cq,
        if (!(new_wqe & cl_hton32(0x3f)) || (!cqe->db_cnt && dbd))
                return;
 
-       cqe->db_cnt   = cl_hton16(cl_ntoh16((u16)(cqe->db_cnt) - (u16)dbd));
+       cqe->db_cnt   = cl_hton16(cl_ntoh16(cqe->db_cnt) - (u16)dbd);
        cqe->wqe      = new_wqe;
        cqe->syndrome = SYNDROME_WR_FLUSH_ERR;
 

diff --git a/trunk/hw/mthca/kernel/mthca_eq.c b/trunk/hw/mthca/kernel/mthca_eq.c
index 779cf4af99123a47875bcc682cff79588e8d8a40..10f7920d146d0fc4ba668d45343d37aa7ee8ecb7 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_eq.c
+++ b/trunk/hw/mthca/kernel/mthca_eq.c
@@ -717,12 +717,13 @@ static void mthca_free_eq(struct mthca_dev *dev,
 
        { // debug print
                HCA_PRINT(TRACE_LEVEL_VERBOSE  ,HCA_DBG_LOW  ,("Dumping EQ context %02x:\n", eq->eqn));
-               for (i = 0; i < sizeof (struct mthca_eq_context) / 4; ++i) {
-                       if (i % 4 == 0)
-                               HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("[%02x] ", i * 4));
-                       HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,(" %08x", cl_ntoh32(*(u32*)((u8*)mailbox->buf + i * 4))));
-                       if ((i + 1) % 4 == 0)
-                               HCA_PRINT(TRACE_LEVEL_VERBOSE   ,HCA_DBG_LOW   ,("\n"));
+               for (i = 0; i < sizeof (struct mthca_eq_context) / 4; i=i+4) {
+                       HCA_PRINT(TRACE_LEVEL_VERBOSE ,HCA_DBG_LOW ,("[%02x] %08x %08x %08x %08x\n", i,
+                                       cl_ntoh32(*(u32*)((u8*)mailbox->buf + i * 4)),
+                                       cl_ntoh32(*(u32*)((u8*)mailbox->buf + (i+1)*4)),
+                                       cl_ntoh32(*(u32*)((u8*)mailbox->buf + (i+2)*4)),
+                                       cl_ntoh32(*(u32*)((u8*)mailbox->buf + (i+1)*4))));
+                                       
                }
        }
 

diff --git a/trunk/hw/mthca/kernel/mthca_memfree.c b/trunk/hw/mthca/kernel/mthca_memfree.c
index 6949da6f8b40a64c991b5d8d3141bf279001a828..1711f4e6f19104efe6bd3ea2d1720b5a5d881921 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_memfree.c
+++ b/trunk/hw/mthca/kernel/mthca_memfree.c
@@ -393,7 +393,7 @@ static u64 mthca_uarc_virt(struct mthca_dev *dev, struct mthca_uar *uar, int pag
 }
 
 int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
-                     struct mthca_user_db_table *db_tab, int index, u64 uaddr)
+                     struct mthca_user_db_table *db_tab, int index, u64 uaddr, void **kva)
 {
        int ret = 0;
        u8 status;
@@ -418,7 +418,7 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
 
        if (db_tab->page[i].refcount) {
                ++db_tab->page[i].refcount;
-               goto out;
+               goto done;
        }
 
        ret = get_user_pages(dev, uaddr & PAGE_MASK, 1, 1,
@@ -448,6 +448,10 @@ int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
        db_tab->page[i].uvirt    = uaddr;
        db_tab->page[i].refcount = 1;
 
+done:  
+       if (kva)
+               *kva = db_tab->page[i].mem.page;
+
 out:
        up(&db_tab->mutex);
        return ret;

diff --git a/trunk/hw/mthca/kernel/mthca_memfree.h b/trunk/hw/mthca/kernel/mthca_memfree.h
index 9b3d945bbed0a843e2782fe27163e6871ed197c9..f73c6228624018ff53ec80a53cb79b19d8cd3def 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_memfree.h
+++ b/trunk/hw/mthca/kernel/mthca_memfree.h
@@ -162,7 +162,7 @@ struct mthca_user_db_table;
 struct mthca_uar;
 
 int mthca_map_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
-                     struct mthca_user_db_table *db_tab, int index, u64 uaddr);
+                     struct mthca_user_db_table *db_tab, int index, u64 uaddr, void **kva);
 void mthca_unmap_user_db(struct mthca_dev *dev, struct mthca_uar *uar,
                         struct mthca_user_db_table *db_tab, int index);
 struct mthca_user_db_table *mthca_init_user_db_tab(struct mthca_dev *dev);

diff --git a/trunk/hw/mthca/kernel/mthca_provider.c b/trunk/hw/mthca/kernel/mthca_provider.c
index 01c9fe40a59ef67399d9ccf41d2e7519f97d0f68..ce3d98ec6695dfd008e43539ca730cade0f67264 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_provider.c
+++ b/trunk/hw/mthca/kernel/mthca_provider.c
@@ -97,7 +97,6 @@
        props->vendor_part_id      = cl_ntoh16(*(__be16 *) (out_mad->data + 30));
        props->hw_ver              = cl_ntoh32(*(__be32 *) (out_mad->data + 32));
        memcpy(&props->sys_image_guid, out_mad->data +  4, 8);
-       memcpy(&props->board_id, mdev->board_id, MTHCA_BOARD_ID_LEN);
        props->max_mr_size         = ~0ull;
        props->page_size_cap       = mdev->limits.page_size_cap;
        props->max_qp              = mdev->limits.num_qps - mdev->limits.reserved_qps;
@@ -524,7 +523,7 @@ struct ib_srq *mthca_create_srq(struct ib_pd *pd,
                }
                err = mthca_map_user_db(to_mdev(pd->device), &context->uar,
                                        context->db_tab, ucmd.db_index,
-                                       ucmd.db_page);
+                                       ucmd.db_page, NULL);
 
                if (err)
                        goto err_free;
@@ -611,13 +610,13 @@ struct ib_qp *mthca_create_qp(struct ib_pd *pd,
 
                        err = mthca_map_user_db(to_mdev(pd->device), &context->uar,
                                                context->db_tab,
-                                               ucmd.sq_db_index, ucmd.sq_db_page);
+                                               ucmd.sq_db_index, ucmd.sq_db_page, NULL);
                        if (err) 
                                goto err_map1;
 
                        err = mthca_map_user_db(to_mdev(pd->device), &context->uar,
                                                context->db_tab,
-                                               ucmd.rq_db_index, ucmd.rq_db_page);
+                                               ucmd.rq_db_index, ucmd.rq_db_page, NULL);
                        if (err) 
                                goto err_map2;
 
@@ -724,6 +723,7 @@ struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
        struct mthca_cq *cq;
        int nent;
        int err;
+       void *u_arm_db_page = 0;
 
        if (entries < 1 || entries > to_mdev(ibdev)->limits.max_cqes)   
                return ERR_PTR(-EINVAL);
@@ -734,27 +734,37 @@ struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
 
                err = mthca_map_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
                                        to_mucontext(context)->db_tab,
-                                       ucmd.set_db_index, ucmd.set_db_page);
+                                       ucmd.set_db_index, ucmd.set_db_page, NULL);
                if (err)
                        return ERR_PTR(err);
 
                err = mthca_map_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
                                        to_mucontext(context)->db_tab,
-                                       ucmd.arm_db_index, ucmd.arm_db_page);
+                                       ucmd.arm_db_index, ucmd.arm_db_page, NULL);
                if (err)
                        goto err_unmap_set;
+
+               err = mthca_map_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
+                                       to_mucontext(context)->db_tab,
+                                       ucmd.u_arm_db_index, 
+                                       (u64)(ULONG_PTR)PAGE_ALIGN(ucmd.u_arm_db_page), 
+                                       &u_arm_db_page);
+               if (err)
+                       goto err_unmap_arm;
        }
 
        cq = kmalloc(sizeof *cq, GFP_KERNEL);
        if (!cq) {
                err = -ENOMEM;
-               goto err_unmap_arm;
+               goto err_unmap_ev;
        }
 
        if (context) {
                cq->mr.ibmr.lkey = ucmd.lkey;
                cq->set_ci_db_index = ucmd.set_db_index;
                cq->arm_db_index    = ucmd.arm_db_index;
+               cq->u_arm_db_index    = ucmd.u_arm_db_index;
+               cq->p_u_arm_sn = (int*)((char*)u_arm_db_page + BYTE_OFFSET(ucmd.u_arm_db_page));
        }
 
        for (nent = 1; nent <= entries; nent <<= 1)
@@ -781,6 +791,11 @@ struct ib_cq *mthca_create_cq(struct ib_device *ibdev, int entries,
 err_free:
        kfree(cq);
 
+err_unmap_ev:
+       if (context)
+               mthca_unmap_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
+                                   to_mucontext(context)->db_tab, ucmd.u_arm_db_index);
+
 err_unmap_arm:
        if (context)
                mthca_unmap_user_db(to_mdev(ibdev), &to_mucontext(context)->uar,
@@ -797,6 +812,10 @@ err_unmap_set:
 int mthca_destroy_cq(struct ib_cq *cq)
 {
        if (cq->ucontext) {
+               mthca_unmap_user_db(to_mdev(cq->device),
+                                   &to_mucontext(cq->ucontext)->uar,
+                                   to_mucontext(cq->ucontext)->db_tab,
+                                   to_mcq(cq)->u_arm_db_index);
                mthca_unmap_user_db(to_mdev(cq->device),
                                    &to_mucontext(cq->ucontext)->uar,
                                    to_mucontext(cq->ucontext)->db_tab,

diff --git a/trunk/hw/mthca/kernel/mthca_provider.h b/trunk/hw/mthca/kernel/mthca_provider.h
index 9cf5a7774312d5f44794c8ada7573c1b8c16cb36..c5a457b7f902ba063687593933991a77d420d6d3 100644 (file)
--- a/trunk/hw/mthca/kernel/mthca_provider.h
+++ b/trunk/hw/mthca/kernel/mthca_provider.h
@@ -203,6 +203,8 @@ struct mthca_cq {
        int                    arm_db_index;
        __be32                *arm_db;
        int                    arm_sn;
+       int                    u_arm_db_index;
+       int                *p_u_arm_sn;
 
        union mthca_buf        queue;
        struct mthca_mr        mr;

diff --git a/trunk/hw/mthca/mx_abi.h b/trunk/hw/mthca/mx_abi.h
index ba31df1cc45d1c56e96f34385e869b02b579cfb7..e64ac6d86533a958559ea808177cb48968cbcf0e 100644 (file)
--- a/trunk/hw/mthca/mx_abi.h
+++ b/trunk/hw/mthca/mx_abi.h
@@ -96,11 +96,14 @@ struct ibv_create_cq {
        struct ibv_reg_mr mr;   
        uint64_t arm_db_page;
        uint64_t set_db_page;
+       uint64_t u_arm_db_page;
+       uint64_t user_handle;
        uint32_t arm_db_index;
        uint32_t set_db_index;
-       uint64_t user_handle;
+       uint32_t u_arm_db_index;
        uint32_t cqe;
        uint32_t lkey;          /* used only by kernel */
+       uint32_t reserved;
 };
 
 struct ibv_create_cq_resp {

diff --git a/trunk/hw/mthca/user/mlnx_ual_av.c b/trunk/hw/mthca/user/mlnx_ual_av.c
index 88fe27e73c58757da0a3cd28deb9a1b79b80f21d..cd60fb8673827c670893a112d4549606184227f4 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_ual_av.c
+++ b/trunk/hw/mthca/user/mlnx_ual_av.c
@@ -71,10 +71,10 @@ gid_to_index_lookup (
     uint8_t i, index = 0;\r
     uint16_t num_gids;\r
 \r
-    p_gid_table = p_ca_attr->p_port_attr[port_num].p_gid_table;\r
+    p_gid_table = p_ca_attr->p_port_attr[port_num-1].p_gid_table;\r
     CL_ASSERT (p_gid_table);\r
 \r
-    num_gids = p_ca_attr->p_port_attr[port_num].num_gids;\r
+    num_gids = p_ca_attr->p_port_attr[port_num-1].num_gids;\r
     UVP_PRINT(TRACE_LEVEL_INFORMATION, UVP_DBG_AV, \r
               ("Port %d has %d gids\n", port_num, num_gids));\r
 \r
@@ -254,16 +254,18 @@ mlnx_post_create_av (
 \r
        if (IB_SUCCESS == ioctl_status) {\r
 \r
-               page = ah->page;\r
-               if (p_resp->use_mr) {\r
-                       // fill mr parameters\r
-                       page->mr.handle = p_resp->mr.mr_handle;\r
-                       page->mr.lkey = p_resp->mr.lkey;\r
-                       page->mr.rkey = p_resp->mr.rkey;\r
-                       page->mr.pd = p_pd->ibv_pd;\r
-                       page->mr.context = p_pd->ibv_pd->context;\r
+               if (!mthca_is_memfree(p_pd->ibv_pd->context)) {\r
+                       page = ah->page;\r
+                       if (p_resp->use_mr) {\r
+                               // fill mr parameters\r
+                               page->mr.handle = p_resp->mr.mr_handle;\r
+                               page->mr.lkey = p_resp->mr.lkey;\r
+                               page->mr.rkey = p_resp->mr.rkey;\r
+                               page->mr.pd = p_pd->ibv_pd;\r
+                               page->mr.context = p_pd->ibv_pd->context;\r
+                       }\r
+                       ah->key  = page->mr.lkey;\r
                }\r
-               ah->key  = page->mr.lkey;\r
                *ph_uvp_av = (ib_av_handle_t)ah;\r
        }\r
        goto end;\r

diff --git a/trunk/hw/mthca/user/mlnx_uvp.c b/trunk/hw/mthca/user/mlnx_uvp.c
index 58213b0ddb325a76995f3876da0e17024bf298e9..fd383eebfcbf8606691a4f4e8572238349eca8e0 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp.c
+++ b/trunk/hw/mthca/user/mlnx_uvp.c
@@ -103,7 +103,6 @@ static struct ibv_context_ops mthca_ctx_ops = {
        mthca_poll_cq,
        mthca_poll_cq_list,
        NULL,   /* req_notify_cq */
-       NULL,  /* cq_event */
        mthca_destroy_cq,
        NULL,   // mthca_create_srq,
        NULL,   // mthca_modify_srq,
@@ -178,13 +177,11 @@ found:
 
        if (mthca_is_memfree(&context->ibv_ctx)) {
                context->ibv_ctx.ops.req_notify_cq = mthca_arbel_arm_cq;
-               context->ibv_ctx.ops.cq_event      = mthca_arbel_cq_event;
                context->ibv_ctx.ops.post_send     = mthca_arbel_post_send;
                context->ibv_ctx.ops.post_recv     = mthca_arbel_post_recv;
                context->ibv_ctx.ops.post_srq_recv = mthca_arbel_post_srq_recv;
        } else {
                context->ibv_ctx.ops.req_notify_cq = mthca_tavor_arm_cq;
-               context->ibv_ctx.ops.cq_event      = NULL;
                context->ibv_ctx.ops.post_send     = mthca_tavor_post_send;
                context->ibv_ctx.ops.post_recv     = mthca_tavor_post_recv;
                context->ibv_ctx.ops.post_srq_recv = mthca_tavor_post_srq_recv;

diff --git a/trunk/hw/mthca/user/mlnx_uvp.h b/trunk/hw/mthca/user/mlnx_uvp.h
index 013dc45521ac250f4b54441007c8cdfac826d58c..47a1a87715d9a17e881a06d09425880051079013 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp.h
+++ b/trunk/hw/mthca/user/mlnx_uvp.h
@@ -127,7 +127,8 @@ struct mthca_cq {
        uint32_t          *set_ci_db;
        int                arm_db_index;
        uint32_t          *arm_db;
-       int                arm_sn;
+       int                u_arm_db_index;
+       uint32_t          *p_u_arm_sn;
 };
 
 struct mthca_srq {
@@ -281,7 +282,6 @@ int mthca_poll_cq_list(struct ibv_cq *ibcq,
        struct _ib_wc** const pp_done_wclist );
 int mthca_tavor_arm_cq(struct ibv_cq *cq, int solicited);
 int mthca_arbel_arm_cq(struct ibv_cq *cq, int solicited);
-void mthca_arbel_cq_event(struct ibv_cq *cq);
 void mthca_cq_clean(struct mthca_cq *cq, uint32_t qpn,
                           struct mthca_srq *srq);
 void mthca_init_cq_buf(struct mthca_cq *cq, int nent);

diff --git a/trunk/hw/mthca/user/mlnx_uvp_cq.c b/trunk/hw/mthca/user/mlnx_uvp_cq.c
index 9a3d7f231f41ee47b701c43aa7e99624834b3466..53d35a4cf1ae37fe1636ab6b9262768b6474f403 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp_cq.c
+++ b/trunk/hw/mthca/user/mlnx_uvp_cq.c
@@ -533,7 +533,7 @@ int mthca_arbel_arm_cq(struct ibv_cq *ibvcq, enum ib_cq_notify notify)
        uint32_t sn;
        uint32_t ci;
 
-       sn = cq->arm_sn & 3;
+       sn = *cq->p_u_arm_sn & 3;
        ci = cl_hton32(cq->cons_index);
 
        doorbell[0] = ci;
@@ -560,11 +560,6 @@ int mthca_arbel_arm_cq(struct ibv_cq *ibvcq, enum ib_cq_notify notify)
        return 0;
 }
 
-void mthca_arbel_cq_event(struct ibv_cq *cq)
-{
-       to_mcq(cq)->arm_sn++;
-}
-
 static inline int is_recv_cqe(struct mthca_cqe *cqe)
 {
        if ((cqe->opcode & MTHCA_ERROR_CQE_OPCODE_MASK) ==

diff --git a/trunk/hw/mthca/user/mlnx_uvp_doorbell.h b/trunk/hw/mthca/user/mlnx_uvp_doorbell.h
index 0882ee15d699ed0c707d7536013a344aa9dd2428..d8741a7a16f196b2f0d39c60fe8a5d81dfb5dfed 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp_doorbell.h
+++ b/trunk/hw/mthca/user/mlnx_uvp_doorbell.h
@@ -93,14 +93,14 @@ static inline void mthca_write64(uint32_t val[2], struct mthca_context *ctx, int
        //__asm movq target_p,mm0
        //__asm emms
 }
-
 static inline void mthca_write_db_rec(uint32_t val[2], uint32_t *db)
 {
-       //TODO: can we save mm0 and not to use emms, as Linux do ?
-       __asm movq mm0,val
-       __asm movq db,mm0
-       __asm emms
+       db[0] = val[0];
+       wmb();
+       db[1] = val[1];
 }
+
+
 #endif
 
 #endif /* MTHCA_H */

diff --git a/trunk/hw/mthca/user/mlnx_uvp_verbs.c b/trunk/hw/mthca/user/mlnx_uvp_verbs.c
index 2ee6cafc4d4ddd83e7fc84064382dc44df94074b..0321110282cc1160a11011cff49c67fe180da02d 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp_verbs.c
+++ b/trunk/hw/mthca/user/mlnx_uvp_verbs.c
@@ -105,7 +105,6 @@ struct ibv_cq *mthca_create_cq_pre(struct ibv_context *context, int *p_cqe,
        mthca_init_cq_buf(cq, nent);
 
        if (mthca_is_memfree(context)) {
-               cq->arm_sn          = 1;
                cq->set_ci_db_index = mthca_alloc_db(to_mctx(context)->db_tab,
                                                     MTHCA_DB_TYPE_CQ_SET_CI,
                                                     &cq->set_ci_db);
@@ -118,10 +117,20 @@ struct ibv_cq *mthca_create_cq_pre(struct ibv_context *context, int *p_cqe,
                if (cq->arm_db_index < 0)
                        goto err_set_db;
 
+               cq->u_arm_db_index    = mthca_alloc_db(to_mctx(context)->db_tab,
+                                                    MTHCA_DB_TYPE_CQ_ARM,
+                                                    &cq->p_u_arm_sn);
+               if (cq->u_arm_db_index < 0)
+                       goto err_arm_db;
+
+               *cq->p_u_arm_sn = 1;
+
                req->arm_db_page  = db_align(cq->arm_db);
                req->set_db_page  = db_align(cq->set_ci_db);
+               req->u_arm_db_page  = (uint64_t)(ULONG_PTR)cq->p_u_arm_sn;
                req->arm_db_index = cq->arm_db_index;
                req->set_db_index = cq->set_ci_db_index;
+               req->u_arm_db_index = cq->u_arm_db_index;
        }
 
        req->mr.start = (uint64_t)(ULONG_PTR)cq->buf;
@@ -142,6 +151,11 @@ struct ibv_cq *mthca_create_cq_pre(struct ibv_context *context, int *p_cqe,
 #endif
        return &cq->ibv_cq;
 
+err_arm_db:
+       if (mthca_is_memfree(context))
+               mthca_free_db(to_mctx(context)->db_tab, MTHCA_DB_TYPE_CQ_SET_CI,
+                             cq->arm_db_index);
+
 err_set_db:
        if (mthca_is_memfree(context))
                mthca_free_db(to_mctx(context)->db_tab, MTHCA_DB_TYPE_CQ_SET_CI,
@@ -188,6 +202,8 @@ int mthca_destroy_cq(struct ibv_cq *cq)
        int ret;
 
        if (mthca_is_memfree(cq->context)) {
+               mthca_free_db(to_mctx(cq->context)->db_tab, MTHCA_DB_TYPE_CQ_SET_CI,
+                             to_mcq(cq)->u_arm_db_index);
                mthca_free_db(to_mctx(cq->context)->db_tab, MTHCA_DB_TYPE_CQ_SET_CI,
                              to_mcq(cq)->set_ci_db_index);
                mthca_free_db(to_mctx(cq->context)->db_tab, MTHCA_DB_TYPE_CQ_ARM,

diff --git a/trunk/hw/mthca/user/mlnx_uvp_verbs.h b/trunk/hw/mthca/user/mlnx_uvp_verbs.h
index 44c498361998c8d7c894e65f79c4c3339971c57f..9e626e27d97739565613551708263043f7d71839 100644 (file)
--- a/trunk/hw/mthca/user/mlnx_uvp_verbs.h
+++ b/trunk/hw/mthca/user/mlnx_uvp_verbs.h
@@ -457,7 +457,6 @@ struct ibv_context_ops {
                struct _ib_wc** const                   pp_free_wclist,
                struct _ib_wc** const                   pp_done_wclist );
        int                     (*req_notify_cq)(struct ibv_cq *cq, int solicited_only);
-       void                    (*cq_event)(struct ibv_cq *cq);
        int                     (*destroy_cq)(struct ibv_cq *cq);
        struct ibv_srq *        (*create_srq)(struct ibv_pd *pd,
                                              struct ibv_srq_init_attr *srq_init_attr);