dapl openib_cma: fix hca query to use correct max_rd_atom values

Signed-off by: Arlin Davis ardavis@ichips.intel.com

diff --git a/dapl/openib_cma/dapl_ib_util.c b/dapl/openib_cma/dapl_ib_util.c
index fcd8163a3b61094fe9861b5c9498b89a55562709..a7ba3d61080c9aeb34551b241ac96826be382b9a 100755 (executable)
--- a/dapl/openib_cma/dapl_ib_util.c
+++ b/dapl/openib_cma/dapl_ib_util.c
@@ -467,10 +467,10 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                ia_attr->hardware_version_major = dev_attr.hw_ver;
                ia_attr->max_eps                  = dev_attr.max_qp;
                ia_attr->max_dto_per_ep           = dev_attr.max_qp_wr;
-               ia_attr->max_rdma_read_in         = dev_attr.max_qp_rd_atom;
-               ia_attr->max_rdma_read_out        = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_in         = dev_attr.max_res_rd_atom;
+               ia_attr->max_rdma_read_out        = dev_attr.max_qp_init_rd_atom;
                ia_attr->max_rdma_read_per_ep_in  = dev_attr.max_qp_rd_atom;
-               ia_attr->max_rdma_read_per_ep_out = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_out = dev_attr.max_qp_init_rd_atom;
                ia_attr->max_rdma_read_per_ep_in_guaranteed  = DAT_TRUE;
                ia_attr->max_rdma_read_per_ep_out_guaranteed = DAT_TRUE;
                ia_attr->max_evds                 = dev_attr.max_cq;
@@ -492,7 +492,7 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                ia_attr->max_iov_segments_per_rdma_write = dev_attr.max_sge;
                /* save rd_atom for peer validation during connect requests */
                hca_ptr->ib_trans.max_rdma_rd_in  = dev_attr.max_qp_rd_atom;
-               hca_ptr->ib_trans.max_rdma_rd_out = dev_attr.max_qp_rd_atom;
+               hca_ptr->ib_trans.max_rdma_rd_out = dev_attr.max_qp_init_rd_atom;
 #ifdef DAT_EXTENSIONS
                ia_attr->extension_supported = DAT_EXTENSION_IB;
                ia_attr->extension_version = DAT_IB_EXTENSION_VERSION;
@@ -505,10 +505,11 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                        ia_attr->max_evds, ia_attr->max_evd_qlen );
                dapl_log(DAPL_DBG_TYPE_UTIL, 
                        "dapl_query_hca: msg %llu rdma %llu iov's %d"
-                       " lmr %d rmr %d rd_io %d inline=%d\n", 
+                       " lmr %d rmr %d rd_in,out %d,%d inline=%d\n", 
                        ia_attr->max_mtu_size, ia_attr->max_rdma_size,
                        ia_attr->max_iov_segments_per_dto, ia_attr->max_lmrs, 
                        ia_attr->max_rmrs, ia_attr->max_rdma_read_per_ep_in,
+                       ia_attr->max_rdma_read_per_ep_out,
                         hca_ptr->ib_trans.max_inline_send);
        }
        
@@ -521,7 +522,7 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                ep_attr->max_recv_iov     = dev_attr.max_sge;
                ep_attr->max_request_iov  = dev_attr.max_sge;
                ep_attr->max_rdma_read_in = dev_attr.max_qp_rd_atom;
-               ep_attr->max_rdma_read_out= dev_attr.max_qp_rd_atom;
+               ep_attr->max_rdma_read_out= dev_attr.max_qp_init_rd_atom;
                ep_attr->max_rdma_read_iov= dev_attr.max_sge;
                ep_attr->max_rdma_write_iov= dev_attr.max_sge;
                dapl_log(DAPL_DBG_TYPE_UTIL,